Update changes - components can now be marked as requiring a client restart, and client updates show a message box with manual instructions if the user isn't using a launcher

git-svn-id: http://svn.dmdirc.com/trunk@3061 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/updater/Update.java

@@ -47,7 +47,8 @@ public final class Update {
         DOWNLOADING,
         INSTALLING,
         INSTALLED,
-        ERROR
+        ERROR,
+        RESTART_NEEDED
     }
 
     /** Update component. */
@@ -191,9 +192,14 @@ public final class Update {
                 setStatus(STATUS.INSTALLING);
 
                 try {
-                    UpdateChecker.findComponent(getComponent()).doInstall(path);
-
-                    setStatus(STATUS.INSTALLED);
+                    final boolean restart = UpdateChecker.findComponent(getComponent()).doInstall(path);
+
+                    if (restart) {
+                        setStatus(STATUS.RESTART_NEEDED);
+                        UpdateChecker.removeComponent(getComponent());
+                    } else {
+                        setStatus(STATUS.INSTALLED);
+                    }
                 } catch (Throwable ex) {
                     setStatus(STATUS.ERROR);
                     Logger.appError(ErrorLevel.MEDIUM,

src/com/dmdirc/updater/UpdateChecker.java

@@ -63,7 +63,7 @@ public final class UpdateChecker implements Runnable {
         /** New updates are available. */
         UPDATES_AVAILABLE
     }
-    
+
     /** Semaphore used to prevent multiple invocations. */
     private static final Semaphore mutex = new Semaphore(1);
 
@@ -82,7 +82,7 @@ public final class UpdateChecker implements Runnable {
 
     /** Our current state. */
     private static STATE status = STATE.IDLE;
-    
+
     /** A reference to the listener we use for update status changes. */
     private static final UpdateListener listener = new UpdateListener() {
         @Override
@@ -112,10 +112,10 @@ public final class UpdateChecker implements Runnable {
     public void run() {
         if (!mutex.tryAcquire()) {
             // Duplicate invocation
-            
+
             return;
         }
-        
+
         final ConfigManager config = IdentityManager.getGlobalConfig();
 
         if (!config.getOptionBool("updater", "enable", true)) {
@@ -165,7 +165,7 @@ public final class UpdateChecker implements Runnable {
         } else {
             setStatus(STATE.UPDATES_AVAILABLE);
         }
-        
+
         mutex.release();
 
         UpdateChecker.init();
@@ -255,6 +255,25 @@ public final class UpdateChecker implements Runnable {
         components.add(component);
     }
 
+    /**
+     * Unregisters an update component with the specified name.
+     *
+     * @param name The name of the component to be removed
+     */
+    public static void removeComponent(final String name) {
+        UpdateComponent target = null;
+
+        for (UpdateComponent component : components) {
+            if (name.equals(component.getName())) {
+                target = component;
+            }
+        }
+
+        if (target != null) {
+            components.remove(target);
+        }
+    }
+
     /**
      * Finds and returns the component with the specified name.
      *
@@ -346,16 +365,16 @@ public final class UpdateChecker implements Runnable {
             myListener.statusChanged(newStatus);
         }
     }
-    
+
     /**
      * Checks is a specified component is enabled.
-     * 
+     *
      * @param component Update component to check state
-     * 
+     *
      * @return true iif the update component is enabled
      */
     public static boolean isEnabled(final UpdateComponent component) {
-        return IdentityManager.getGlobalConfig().getOptionBool("updater", 
+        return IdentityManager.getGlobalConfig().getOptionBool("updater",
                 component.getName(), true);
     }
 

src/com/dmdirc/updater/UpdateComponent.java

@@ -53,8 +53,9 @@ public interface UpdateComponent {
      * file.
      * 
      * @param path The full path to the downloaded data
+     * @return True if a client restart is needed, false otherwise
      * @throws java.lang.Throwable If any error occured
      */
-    void doInstall(String path) throws Throwable;
+    boolean doInstall(String path) throws Throwable;
 
 }

src/com/dmdirc/updater/components/ClientComponent.java

@@ -25,6 +25,7 @@ package com.dmdirc.updater.components;
 import com.dmdirc.Main;
 import com.dmdirc.updater.UpdateComponent;
 
+import com.dmdirc.util.resourcemanager.ResourceManager;
 import java.io.File;
 
 /**
@@ -48,13 +49,29 @@ public class ClientComponent implements UpdateComponent {
 
     /** {@inheritDoc} */
     @Override
-    public void doInstall(final String path) {
+    public boolean doInstall(final String path) {
         final File tmpFile = new File(path);
         final File targetFile = new File(tmpFile.getParent() + File.separator + ".DMDirc.jar");
+        
         if (targetFile.exists()) {
             targetFile.delete();
         }
+        
         tmpFile.renameTo(targetFile);
+        
+        if (!LauncherComponent.isUsingLauncher()) {
+            Main.getUI().showMessageDialog("Client update downloaded", 
+                    "A new version of DMDirc has been downloaded, but as you\n"
+                    + "do not seem to be using the DMDirc launcher, it will\n"
+                    + "not be installed automatically.\n\n"
+                    + "To install this update manually, please replaces the\n"
+                    + "existing DMDirc.jar file, located at:\n"
+                    + "  " + ResourceManager.getJarPath() + "\n"
+                    + "with the following file:\n"
+                    + "  " + targetFile.getAbsolutePath());
+        }
+        
+        return true;
     }
 
 }

src/com/dmdirc/updater/components/DefaultsComponent.java

@@ -61,7 +61,7 @@ public class DefaultsComponent implements UpdateComponent {
      * @throws java.io.IOException On i/o exception when reading zip file
      */
     @Override
-    public void doInstall(final String path) throws IOException {
+    public boolean doInstall(final String path) throws IOException {
         final ZipResourceManager ziprm = ZipResourceManager.getInstance(path);
         
         ziprm.extractResources("", IdentityManager.getDirectory());
@@ -69,6 +69,8 @@ public class DefaultsComponent implements UpdateComponent {
         IdentityManager.loadUser();
         
         new File(path).delete();
+        
+        return false;
     }
 
 }

src/com/dmdirc/updater/components/LauncherComponent.java

@@ -59,6 +59,15 @@ public class LauncherComponent implements UpdateComponent {
         
         UpdateChecker.registerComponent(new LauncherComponent());
     }
+    
+    /**
+     * Determines if the client has been run using the launcher.
+     * 
+     * @return True if the launcher has been used, false otherwise
+     */
+    public static boolean isUsingLauncher() {
+        return version != -1;
+    }
 
     /** {@inheritDoc} */
     @Override
@@ -74,7 +83,7 @@ public class LauncherComponent implements UpdateComponent {
 
     /** {@inheritDoc} */
     @Override
-    public void doInstall(final String path) throws Throwable {
+    public boolean doInstall(final String path) throws Throwable {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 

src/com/dmdirc/updater/components/ModeAliasesComponent.java

@@ -61,7 +61,7 @@ public class ModeAliasesComponent implements UpdateComponent {
      * @throws java.io.IOException On i/o exception when reading zip file
      */
     @Override
-    public void doInstall(final String path) throws IOException {
+    public boolean doInstall(final String path) throws IOException {
         final ZipResourceManager ziprm = ZipResourceManager.getInstance(path);
         
         ziprm.extractResources("", IdentityManager.getDirectory());
@@ -69,6 +69,8 @@ public class ModeAliasesComponent implements UpdateComponent {
         IdentityManager.loadUser();
         
         new File(path).delete();
+        
+        return false;
     }
 
 }

src/com/dmdirc/util/resourcemanager/ResourceManager.java

@@ -91,6 +91,15 @@ public abstract class ResourceManager {
         return me;
     }
     
+    /**
+     * Determines the path of DMDirc's .jar file, if possible.
+     * 
+     * @return The path to DMDirc's .jar file.
+     */
+    public static String getJarPath() {
+        return "<unknown location>";
+    }
+    
     /**
      * Returns an appropriate instance of ResourceManager for the specified url string.
      *