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=799b5bb6b8be6e6a3c93056023e30a0736c42377;hb=af5bc802477affd6e7843fc367f8e91a7831f741;hp=e60e9853dbdb36955350c1d1e85647424318d6b6;hpb=1f047e6c4fecf468be5343e047390b1bd06bc1e7;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 e60e985..799b5bb 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 @@ -23,8 +23,6 @@ import java.util.concurrent.*; 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; @@ -46,6 +44,9 @@ public class Application { /** 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"; @@ -69,14 +70,20 @@ public class Application */ 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 defaultPercents; @@ -145,9 +152,12 @@ public class Application /** 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; @@ -175,7 +185,8 @@ public class Application ", 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 + "]"; } @@ -184,8 +195,9 @@ public class Application 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"); @@ -271,15 +283,16 @@ public class Application * */ 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; } /** @@ -288,7 +301,7 @@ public class Application */ public boolean useCodeCache () { - return _useCodeCache; + return _useCodeCache; } /** @@ -297,7 +310,7 @@ public class Application */ public int getCodeCacheRetentionDays () { - return _codeCacheRetentionDays; + return _codeCacheRetentionDays; } /** @@ -305,7 +318,7 @@ public class Application * app files from its hosting server. */ public int maxConcurrentDownloads () { - return _maxConcDownloads; + return _maxConcDownloads; } /** @@ -313,11 +326,11 @@ public class Application */ 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); + } } /** @@ -325,7 +338,7 @@ public class Application */ public List getCodeResources () { - return _codes; + return _codes; } /** @@ -592,6 +605,15 @@ public class Application } 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); @@ -1106,7 +1128,7 @@ 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 { _appargs.add(0, "-open"); @@ -1887,30 +1909,33 @@ public class Application try { Config tmpConfig = null; + Map tmpData = new HashMap<>(); if (_locatorFile.exists()) { tmpConfig = Config.parseConfig(_locatorFile, opts); + // appbase is sanitised in HostWhitelist + Map tmpConfigData = tmpConfig.getData(); + if (tmpConfig != null) { + for (Map.Entry entry : tmpConfigData.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); + } + } + } else { + log.warning("Error occurred reading config file", "file", _locatorFile); + } } 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("Returning locatorConfig", locatorConfig); - return locatorConfig; } @@ -1920,6 +1945,7 @@ public class Application protected final EnvConfig _envc; protected File _config; + protected File _backupConfig; protected Digest _digest; protected long _version = -1;