JAL-3349 Remove processed args from list to send to jalview

[jalview.git] / getdown / src / getdown / core / src / main / java / com / threerings / getdown / data / Application.java

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 5c61378..7634726 100644 (file)
--- 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
@@ -70,15 +70,16 @@ public class Application
          */
         public enum Step
         {
-            UPDATE_JAVA(10),
+            //UPDATE_JAVA(10),
+            UPDATE_JAVA(20),
             //VERIFY_METADATA(15, 65, 95),
             VERIFY_METADATA(15, 45, 90),
-            DOWNLOAD(50),
+            DOWNLOAD(60),
             PATCH(60),
             //VERIFY_RESOURCES(70, 97),
-            VERIFY_RESOURCES(30, 90),
+            VERIFY_RESOURCES(40, 90),
             //REDOWNLOAD_RESOURCES(90),
-            REDOWNLOAD_RESOURCES(75),
+            REDOWNLOAD_RESOURCES(80),
             //UNPACK(98),
             UNPACK(95),
             //LAUNCH(99);
@@ -285,7 +286,6 @@ public class Application
        _envc = envc;
        _config = getLocalPath(envc.appDir, CONFIG_FILE);
        _backupConfig = getLocalPath(envc.appDir, BACKUP_CONFIG_DIR+File.separator+CONFIG_FILE);
-       log.warning("Backup config file now", "_backupConfig", _backupConfig, "exists", _backupConfig.exists(), "isReadable", _backupConfig.canRead());
     }
 
     /**
@@ -326,11 +326,10 @@ public class Application
      */
     public Resource getConfigResource ()
     {
-       Resource res = null;
        try {
                return createResource(CONFIG_FILE, Resource.NORMAL);
        } catch (Exception e) {
-               log.warning("Invalid appbase '" + _vappbase + "'.", e);
+               throw new RuntimeException("Invalid appbase '" + _vappbase + "'.", e);
        }
     }
 
@@ -790,20 +789,35 @@ public class Application
             jvmargs = config.getMultiValue(appPrefix + "jvmarg");
             addAll(jvmargs, _jvmargs);
         }
+        
+        // extract jvmargs and jvmmempc from command line appargs.  These will appear after and override the previous jvmargs
+        addAll(processCliJvmArgs(_envc.appArgs), _jvmargs);
 
-        // see if a percentage of physical memory option exists
-        int jvmmempc = config.getInt("jvmmempc", -1);
-        // app_id prefixed setting overrides
-        if (appPrefix.length() > 0) {
-            jvmmempc = config.getInt(appPrefix + "jvmmempc", jvmmempc);
+        // get the set of optimum JVM arguments
+        _optimumJvmArgs = config.getMultiValue("optimum_jvmarg");
+
+        // transfer our application arguments
+        String[] appargs = config.getMultiValue(appPrefix + "apparg");
+        addAll(appargs, _appargs);
+
+        // add the launch specific application arguments
+        _appargs.addAll(_envc.appArgs);
+
+        // see if a percentage of physical memory option exists if it hasn't been set by cli args
+        if (_jvmmempc > -1) {
+          _jvmmempc = config.getInt("jvmmempc", -1);
+          // app_id prefixed setting overrides
+          if (appPrefix.length() > 0) {
+              _jvmmempc = config.getInt(appPrefix + "jvmmempc", _jvmmempc);
+          }
         }
-        if (0 <= jvmmempc && jvmmempc <= 100) {
+        if (0 <= _jvmmempc && _jvmmempc <= 100) {
           
           long maxMemLong = -1;
 
           try
           {
-            maxMemLong = MemorySetting.memPercent(jvmmempc);
+            maxMemLong = MemorySetting.memPercent(_jvmmempc);
           } catch (Exception e)
           {
             e.printStackTrace();
@@ -826,19 +840,9 @@ public class Application
             
           }
 
-        } else if (jvmmempc != -1) {
-          System.out.println("'jvmmempc' value must be in range 0 to 100 (read as '"+Integer.toString(jvmmempc)+"')");
+        } else if (_jvmmempc != -1) {
+          System.out.println("'jvmmempc' value must be in range 0 to 100 (read as '"+Integer.toString(_jvmmempc)+"')");
         }
-
-        // get the set of optimum JVM arguments
-        _optimumJvmArgs = config.getMultiValue("optimum_jvmarg");
-
-        // transfer our application arguments
-        String[] appargs = config.getMultiValue(appPrefix + "apparg");
-        addAll(appargs, _appargs);
-
-        // add the launch specific application arguments
-        _appargs.addAll(_envc.appArgs);
         
         // look for custom arguments
         fillAssignmentListFromPairs("extra.txt", _txtJvmArgs);
@@ -1129,8 +1133,11 @@ public class Application
           if (j > -1) {
             ext = filename.substring(j+1);
           }
-          if (LOCATOR_FILE_EXTENSION.equals(ext.toLowerCase())) {
+          if (ext != null && LOCATOR_FILE_EXTENSION.equals(ext.toLowerCase())) {
             // this file extension should have been dealt with in Getdown class
+          } else if (filename.startsWith("-")) {
+            // probably an argument to jvm or jalview
+            log.info("DOING NOTHING WITH ARG", "appargs", _appargs);
           } else {
             _appargs.add(0, "-open");
           }
@@ -1944,6 +1951,26 @@ public class Application
        return _appbase;
     }
     
+    protected String[] processCliJvmArgs(List<String> args) {
+      List<String> extracted = new ArrayList<>();
+      if (args != null) {
+        for (String arg : args) {
+          if (arg.startsWith("-"+CLI_JVM_ARG_PREFIX)) {
+            String newArg = arg.substring(CLI_JVM_ARG_PREFIX.length() + 1);
+            extracted.add(newArg);
+            args.remove(arg);
+          } else if (arg.startsWith("-jvmmempc=")) {
+            try {
+              _jvmmempc = Integer.parseInt(arg.substring(10));
+            } catch (NumberFormatException e){
+              log.warning("Could not parse jvmmempc command line argument", "arg", arg);
+            }
+          }
+        }
+      }
+      return extracted.toArray(new String[0]);
+    }
+    
     protected final EnvConfig _envc;
     protected File _config;
     protected File _backupConfig;
@@ -1993,6 +2020,10 @@ public class Application
 
     protected List<String> _txtJvmArgs = new ArrayList<>();
 
+    /** jvmmempc for memory settings and other cli arguments for the JVM */
+    protected int _jvmmempc = -1;
+    protected static final String CLI_JVM_ARG_PREFIX = "JVM";
+    
     /** If a warning has been issued about not being able to set modtimes. */
     protected boolean _warnedAboutSetLastModified;