import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.zip.GZIPInputStream;
-import com.sun.management.OperatingSystemMXBean;
-import java.lang.management.ManagementFactory;
import jalview.bin.MemorySetting;
{
/** The name of our configuration file. */
public static final String CONFIG_FILE = "getdown.txt";
+
+ /** Dir where a backup config file might reside */
+ public static final String BACKUP_CONFIG_DIR = "install";
/** The name of our target version file. */
public static final String VERSION_FILE = "version.txt";
*/
public enum Step
{
- UPDATE_JAVA(10),
- VERIFY_METADATA(15, 65, 95),
- DOWNLOAD(40),
+ //UPDATE_JAVA(10),
+ UPDATE_JAVA(20),
+ //VERIFY_METADATA(15, 65, 95),
+ VERIFY_METADATA(15, 45, 90),
+ DOWNLOAD(60),
PATCH(60),
- VERIFY_RESOURCES(70, 97),
- REDOWNLOAD_RESOURCES(90),
- UNPACK(98),
- LAUNCH(99);
+ //VERIFY_RESOURCES(70, 97),
+ VERIFY_RESOURCES(40, 90),
+ //REDOWNLOAD_RESOURCES(90),
+ REDOWNLOAD_RESOURCES(80),
+ //UNPACK(98),
+ UNPACK(95),
+ //LAUNCH(99);
+ LAUNCH(100);
/** What is the final percent value for this step? */
public final List<Integer> defaultPercents;
/** Whether progress text should be hidden or not. */
public final boolean hideProgressText;
- /** Whether the splash screen should retain focus. */
+ /** Whether the splash screen should update non-asynchronously before being shown. */
public final boolean progressSync;
+ /** Whether the splash screen should update non-asynchronously after being shown. */
+ public final boolean progressSyncAfterShown;
+
/** Whether the splash screen should retain focus. */
public final boolean keepOnTop;
", pb=" + progressBar + ", srect=" + status + ", st=" + statusText +
", shadow=" + textShadow + ", err=" + installError + ", nrect=" + patchNotes +
", notes=" + patchNotesUrl + ", stepPercentages=" + stepPercentages +
- ", hideProgressText=" + hideProgressText + ", keepOnTop=" + keepOnTop + ", progressSync=" + progressSync + ", minShow=" + minShowSeconds +
+ ", hideProgressText=" + hideProgressText + ", keepOnTop=" + keepOnTop + ", progressSync=" + progressSync +
+ ", progressSyncAfterShown=" + progressSyncAfterShown + ", minShow=" + minShowSeconds +
", displayAppbase=" + displayAppbase + ", displayVersion=" + displayVersion + "]";
}
this.name = config.getString("ui.name");
this.progress = config.getRect("ui.progress", new Rectangle(5, 5, 300, 15));
this.progressText = config.getColor("ui.progress_text", Color.BLACK);
- this.hideProgressText = config.getBoolean("ui.hide_progress_text");
- this.progressSync = config.getBoolean("ui.progress_sync");
+ this.hideProgressText = config.getBoolean("ui.hide_progress_text");
+ this.progressSync = config.getBoolean("ui.progress_sync_before_shown");
+ this.progressSyncAfterShown = config.getBoolean("ui.progress_sync_after_shown");
this.keepOnTop = config.getBoolean("ui.keep_on_top");
this.displayAppbase = config.getBoolean("ui.display_appbase");
this.displayVersion = config.getBoolean("ui.display_version");
*
*/
public Application (EnvConfig envc) {
- _envc = envc;
- _config = getLocalPath(envc.appDir, CONFIG_FILE);
+ _envc = envc;
+ _config = getLocalPath(envc.appDir, CONFIG_FILE);
+ _backupConfig = getLocalPath(envc.appDir, BACKUP_CONFIG_DIR+File.separator+CONFIG_FILE);
}
/**
* Returns the configured application directory.
*/
public File getAppDir () {
- return _envc.appDir;
+ return _envc.appDir;
}
/**
*/
public boolean useCodeCache ()
{
- return _useCodeCache;
+ return _useCodeCache;
}
/**
*/
public int getCodeCacheRetentionDays ()
{
- return _codeCacheRetentionDays;
+ return _codeCacheRetentionDays;
}
/**
* app files from its hosting server.
*/
public int maxConcurrentDownloads () {
- return _maxConcDownloads;
+ return _maxConcDownloads;
}
/**
*/
public Resource getConfigResource ()
{
- try {
- return createResource(CONFIG_FILE, Resource.NORMAL);
- } catch (Exception e) {
- throw new RuntimeException("Invalid appbase '" + _vappbase + "'.", e);
- }
+ try {
+ return createResource(CONFIG_FILE, Resource.NORMAL);
+ } catch (Exception e) {
+ throw new RuntimeException("Invalid appbase '" + _vappbase + "'.", e);
+ }
}
/**
*/
public List<Resource> getCodeResources ()
{
- return _codes;
+ return _codes;
}
/**
} catch (Exception e) {
log.warning("Failure reading config file", "file", _config, e);
}
+ if (config == null || config.getString("appbase") == null || config.getString("appbase").isEmpty()) {
+ try {
+ Config backupConfig = Config.parseConfig(_backupConfig, opts);
+ config = backupConfig;
+ log.warning("Using backup config file", "appdir", getAppDir(), "backupConfig", _backupConfig.getAbsoluteFile());
+ } catch (Exception e) {
+ log.warning("Failure reading backup config file", "file", _backupConfig, e);
+ }
+ }
// see if there's an override config from locator file
Config locatorConfig = createLocatorConfig(opts);
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();
}
- } 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);
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");
}
log.warning("Failure reading locator file", "file", _locatorFile, e);
}
- log.info("Returning locatorConfig", locatorConfig);
-
return locatorConfig;
}
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;
protected Digest _digest;
protected long _version = -1;
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;
git://source.jalview.org / jalview.git / blobdiff