Merge pull request #172 from vatsal22/Predownloads

Use presource=[resource] to "predownload" resource

launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java

@@ -33,8 +33,6 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 
-import java.security.cert.Certificate;
-
 import java.util.*;
 
 import ca.beq.util.win32.registry.RegistryKey;
@@ -279,7 +277,9 @@ public abstract class Getdown extends Thread
         // to get some sort of interface configuration and the appbase URL
         log.info("Checking whether we need to use a proxy...");
         try {
-            _ifc = _app.init(true);
+            Config config = _app.init(true);
+            doPredownloads(_app.getResources());
+            _ifc = _app.initUpdateInterface(config);
         } catch (IOException ioe) {
             // no worries
         }
@@ -339,6 +339,34 @@ public abstract class Getdown extends Thread
         }
     }
 
+    /**
+     * Finds resources from {@code resources} that have a {@code PREDOWNLOAD} attribute,
+     * then downloads and installs them (without verifying them)
+     * @param resources resources to predownload
+     */
+    protected void doPredownloads (Collection<Resource> resources) {
+        List<Resource> predownloads = new ArrayList<>();
+
+        for(Resource rsrc: resources) {
+            if(rsrc.shouldPredownload() && !rsrc.getLocal().exists()) {
+                predownloads.add(rsrc);
+            }
+        }
+
+        try {
+            download(predownloads);
+
+            for(Resource rsrc: predownloads) {
+                // Install but don't validate yet
+                rsrc.install(false);
+            }
+
+        } catch (IOException ioe) {
+            log.warning("Failed to predownload resources. Continuing...", ioe);
+        }
+
+    }
+
     /**
      * Does the actual application validation, update and launching business.
      */
@@ -352,15 +380,23 @@ public abstract class Getdown extends Thread
         try {
             // first parses our application deployment file
             try {
-                _ifc = _app.init(true);
+                Config config = _app.init(true);
+                doPredownloads(_app.getResources());
+                _ifc = _app.initUpdateInterface(config);
             } catch (IOException ioe) {
                 log.warning("Failed to initialize: " + ioe);
                 _app.attemptRecovery(this);
                 // and re-initalize
-                _ifc = _app.init(true);
+                Config config = _app.init(true);
+                doPredownloads(_app.getResources());
+                _ifc = _app.initUpdateInterface(config);
+
                 // now force our UI to be recreated with the updated info
                 createInterfaceAsync(true);
+                setIcons(); // Force icons to be displayed
+
             }
+
             if (!_app.lockForUpdates()) {
                 throw new MultipleGetdownRunning();
             }
@@ -567,6 +603,12 @@ public abstract class Getdown extends Thread
         }
     }
 
+    /**
+     * Force app to (re)set icons
+     */
+    protected abstract void setIcons();
+
+
     /**
      * Downloads and installs an Java VM bundled with the application. This is called if we are not
      * running with the necessary Java version.
@@ -678,7 +720,8 @@ public abstract class Getdown extends Thread
         // finally update our metadata files...
         _app.updateMetadata();
         // ...and reinitialize the application
-        _ifc = _app.init(true);
+        Config config = _app.init(true);
+        _ifc = _app.initUpdateInterface(config);
     }
 
     /**

launcher/src/main/java/com/threerings/getdown/launcher/GetdownApp.java

@@ -24,7 +24,6 @@ import javax.swing.JFrame;
 import javax.swing.WindowConstants;
 
 import com.samskivert.swing.util.SwingUtil;
-import com.threerings.getdown.data.Digest;
 import com.threerings.getdown.data.EnvConfig;
 import com.threerings.getdown.data.SysProps;
 import com.threerings.getdown.util.LaunchUtil;
@@ -125,6 +124,15 @@ public class GetdownApp
                     _frame.getContentPane().removeAll();
                 }
 
+                setIcons();
+
+                _frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+                return _frame.getContentPane();
+            }
+
+            protected void setIcons() {
+                if(_frame == null) return;
+
                 if (_ifc.iconImages != null) {
                     ArrayList<Image> icons = new ArrayList<>();
                     for (String path : _ifc.iconImages) {
@@ -140,10 +148,9 @@ public class GetdownApp
                     } else {
                         _frame.setIconImages(icons);
                     }
+                } else {
+                    log.info("No icons found to load...");
                 }
-
-                _frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-                return _frame.getContentPane();
             }
 
             @Override