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=35250f39efc5ce6f25d979be7102619c22e2e470;hb=cd49bbd5f0eb396c1622096df6c3e3a80efb3a52;hp=0ba2a5e7bd29f9b1540f34d12634d7973ca7713f;hpb=7d8ba6c44b69e49f071c082d19470c399ff84255;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 0ba2a5e..35250f3 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 @@ -9,9 +9,14 @@ import java.io.*; import java.lang.reflect.Method; import java.net.MalformedURLException; import java.net.Proxy; +import java.net.SocketAddress; +import java.net.InetSocketAddress; +import java.net.URI; +import java.net.URISyntaxException; import java.net.URL; import java.net.URLClassLoader; import java.net.URLConnection; +import java.net.URLDecoder; import java.net.URLEncoder; import java.nio.channels.FileChannel; import java.nio.channels.FileLock; @@ -24,7 +29,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.zip.GZIPInputStream; +import jalview.bin.HiDPISetting; import jalview.bin.MemorySetting; +//import com.install4j.api.launcher.Variables; import com.threerings.getdown.util.*; // avoid ambiguity with java.util.Base64 which we can't use as it's 1.8+ @@ -61,6 +68,9 @@ public class Application /** A special classname that means 'use -jar code.jar' instead of a classname. */ public static final String MANIFEST_CLASS = "manifest"; + /** Set this if SHIFT key is down -- reverts to the BACKUP_CONFIG_DIR ("install") */ + private static boolean shiftKeyPressed = false; + /** Used to communicate information about the UI displayed when updating the application. */ public static final class UpdateInterface { @@ -70,15 +80,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); @@ -282,16 +293,16 @@ public class Application * */ public Application (EnvConfig envc) { - _envc = envc; - _config = getLocalPath(envc.appDir, CONFIG_FILE); - _backupConfig = getLocalPath(new File(envc.appDir.getAbsolutePath()+File.separator+BACKUP_CONFIG_DIR), 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; } /** @@ -300,7 +311,7 @@ public class Application */ public boolean useCodeCache () { - return _useCodeCache; + return _useCodeCache; } /** @@ -309,7 +320,7 @@ public class Application */ public int getCodeCacheRetentionDays () { - return _codeCacheRetentionDays; + return _codeCacheRetentionDays; } /** @@ -317,7 +328,7 @@ public class Application * app files from its hosting server. */ public int maxConcurrentDownloads () { - return _maxConcDownloads; + return _maxConcDownloads; } /** @@ -325,22 +336,11 @@ public class Application */ public Resource getConfigResource () { - Resource res = null; - try { - res = createResource(CONFIG_FILE, Resource.NORMAL); - } catch (Exception e) { - log.warning("Invalid appbase '" + _vappbase + "'.", e); - } - if (res == null) { - try { - String backupConfig = BACKUP_CONFIG_DIR + File.separator + CONFIG_FILE; - log.warning("Could not read config '"+CONFIG_FILE+"'. Attempting to use backup '"+backupConfig+"'"); - res = createResource(backupConfig, Resource.NORMAL); - } catch (Exception ex) { - throw new RuntimeException("Invalid appbase in backup config'" + _vappbase + "'.", ex); - } - } - return res; + try { + return createResource(CONFIG_FILE, Resource.NORMAL); + } catch (Exception e) { + throw new RuntimeException("Invalid appbase '" + _vappbase + "'.", e); + } } /** @@ -348,7 +348,7 @@ public class Application */ public List getCodeResources () { - return _codes; + return _codes; } /** @@ -594,6 +594,25 @@ public class Application public Config init (boolean checkPlatform) throws IOException { + if (_initialised && _initialisedConfig != null) + { + return _initialisedConfig; + } + + try { + Application.i4jVersion = com.install4j.api.launcher.Variables.getCompilerVariable("sys.install4jVersion"); + } catch (IOException e) + { + System.err.println("install4j version not available"); + } catch (NoClassDefFoundError e) + { + log.warning("Starting without install4j classes"); + } catch (Throwable t) + { + System.err.println("install4j not available"); + t.printStackTrace(); + } + Config config = null; File cfgfile = _config; Config.ParseOpts opts = Config.createOpts(checkPlatform); @@ -615,9 +634,13 @@ 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()) { + +System.out.println("3 SHIFT key"+(getShiftKeyPressed()?"":" not")+" pressed"); + if (getShiftKeyPressed() || config == null || config.getString("appbase") == null || config.getString("appbase").isEmpty()) { +System.out.println("4 SHIFT key"+(getShiftKeyPressed()?"":" not")+" pressed"); try { - config = Config.parseConfig(_backupConfig, opts); + 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); @@ -799,43 +822,13 @@ public class Application addAll(jvmargs, _jvmargs); } - // see if a percentage of physical memory option exists - int jvmmempc = config.getInt("jvmmempc", -1); + // see if a percentage of physical memory, or max heap size options exist + jvmmempc = config.getString("jvmmempc", null); + jvmmemmax = config.getString("jvmmemmax", null); // app_id prefixed setting overrides if (appPrefix.length() > 0) { - jvmmempc = config.getInt(appPrefix + "jvmmempc", jvmmempc); - } - if (0 <= jvmmempc && jvmmempc <= 100) { - - long maxMemLong = -1; - - try - { - maxMemLong = MemorySetting.memPercent(jvmmempc); - } catch (Exception e) - { - e.printStackTrace(); - } catch (Throwable t) - { - t.printStackTrace(); - } - - 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)+"')"); + jvmmempc = config.getString(appPrefix + "jvmmempc", jvmmempc); + jvmmemmax = config.getString(appPrefix + "jvmmemmax", jvmmemmax); } // get the set of optimum JVM arguments @@ -870,6 +863,8 @@ public class Application _dockName = config.getString("ui.name"); _dockIconPath = config.getString("ui.mac_dock_icon", "../desktop.icns"); + _initialised = true; + _initialisedConfig = config; return config; } @@ -1071,16 +1066,43 @@ public class Application } // pass along our proxy settings - String proxyHost; - if ((proxyHost = System.getProperty("http.proxyHost")) != null) { + String proxyHost = System.getProperty("http.proxyHost"); + String proxyPort = StringUtil.isBlank(System.getProperty("http.proxyPort")) ? "80" : System.getProperty("http.proxyPort"); + if (StringUtil.isBlank(proxyHost) && ! proxy.equals(Proxy.NO_PROXY)) { + try { + SocketAddress a = proxy.address(); + if (a != null && a instanceof InetSocketAddress) { + InetSocketAddress ia = (InetSocketAddress)a; + proxyHost = ia.getHostString(); + proxyPort = String.valueOf(ia.getPort()); + } + } catch (Exception e) { + log.error("Problem obtaining proxy settings from Proxy object"); + e.printStackTrace(); + } + } + if (proxyHost != null) { + log.info("Using proxy settings "+proxyHost+":"+proxyPort); args.add("-Dhttp.proxyHost=" + proxyHost); - args.add("-Dhttp.proxyPort=" + System.getProperty("http.proxyPort")); + args.add("-Dhttp.proxyPort=" + proxyPort); args.add("-Dhttps.proxyHost=" + proxyHost); - args.add("-Dhttps.proxyPort=" + System.getProperty("http.proxyPort")); - } + args.add("-Dhttps.proxyPort=" + proxyPort); + } else { + log.info("Not setting proxy"); + } // add the marker indicating the app is running in getdown args.add("-D" + Properties.GETDOWN + "=true"); + args.add("-Dsys.install4jVersion=" + Application.i4jVersion); + args.add("-Dinstaller_template_version=" + System.getProperty("installer_template_version")); + args.add("-Dlauncher_version=" + Build.version()); + + // set HiDPI property if wanted + String scalePropertyArg = HiDPISetting.getScalePropertyArg(); + if (scalePropertyArg != null) + { + args.add(scalePropertyArg); + } // set the native library path if we have native resources // @TODO optional getdown.txt parameter to set addCurrentLibraryPath to true or false? @@ -1098,6 +1120,90 @@ public class Application } } + // test for jalview/s URL. Insert startupNotification URI into start of _appargs + if (! StringUtil.isBlank(_jalviewUri)) { + _appargs.add(0, _jalviewUri); + } + if (_appargs.size() > 0) { + String uri = _appargs.get(0); + try { + log.info("TRYING TO PARSE URL '"+uri+"'"); + URI jalviewUri = new URI(uri); + if (jalviewUri != null) { + String scheme = jalviewUri.getScheme(); + if (scheme != null && (scheme.equals("jalview") || scheme.equals("jalviews"))) { + boolean https = jalviewUri.getScheme().equals("jalviews"); + String host = jalviewUri.getHost(); + int port = jalviewUri.getPort(); + String file = jalviewUri.getPath(); + String ref = jalviewUri.getFragment(); + String query = jalviewUri.getQuery(); + + _appargs.clear(); + _appargs.add("-open"); + if (host != null && host.length() > 0) { + URL newUrl = new URL( + (https?"https":"http") + + "://" + + host + + (port > -1? String.valueOf(port) : "") + + jalviewUri.getRawPath() + + (query != null && query.length() > 0 ? "?" + jalviewUri.getRawQuery() : "") + ); + _appargs.add(newUrl.toString()); + } else { + _appargs.add(file); + } + + if (ref != null && ref.length() > 0) { + String[] refArgs = ref.split("&"); + for (String refArg : refArgs) { + if (refArg.startsWith("jvmmempc=")) { + jvmmempc = refArg.substring(9); + continue; + } + if (refArg.startsWith("jvmmemmax=")) { + jvmmemmax = refArg.substring(10); + continue; + } + _appargs.add(URLDecoder.decode(refArg, "UTF-8")); + } + } + + } + } + } catch (URISyntaxException e) { + log.error("Malformed jalview URI", uri); + } + } + + for (String argString: _appargs) { + if (argString.startsWith("-jvmmempc=")) { + jvmmempc = argString.substring(10); + continue; + } + if (argString.startsWith("-jvmmemmax=")) { + jvmmemmax = argString.substring(11); + continue; + } + } + + // add the memory setting from jvmmempc and jvmmemmax + long maxMemLong = -1; + maxMemLong = MemorySetting.getMemorySetting(jvmmemmax, 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); + break ARG; + } + } + addAll(maxMemHeapArg, _jvmargs); + } + // add the JVM arguments for (String string : _jvmargs) { args.add(processArg(string)); @@ -1137,7 +1243,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"); @@ -1148,7 +1254,7 @@ public class Application for (String string : _appargs) { args.add(processArg(string)); } - + String[] envp = createEnvironment(); String[] sargs = args.toArray(new String[args.size()]); log.info("Running " + StringUtil.join(sargs, "\n ")); @@ -1338,6 +1444,8 @@ public class Application clearValidationMarkers(); // if the new copy validates, reinitialize ourselves; otherwise report baffling hoseage if (_digest.validateResource(crsrc, null)) { + // unset _initialisedConfig so new file is initialised + _initialisedConfig = null; init(true); } else { log.warning(CONFIG_FILE + " failed to validate even after redownloading. " + @@ -1894,7 +2002,9 @@ public class Application 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)) { + if (filename.startsWith("jalview://") || filename.startsWith("jalviews://")) { + setJalviewUri(filename); + } else if (! filename.toLowerCase().endsWith("."+Application.LOCATOR_FILE_EXTENSION)) { addStartupFile(filename); } } @@ -1909,6 +2019,10 @@ public class Application _startupFiles.add(new File(filename)); } + public static void setJalviewUri(String uri) { + _jalviewUri = uri; + } + private Config createLocatorConfig(Config.ParseOpts opts) { if (_locatorFile == null) { return null; @@ -1951,7 +2065,36 @@ public class Application public String getAppbase() { return _appbase; } + + public static boolean getShiftKeyPressed() { + return shiftKeyPressed; + } + + public static void setShiftKeyPressed(boolean down) { + shiftKeyPressed |= down; + } + public boolean isInstallationAppbase() { + // if not on the installation appbase, give half a second for SHIFT key to be pressed + Config.ParseOpts opts = null; + Config config = null; + try { + Config backupConfig = Config.parseConfig(_backupConfig, opts); +System.out.println("1 SHIFT key"+(getShiftKeyPressed()?"":" not")+" pressed"); + Thread.sleep(2000); +System.out.println("2 SHIFT key"+(getShiftKeyPressed()?"":" not")+" pressed"); + return (true || (config != null && backupConfig != null && backupConfig.getString("appbase") != null && (!backupConfig.getString("appbase").equals(config.getString("appbase"))))); + + } catch (NullPointerException e) { + e.printStackTrace(); + } catch (InterruptedException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + return false; + } + protected final EnvConfig _envc; protected File _config; protected File _backupConfig; @@ -2019,5 +2162,13 @@ public class Application protected static File _locatorFile; protected static List _startupFiles = new ArrayList<>(); + protected static String _jalviewUri; public static final String LOCATOR_FILE_EXTENSION = "jvl"; + + private boolean _initialised = false; + private Config _initialisedConfig = null; + + public static String i4jVersion = null; + private String jvmmempc = null; + private String jvmmemmax = null; }