Changeset 624

Timestamp:

Jan 16, 2013, 12:22:28 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.84:

• Actually *do* update packages
• Uninstall backend for tools

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• AEInstaller2.java (modified) (2 diffs)
• backend/mods/ModManager.java (modified) (2 diffs)
• backend/mods/download/ModDownload.java (modified) (1 diff)
• backend/oni/Installer.java (modified) (9 diffs)
• backend/oni/OniSplit.java (modified) (6 diffs)
• backend/oni/PersistDat.java (added)
• gui/MainWin.java (modified) (3 diffs)

AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.83
+appversion=0.84
 
 invalidPath.title=Wrong directory

AE/installer2/src/net/oni2/aeinstaller/AEInstaller2.java

@@ -121 +121 @@
                 JFrame.setDefaultLookAndFeelDecorated(true);
 
-                // TODO
+                // TODO: Remove debug output
                 System.out.println("JarPath:   " + Paths.getInstallerPath());
                 System.out.println("PrefsPath: " + Paths.getPrefsPath());
@@ -134 +134 @@
                 System.out.println("Globalized:" + Installer.isEditionInitialized());
 
+                // TODO: Check available space
                 System.out
                                 .println("Free space on temp: "

AE/installer2/src/net/oni2/aeinstaller/backend/mods/ModManager.java

@@ -286 +286 @@
          */
         public HashMap<Mod, HashSet<Mod>> checkDependencies(TreeSet<Mod> mods) {
-                // TODO: Verify functionality
+                // TODO: Verify functionality (checkDependencies)
                 HashMap<Mod, HashSet<Mod>> res = new HashMap<Mod, HashSet<Mod>>();
 
@@ -311 +311 @@
          */
         public HashMap<Mod, HashSet<Mod>> checkIncompabitilites(TreeSet<Mod> mods) {
-                // TODO: Verify functionality
+                // TODO: Verify functionality (checkIncompatibilities)
                 HashMap<Mod, HashSet<Mod>> res = new HashMap<Mod, HashSet<Mod>>();
 

AE/installer2/src/net/oni2/aeinstaller/backend/mods/download/ModDownload.java

@@ -72 +72 @@
                 zipFile = new File(Paths.getDownloadPath(),
                                 mod.getPackageNumberString() + ".zip");
-                targetFolder = new File(Paths.getModsPath(),
-                                mod.getPackageNumberString());
+                targetFolder = mod.getLocalPath();
                 try {
                         downloader = new FileDownloader(mod.getFile().getUri_full(),

AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java

@@ -3 +3 @@
 import java.io.File;
 import java.io.FileFilter;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
@@ -10 +12 @@
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Scanner;
@@ -24 +27 @@
 
 import org.apache.commons.io.FileUtils;
+
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.xml.StaxDriver;
 
 /**
@@ -58 +64 @@
 
         /**
+         * @return Currently installed tools
+         */
+        @SuppressWarnings("unchecked")
+        public static TreeSet<Integer> getInstalledTools() {
+                File installCfg = new File(Paths.getInstallerPath(),
+                                "installed_tools.xml");
+                TreeSet<Integer> res = new TreeSet<Integer>();
+                try {
+                        if (installCfg.exists()) {
+                                FileInputStream fis = new FileInputStream(installCfg);
+                                XStream xs = new XStream(new StaxDriver());
+                                Object obj = xs.fromXML(fis);
+                                if (obj instanceof TreeSet<?>)
+                                        res = (TreeSet<Integer>) obj;
+                                fis.close();
+                        }
+                } catch (FileNotFoundException e) {
+                        e.printStackTrace();
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }
+                return res;
+        }
+
+        private static void writeInstalledTools(TreeSet<Integer> tools) {
+                File installCfg = new File(Paths.getInstallerPath(),
+                                "installed_tools.xml");
+                try {
+                        FileOutputStream fos = new FileOutputStream(installCfg);
+                        XStream xs = new XStream(new StaxDriver());
+                        xs.toXML(tools, fos);
+                        fos.close();
+                } catch (FileNotFoundException e) {
+                        e.printStackTrace();
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }
+        }
+
+        /**
          * @param tools
          *            Tools to install
          */
         public static void installTools(TreeSet<Mod> tools) {
+                TreeSet<Integer> installed = getInstalledTools();
                 for (Mod m : tools) {
                         File plain = new File(m.getLocalPath(), "plain");
@@ -80 +127 @@
                                 }
                         }
-                }
+                        installed.add(m.getPackageNumber());
+                }
+                writeInstalledTools(installed);
         }
 
@@ -88 +137 @@
          */
         public static void uninstallTools(TreeSet<Mod> tools) {
-                // TODO: implement this!
+                TreeSet<Integer> installed = getInstalledTools();
+                for (Mod m : tools) {
+                        if (installed.contains(m.getPackageNumber())) {
+                                File plain = new File(m.getLocalPath(), "plain");
+                                if (plain.exists()) {
+                                        if (m.hasSeparatePlatformDirs()) {
+                                                File plainCommon = new File(plain, "common");
+                                                File plainMac = new File(plain, "mac_only");
+                                                File plainWin = new File(plain, "win_only");
+                                                if (plainCommon.exists())
+                                                        removeToolsFiles(plainCommon,
+                                                                        Paths.getEditionBasePath());
+                                                if (Settings.getPlatform() == Platform.MACOS
+                                                                && plainMac.exists())
+                                                        removeToolsFiles(plainMac,
+                                                                        Paths.getEditionBasePath());
+                                                else if (plainWin.exists())
+                                                        removeToolsFiles(plainWin,
+                                                                        Paths.getEditionBasePath());
+                                        } else {
+                                                removeToolsFiles(plain, Paths.getEditionBasePath());
+                                        }
+                                }
+                        }
+                        installed.remove(m.getPackageNumber());
+                }
+                writeInstalledTools(installed);
         }
 
@@ -106 +181 @@
         }
 
+        private static void removeToolsFiles(File srcFolder, File target) {
+                for (File f : srcFolder.listFiles()) {
+                        if (f.isDirectory())
+                                removeToolsFiles(f, new File(target, f.getName()));
+                        else {
+                                File targetFile = new File(target, f.getName());
+                                if (targetFile.exists())
+                                        targetFile.delete();
+                        }
+                }
+                if (target.list().length == 0)
+                        target.delete();
+        }
+
         /**
          * Install the given set of mods
@@ -125 +214 @@
                 ModManager.getInstance().saveModSelection(installCfg, mods);
 
+                HashSet<Integer> unlockLevels = new HashSet<Integer>();
+
                 Vector<File> foldersOni = new Vector<File>();
                 foldersOni.add(Paths.getVanillaOnisPath());
 
                 for (Mod m : mods) {
+                        for (int lev : m.getUnlockLevels())
+                                unlockLevels.add(lev);
+
                         File oni = new File(m.getLocalPath(), "oni");
                         if (oni.exists()) {
@@ -149 +243 @@
                 combineBinaryFiles(foldersOni, listener);
                 combineBSLFolders(mods, listener);
+
+                if (unlockLevels.size() > 0) {
+                        File dat = new File(Paths.getEditionBasePath(), "persist.dat");
+                        if (dat.exists()) {
+                                PersistDat save = new PersistDat(dat);
+                                HashSet<Integer> currentlyUnlocked = save.getUnlockedLevels();
+                                currentlyUnlocked.addAll(unlockLevels);
+                                save.setUnlockedLevels(currentlyUnlocked);
+                                save.close();
+                        } else {
+                                // TODO: what if persist.dat does not exist?
+                        }
+                }
         }
 

AE/installer2/src/net/oni2/aeinstaller/backend/oni/OniSplit.java

@@ -8 +8 @@
 
 import net.oni2.aeinstaller.backend.Paths;
-import net.oni2.aeinstaller.backend.QuickAppExecution;
+import net.oni2.aeinstaller.backend.AppExecution;
 import net.oni2.aeinstaller.backend.Settings;
 import net.oni2.aeinstaller.backend.Settings.Architecture;
@@ -55 +55 @@
                                 Vector<String> res = null;
                                 try {
-                                        res = QuickAppExecution.execute(cmd);
+                                        res = AppExecution.executeAndWait(cmd);
                                 } catch (IOException e) {
                                         e.printStackTrace();
@@ -97 +97 @@
                 Vector<String> res = null;
                 try {
-                        res = QuickAppExecution.execute(cmdLine);
+                        res = AppExecution.executeAndWait(cmdLine);
                 } catch (IOException e) {
                         e.printStackTrace();
@@ -122 +122 @@
                 Vector<String> res = null;
                 try {
-                        res = QuickAppExecution.execute(cmdLine);
+                        res = AppExecution.executeAndWait(cmdLine);
                 } catch (IOException e) {
                         e.printStackTrace();
@@ -151 +151 @@
                 Vector<String> res = null;
                 try {
-                        res = QuickAppExecution.execute(cmdLine);
+                        res = AppExecution.executeAndWait(cmdLine);
                 } catch (IOException e) {
                         e.printStackTrace();
@@ -182 +182 @@
                 Vector<String> res = null;
                 try {
-                        res = QuickAppExecution.execute(cmdLine);
+                        res = AppExecution.executeAndWait(cmdLine);
                 } catch (IOException e) {
                         e.printStackTrace();

AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

@@ -322 +322 @@
         }
 
-        @DoInBackground(progressMessage = "doUpdate.title", cancelable = false, indeterminateProgress = false)
-        private void doUpdate(final BackgroundEvent evt) {
+        @SuppressWarnings("unused")
+        private void doUpdate() {
                 if (execUpdates != null) {
-                        // TODO
-                        System.out.println("Update: " + execUpdates.toString());
-                        // TODO: install new tools if previously installed
+                        Downloader dl = new Downloader(execUpdates);
+                        try {
+                                dl.setVisible(true);
+                                if (dl.isFinished()) {
+                                        TreeSet<Integer> installed = Installer.getInstalledTools();
+                                        TreeSet<Mod> tools = new TreeSet<Mod>();
+                                        for (Mod m : execUpdates)
+                                                if (m.isTool()
+                                                                && installed.contains(m.getPackageNumber()))
+                                                        tools.add(m);
+                                        if (tools.size() > 0) {
+                                                Installer.installTools(tools);
+                                        }
+                                }
+                        } finally {
+                                dl.dispose();
+                        }
                 }
                 execUpdates = null;
@@ -414 +428 @@
         @SuppressWarnings("unused")
         private void tools() {
-                // TODO method stub
+                // TODO: Open tools manager
                 JOptionPane.showMessageDialog(this, "tools", "todo",
                                 JOptionPane.INFORMATION_MESSAGE);
@@ -435 +449 @@
                                         ico = new ImageIcon(m.getIconFile().getPath());
                                 } else {
-                                        URL icon = AEInstaller2.class.getResource("images/transparent.png");
+                                        URL icon = AEInstaller2.class
+                                                        .getResource("images/transparent.png");
                                         ico = new ImageIcon(icon);
                                 }