X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=getdown%2Fsrc%2Fgetdown%2Fcore%2Fsrc%2Fmain%2Fjava%2Fcom%2Fthreerings%2Fgetdown%2Fdata%2FApplication.java;h=0de5c8ac87c6f849f0f5c03c7f68dc63f03d84db;hb=54360f0110522c5832ebabff8a8498ed4a087261;hp=4d75236885133fb711957c698e24c42ecb4e118e;hpb=992f8de4d39d69eca640746b5126aae1d62685cc;p=jalview.git diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java index 4d75236..0de5c8a 100644 --- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java +++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java @@ -26,11 +26,15 @@ import java.util.zip.GZIPInputStream; import com.sun.management.OperatingSystemMXBean; import java.lang.management.ManagementFactory; +import jalview.bin.MemorySetting; import com.threerings.getdown.util.*; // avoid ambiguity with java.util.Base64 which we can't use as it's 1.8+ import com.threerings.getdown.util.Base64; +import com.threerings.getdown.data.EnvConfig; +import com.threerings.getdown.data.EnvConfig.Note; + import static com.threerings.getdown.Log.log; import static java.nio.charset.StandardCharsets.UTF_8; @@ -565,7 +569,19 @@ public class Application log.info("Found no getdown.txt file", "appdir", getAppDir()); } } catch (Exception e) { - log.warning("Failure reading config file", "file", config, e); + log.warning("Failure reading config file", "file", _config, e); + } + + // see if there's an override config from locator file + Config locatorConfig = createLocatorConfig(opts); + + // merge the locator file config into config (or replace config with) + if (locatorConfig != null) { + if (config == null || locatorConfig.getBoolean(LOCATOR_FILE_EXTENSION+"_replace")) { + config = locatorConfig; + } else { + config.mergeConfig(locatorConfig, locatorConfig.getBoolean(LOCATOR_FILE_EXTENSION+"_merge")); + } } // if we failed to read our config file, check for an appbase specified via a system @@ -581,10 +597,12 @@ public class Application // first determine our application base, this way if anything goes wrong later in the // process, our caller can use the appbase to download a new configuration file _appbase = config.getString("appbase"); - // override if a Version Locator file has been used - if (newAppbase != null) { - _appbase = newAppbase.toString(); + + // see if locatorConfig override + if (locatorConfig != null && !StringUtil.isBlank(locatorConfig.getString("appbase"))) { + _appbase = locatorConfig.getString("appbase"); } + if (_appbase == null) { throw new RuntimeException("m.missing_appbase"); } @@ -736,28 +754,34 @@ public class Application jvmmempc = config.getInt(appPrefix + "jvmmempc", jvmmempc); } if (0 <= jvmmempc && jvmmempc <= 100) { - final Object o = ManagementFactory.getOperatingSystemMXBean(); - - try { - if (o instanceof OperatingSystemMXBean) { - final OperatingSystemMXBean osb = (OperatingSystemMXBean) o; - long physicalMem = osb.getTotalPhysicalMemorySize(); - long requestedMem = physicalMem*jvmmempc/100; - String[] maxMemHeapArg = new String[]{"-Xmx"+Long.toString(requestedMem)}; - // remove other max heap size arg - ARG: for (int i = 0; i < _jvmargs.size(); i++) { - if (_jvmargs.get(i) instanceof java.lang.String && _jvmargs.get(i).startsWith("-Xmx")) { - _jvmargs.remove(i); - } - } - addAll(maxMemHeapArg, _jvmargs); + + long maxMemLong = -1; + + try + { + maxMemLong = MemorySetting.memPercent(jvmmempc); + } catch (Exception e) + { + e.printStackTrace(); + } catch (Throwable t) + { + t.printStackTrace(); + } - } - } - catch (NoClassDefFoundError e) { - // com.sun.management.OperatingSystemMXBean doesn't exist in this JVM - System.out.println("No com.sun.management.OperatingSystemMXBean. Cannot use 'jvmmempc'."); + if (maxMemLong > 0) + { + + String[] maxMemHeapArg = new String[]{"-Xmx"+Long.toString(maxMemLong)}; + // remove other max heap size arg + ARG: for (int i = 0; i < _jvmargs.size(); i++) { + if (_jvmargs.get(i) instanceof java.lang.String && _jvmargs.get(i).startsWith("-Xmx")) { + _jvmargs.remove(i); + } } + addAll(maxMemHeapArg, _jvmargs); + + } + } else if (jvmmempc != -1) { System.out.println("'jvmmempc' value must be in range 0 to 100 (read as '"+Integer.toString(jvmmempc)+"')"); } @@ -1048,7 +1072,7 @@ public class Application } // almost finally check the startup file arguments - for (File f : startupFiles) { + for (File f : _startupFiles) { _appargs.add(f.getAbsolutePath()); break; // Only add one file to open } @@ -1061,7 +1085,7 @@ public class Application if (j > -1) { ext = filename.substring(j+1); } - if (locatorFileExtension.equals(ext.toLowerCase())) { + if (LOCATOR_FILE_EXTENSION.equals(ext.toLowerCase())) { // this file extension should have been dealt with in Getdown class } else { _appargs.add(0, "-open"); @@ -1785,24 +1809,90 @@ public class Application { return new File(appdir, path); } + + public static void setStartupFilesFromParameterString(String p) { + // multiple files *might* be passed in as space separated quoted filenames + String q = "\""; + if (!StringUtil.isBlank(p)) { + String[] filenames; + // split quoted params or treat as single string array + if (p.startsWith(q) && p.endsWith(q)) { + // this fails if, e.g. + // p=q("stupidfilename\" " "otherfilename") + // let's hope no-one ever ends a filename with '" ' + filenames = p.substring(q.length(),p.length()-q.length()).split(q+" "+q); + } else { + // single unquoted filename + filenames = new String[]{p}; + } + + // check for locator file. Only allow one locator file to be double clicked (if multiple files opened, ignore locator files) + String locatorFilename = filenames.length >= 1 ? filenames[0] : null; + if ( + !StringUtil.isBlank(locatorFilename) + && locatorFilename.toLowerCase().endsWith("."+Application.LOCATOR_FILE_EXTENSION) + ) { + setLocatorFile(locatorFilename); + // remove the locator filename from the filenames array + String[] otherFilenames = new String[filenames.length - 1]; + System.arraycopy(filenames, 1, otherFilenames, 0, otherFilenames.length); + filenames = otherFilenames; + } + + for (int i = 0; i < filenames.length; i++) { + String filename = filenames[i]; + // skip any other locator files in a multiple file list + if (! filename.toLowerCase().endsWith("."+Application.LOCATOR_FILE_EXTENSION)) { + addStartupFile(filename); + } + } + } + } - public void addStartupFile (File f) { - startupFiles.add(f); - } - - public void newAppbase (URL url) { - if ( - url.getHost().endsWith(".jalview.org") - || url.equals("jalview.org") - || (url.getProtocol().equals("file") && url.getHost().equals("")) - ) { - newAppbase = url; - log.info("Appbase set to Java Version Locator url '"+url.toString()+"'"); - return; + public static void setLocatorFile(String filename) { + _locatorFile = new File(filename); + } + + public static void addStartupFile(String filename) { + _startupFiles.add(new File(filename)); + } + + private Config createLocatorConfig(Config.ParseOpts opts) { + if (_locatorFile == null) { + return null; + } + + Config locatorConfig = null; + + try { + Config tmpConfig = null; + if (_locatorFile.exists()) { + tmpConfig = Config.parseConfig(_locatorFile, opts); + } else { + log.warning("Given locator file does not exist", "file", _locatorFile); + } + + // appbase is sanitised in HostWhitelist + Map tmpData = new HashMap<>(); + for (Map.Entry entry : tmpConfig.getData().entrySet()) { + String key = entry.getKey(); + Object value = entry.getValue(); + String mkey = key.indexOf('.') > -1 ? key.substring(key.indexOf('.') + 1) : key; + if (Config.allowedReplaceKeys.contains(mkey) || Config.allowedMergeKeys.contains(mkey)) { + tmpData.put(key, value); + } + } + locatorConfig = new Config(tmpData); + + } catch (Exception e) { + log.warning("Failure reading locator file", "file", _locatorFile, e); } - log.info("Java Version Locator url '"+url.toString()+"' does not have a jalview.org domain. Ignoring"); + + log.info("Returning locatorConfig", locatorConfig); + + return locatorConfig; } - + protected final EnvConfig _envc; protected File _config; protected Digest _digest; @@ -1846,8 +1936,6 @@ public class Application protected List _jvmargs = new ArrayList<>(); protected List _appargs = new ArrayList<>(); - protected List startupFiles = new ArrayList<>(); - protected URL newAppbase; protected String[] _optimumJvmArgs; @@ -1868,6 +1956,8 @@ public class Application protected static final String ENV_VAR_PREFIX = "%ENV."; protected static final Pattern ENV_VAR_PATTERN = Pattern.compile("%ENV\\.(.*?)%"); - - public static final String locatorFileExtension = "jvl"; + + protected static File _locatorFile; + protected static List _startupFiles = new ArrayList<>(); + public static final String LOCATOR_FILE_EXTENSION = "jvl"; }