LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-26 14:10:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added: -configFile and -storeConfigFile commandline parameters for loading/storing configuration file

Browse Source
This commit is contained in:
Jindra Petřík
2025-05-18 17:38:45 +02:00
parent 0408fc645b
commit c8c482c8c0
6 changed files with 182 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/Configuration.java
+101 -68
View File
@@ -53,7 +53,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.swing.JOptionPane;
/**
* Configuration of FFDec.
@@ -1030,125 +1029,123 @@ public final class Configuration {
@ConfigurationDefaultBoolean(true)
@ConfigurationCategory("script")
public static ConfigurationItem<Boolean> warningAddFunction = null;
@ConfigurationDefaultBoolean(false)
@ConfigurationCategory("export")
public static ConfigurationItem<Boolean> linkAllClasses = null;
@ConfigurationDefaultString("")
@ConfigurationInternal
public static ConfigurationItem<String> recentColors = null;
@ConfigurationDefaultDouble(0.7)
@ConfigurationName("gui.splitPaneEasyVertical.dividerLocationPercent")
@ConfigurationInternal
public static ConfigurationItem<Double> guiSplitPaneEasyVerticalDividerLocationPercent = null;
@ConfigurationDefaultDouble(0.7)
@ConfigurationName("gui.splitPaneEasyHorizontal.dividerLocationPercent")
@ConfigurationInternal
public static ConfigurationItem<Double> guiSplitPaneEasyHorizontalDividerLocationPercent = null;
public static ConfigurationItem<String> lastSessionEasySwf = null;
@ConfigurationDefaultInt(1000)
@ConfigurationCategory("limit")
public static ConfigurationItem<Integer> maxScriptLineLength = null;
@ConfigurationDefaultString(".")
@ConfigurationDirectory
public static ConfigurationItem<String> lastSolEditorDirectory = null;
@ConfigurationDefaultBoolean(true)
@ConfigurationCategory("display")
public static ConfigurationItem<Boolean> halfTransparentParentLayersEasy = null;
@ConfigurationDefaultBoolean(false)
@ConfigurationCategory("display")
public static ConfigurationItem<Boolean> showRuler = null;
@ConfigurationDefaultBoolean(true)
@ConfigurationCategory("display")
public static ConfigurationItem<Boolean> snapToGuides = null;
@ConfigurationDefaultBoolean(true)
@ConfigurationCategory("display")
public static ConfigurationItem<Boolean> snapToObjects = null;
@ConfigurationDefaultBoolean(false)
@ConfigurationCategory("display")
public static ConfigurationItem<Boolean> snapToPixels = null;
@ConfigurationDefaultBoolean(true)
@ConfigurationCategory("display")
public static ConfigurationItem<Boolean> snapAlign = null;
@ConfigurationDefaultBoolean(true)
@ConfigurationCategory("display")
public static ConfigurationItem<Boolean> showGuides = null;
@ConfigurationDefaultBoolean(false)
@ConfigurationCategory("display")
public static ConfigurationItem<Boolean> lockGuides = null;
@ConfigurationDefaultBoolean(false)
@ConfigurationCategory("display")
public static ConfigurationItem<Boolean> showGrid = null;
public static ConfigurationItem<Boolean> showGrid = null;
@ConfigurationDefaultInt(10)
@ConfigurationCategory("display")
public static ConfigurationItem<Integer> gridVerticalSpace = null;
@ConfigurationDefaultInt(10)
@ConfigurationCategory("display")
public static ConfigurationItem<Integer> gridHorizontalSpace = null;
@ConfigurationDefaultBoolean(false)
@ConfigurationCategory("display")
public static ConfigurationItem<Boolean> snapToGrid = null;
@ConfigurationDefaultBoolean(false)
@ConfigurationCategory("display")
public static ConfigurationItem<Boolean> gridOverObjects = null;
@ConfigurationDefaultColor("#949494")
@ConfigurationCategory("display")
public static ConfigurationItem<Color> gridColor = null;
public static ConfigurationItem<Color> gridColor = null;
@ConfigurationDefaultColor("#00FF00")
@ConfigurationCategory("display")
public static ConfigurationItem<Color> guidesColor = null;
@ConfigurationCategory("display")
@ConfigurationDefaultString("NORMAL")
public static ConfigurationItem<GridSnapAccuracy> gridSnapAccuracy = null;
@ConfigurationCategory("display")
@ConfigurationDefaultString("NORMAL")
public static ConfigurationItem<GuidesSnapAccuracy> guidesSnapAccuracy = null;
@ConfigurationDefaultInt(0)
@ConfigurationCategory("display")
public static ConfigurationItem<Integer> snapAlignObjectHorizontalSpace = null;
@ConfigurationDefaultInt(0)
@ConfigurationCategory("display")
public static ConfigurationItem<Integer> snapAlignObjectVerticalSpace = null;
@ConfigurationDefaultInt(0)
@ConfigurationCategory("display")
public static ConfigurationItem<Integer> snapAlignStageBorder = null;
@ConfigurationDefaultBoolean(false)
@ConfigurationCategory("display")
public static ConfigurationItem<Boolean> snapAlignCenterAlignmentHorizontal = null;
@ConfigurationDefaultBoolean(false)
@ConfigurationCategory("display")
public static ConfigurationItem<Boolean> snapAlignCenterAlignmentVertical = null;
private static Map<String, String> configurationDescriptions = new LinkedHashMap<>();
private static Map<String, String> configurationTitles = new LinkedHashMap<>();
@@ -1156,7 +1153,6 @@ public final class Configuration {
WINDOWS, OSX, UNIX
}
public static void setConfigurationDescriptions(Map<String, String> configurationDescriptions) {
Configuration.configurationDescriptions = configurationDescriptions;
}
@@ -1164,12 +1160,11 @@ public final class Configuration {
public static void setConfigurationTitles(Map<String, String> configurationTitles) {
Configuration.configurationTitles = configurationTitles;
}
public static String getConfigurationTitle(String confirationName) {
return configurationTitles.get(confirationName);
}
public static String getConfigurationDescription(String confirationName) {
return configurationDescriptions.get(confirationName);
}
@@ -1275,6 +1270,7 @@ public final class Configuration {
/**
* Get recent files
*
* @return List of recent files
*/
public static List<String> getRecentFiles() {
@@ -1287,6 +1283,7 @@ public final class Configuration {
/**
* Add recent file
*
* @param path Path to file
*/
public static void addRecentFile(String path) {
@@ -1304,6 +1301,7 @@ public final class Configuration {
/**
* Remove recent file
*
* @param path Path to file
*/
public static void removeRecentFile(String path) {
@@ -1317,6 +1315,7 @@ public final class Configuration {
/**
* Get font to name map
*
* @return Font to name map
*/
public static Map<String, String> getFontToNameMap() {
@@ -1331,6 +1330,7 @@ public final class Configuration {
/**
* Add font pair
*
* @param fileName File name
* @param fontId Font ID
* @param fontName Font name
@@ -1346,6 +1346,7 @@ public final class Configuration {
/**
* Get per-swf configuration.
*
* @param fileName SWF File name
* @return SWF specific configuration, null if not found
*/
@@ -1361,6 +1362,7 @@ public final class Configuration {
/**
* Get or create per-swf configuration.
*
* @param fileName SWF File name
* @return SWF specific configuration
*/
@@ -1376,6 +1378,7 @@ public final class Configuration {
/**
* Get per-swf custom configuration.
*
* @param fileName SWF File name
* @return SWF specific custom configuration, null if not found
*/
@@ -1391,6 +1394,7 @@ public final class Configuration {
/**
* Get or create per-swf custom configuration.
*
* @param fileName SWF File name
* @return SWF specific custom configuration
*/
@@ -1407,17 +1411,17 @@ public final class Configuration {
private static String getConfigFile() throws IOException {
return getFFDecHome() + storage.getConfigName();
}
private static String getLegacyConfigFile() throws IOException {
return getFFDecHome() + legacyStorage.getConfigName();
}
/**
* Save configuration to file
*/
public static void saveConfig() {
try {
storage.saveToFile(getConfigFile());
storage.saveToFile(getConfigFile());
} catch (IOException ex) {
// ignore
}
@@ -1441,20 +1445,9 @@ public final class Configuration {
//int processorCount = Runtime.getRuntime().availableProcessors();
}
/**
* Set configuration fields.
*/
@SuppressWarnings("unchecked")
public static void setConfigurationFields() {
private static void loadFromMap(Map<String, Object> config) {
try {
Map<String, Object> config;
if (new File(getConfigFile()).exists()) {
config = storage.loadFromFile(getConfigFile());
} else {
config = legacyStorage.loadFromFile(getLegacyConfigFile());
}
for (Entry<String, Field> entry : getConfigurationFields(false, true).entrySet()) {
String name = entry.getKey();
Field field = entry.getValue();
@@ -1469,7 +1462,7 @@ public final class Configuration {
Object value = null;
if (config.containsKey(name)) {
value = config.get(name);
Class<?> type = ConfigurationItem.getConfigurationFieldType(field);
if (value != null && !type.isAssignableFrom(value.getClass())) {
System.out.println("Configuration item has a wrong type: " + name + " expected: " + type.getSimpleName() + " actual: " + value.getClass().getSimpleName());
@@ -1486,9 +1479,8 @@ public final class Configuration {
} catch (IllegalArgumentException | IllegalAccessException | SecurityException ex) {
// Reflection exceptions. This should never happen
throw new Error(ex.getMessage());
} catch (IOException ex) {
Logger.getLogger(Configuration.class.getName()).log(Level.SEVERE, null, ex);
}
if (playerLibLocation.get("").isEmpty()) {
File swcFile = getPlayerSwcOld();
if (swcFile != null) {
@@ -1503,13 +1495,46 @@ public final class Configuration {
}
}
/**
* Loads configuration from specific file. If it has .bin extension,
* it uses legacy storage, else it uses TOML storage.
* @param file File to load from
*/
public static void loadFromFile(String file) {
Map<String, Object> config;
if (file.toLowerCase(Locale.ENGLISH).endsWith(".bin")) {
config = legacyStorage.loadFromFile(file);
} else {
config = storage.loadFromFile(file);
}
loadFromMap(config);
}
/**
* Set configuration fields.
*/
public static void setConfigurationFields() {
try {
Map<String, Object> config;
if (new File(getConfigFile()).exists()) {
config = storage.loadFromFile(getConfigFile());
} else {
config = legacyStorage.loadFromFile(getLegacyConfigFile());
}
loadFromMap(config);
} catch (IOException ex) {
Logger.getLogger(Configuration.class.getName()).log(Level.SEVERE, null, ex);
}
}
/**
* Get default value for field
*
* @param field Field
* @return Default value
*/
@SuppressWarnings("unchecked")
public static Object getDefaultValue(Field field) {
public static Object getDefaultValue(Field field) {
Object defaultValue = null;
ConfigurationDefaultBoolean aBool = field.getAnnotation(ConfigurationDefaultBoolean.class);
if (aBool != null) {
@@ -1522,11 +1547,11 @@ public final class Configuration {
ConfigurationDefaultString aString = field.getAnnotation(ConfigurationDefaultString.class);
if (aString != null) {
defaultValue = aString.value();
Class<?> type = ConfigurationItem.getConfigurationFieldType(field);
if (type.isEnum()) {
return Enum.valueOf(type.asSubclass(Enum.class), (String) defaultValue);
}
}
}
ConfigurationDefaultDouble aDouble = field.getAnnotation(ConfigurationDefaultDouble.class);
if (aDouble != null) {
@@ -1538,7 +1563,7 @@ public final class Configuration {
mingc.setTime(new Date(aCalendar.value()));
defaultValue = mingc;
}
ConfigurationDefaultColor aColor = field.getAnnotation(ConfigurationDefaultColor.class);
if (aColor != null) {
Pattern p = Pattern.compile("#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})$");
@@ -1549,7 +1574,7 @@ public final class Configuration {
defaultValue = Color.black;
}
}
if (defaultValue == null) {
Class<?> type = ConfigurationItem.getConfigurationFieldType(field);
if (type.isEnum()) {
@@ -1568,12 +1593,12 @@ public final class Configuration {
* Get configuration fields
* @return Configuration fields
*/
/*public static Map<String, Field> getConfigurationFields(boolean alsoRemoved) {
/*public static Map<String, Field> getConfigurationFields(boolean alsoRemoved) {
return getConfigurationFields(false, alsoRemoved);
}*/
/**
* Get configuration fields
*
* @param lowerCaseNames Lower case names
* @return Configuration fields
*/
@@ -1601,6 +1626,7 @@ public final class Configuration {
/**
* Get code formatting
*
* @return Code formatting
*/
public static CodeFormatting getCodeFormatting() {
@@ -1616,26 +1642,28 @@ public final class Configuration {
/**
* Get number of parallel threads
*
* @return Number of parallel threads
*/
public static int getParallelThreadCount() {
int processorCount = Runtime.getRuntime().availableProcessors();
int threadCount = parallelSpeedUpThreadCount.get();
if (threadCount <= 0) {
threadCount = processorCount - 1;
}
if (threadCount < 2) {
threadCount = 2;
}
return threadCount;
}
/**
* Get folder in FFDec home
*
* @param folder Folder
* @return Folder
*/
@@ -1650,6 +1678,7 @@ public final class Configuration {
/**
* Get flashlib path
*
* @return Flashlib path
*/
public static File getFlashLibPath() {
@@ -1658,6 +1687,7 @@ public final class Configuration {
/**
* Get projector path
*
* @return Projector path
*/
public static File getProjectorPath() {
@@ -1730,6 +1760,7 @@ public final class Configuration {
/**
* Get player SWC
*
* @return Player SWC
*/
public static File getPlayerSWC() {
@@ -1752,6 +1783,7 @@ public final class Configuration {
/**
* Get AIR SWC
*
* @return AIR SWC
*/
public static File getAirSWC() {
@@ -1809,6 +1841,7 @@ public final class Configuration {
/**
* Get projector file
*
* @param exportMode Export mode
* @return Projector file
*/
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/configuration/TomlConfigurationStorage.java
+16 -5
View File
@@ -241,22 +241,33 @@ public class TomlConfigurationStorage implements ConfigurationStorage {
@Override
public void saveToFile(String file) {
boolean showComments = false;
boolean modifiedOnly = true;
if (new File(file).exists()) {
saveToFile(file, null, null);
}
public void saveToFile(String file, Boolean showComments, Boolean modifiedOnly) {
if (new File(file).exists() && (showComments == null || modifiedOnly == null)) {
TomlParseResult tomlResult;
try {
tomlResult = Toml.parse(Paths.get(file));
TomlTable metaTable = tomlResult.getTable("meta");
if (metaTable != null) {
showComments = metaTable.getBoolean("showComments") == Boolean.TRUE;
modifiedOnly = metaTable.getBoolean("modifiedOnly") == Boolean.TRUE;
if (showComments == null) {
showComments = metaTable.getBoolean("showComments") == Boolean.TRUE;
}
if (modifiedOnly == null) {
modifiedOnly = metaTable.getBoolean("modifiedOnly") == Boolean.TRUE;
}
}
} catch (IOException ex) {
//ignore
}
}
if (showComments == null) {
showComments = false;
}
if (modifiedOnly == null) {
modifiedOnly = true;
}
try (
Writer w = new FileWriter(file); PrintWriter pw = new PrintWriter(w)) {
String header = AppResources.translate("configurationFile").replace("%app%", ApplicationInfo.APPLICATION_NAME);
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/AppResources.properties
+1 -1
View File
@@ -53,7 +53,7 @@ valueType.Integer = Integer
valueType.String = String
configurationFile = Configuration file of %app%
configurationFile.comment = Line starting with hash is a comment
configurationFile.modify = WARNING: This file is overwritten on every application exit. If you make changes to values, make sure FFDec is not running.
configurationFile.modify = WARNING: This file is overwritten on every application exit. If you make changes to values, make sure the application is not running.
configurationFile.meta = Section - Meta info of how configuration is stored
configurationFile.meta.saveDate = When this file was last modified by the app
configurationFile.meta.appVersion = Last version of tha app that modified this file