Changeset 809

Timestamp:

Apr 12, 2013, 7:37:24 PM (12 years ago)

Author:

alloc

Message:

AEI2.03:

• Fixes #8

Location:

java/installer2/src/net/oni2/aeinstaller

Files:

• backend/oni/management/Installer.java (modified) (10 diffs)
• backend/oni/management/ModInstallationList.java (added)
• backend/packages/PackageManager.java (modified) (5 diffs)
• gui/MainWin.java (modified) (1 diff)

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

@@ -70 +70 @@
 
         /**
-         * @return list of currently installed mods
-         */
-        public static Vector<Integer> getInstalledMods() {
-                File installCfg = new File(Paths.getEditionGDF(), "installed_mods.xml");
-                return PackageManager.getInstance().loadModSelection(installCfg);
-        }
-
-        /**
          * Install the given set of mods
          * 
@@ -115 +107 @@
                 log.println();
 
-                Paths.getEditionGDF().mkdirs();
-                for (File f : Paths.getEditionGDF().listFiles(new FilenameFilter() {
-                        public boolean accept(File arg0, String arg1) {
-                                String s = arg1.toLowerCase();
-                                return s.endsWith(".dat")
-                                                || s.endsWith(".raw")
-                                                || s.endsWith(".sep")
-                                                || (s.equals("intro.bik") && !SettingsManager
-                                                                .getInstance().get("copyintro", false))
-                                                || (s.equals("outro.bik") && !SettingsManager
-                                                                .getInstance().get("copyoutro", false));
-                        }
-                })) {
-                        f.delete();
-                }
+                HashSet<String> levelsAffectedBefore = null;
+                if (ModInstallationList.getInstance().isLoadedFromFile()) {
+                        levelsAffectedBefore = ModInstallationList.getInstance()
+                                        .getAffectedLevels();
+                }
+                HashSet<String> levelsAffectedNow = new HashSet<String>();
+                // TODO: fill set
+
                 File IGMD = new File(Paths.getEditionGDF(), "IGMD");
                 if (IGMD.exists()) {
@@ -149 +134 @@
                         }
                 }
-
-                File installCfg = new File(Paths.getEditionGDF(), "installed_mods.xml");
-                PackageManager.getInstance().saveModSelection(installCfg, mods);
 
                 TreeSet<Integer> unlockLevels = new TreeSet<Integer>();
@@ -217 +199 @@
                                 if (levelF.isDirectory()) {
                                         levelN = fn;
+                                        levelsAffectedNow.add(fn.toLowerCase());
                                 } else if (fn.endsWith(".dat")) {
                                         levelN = fn.substring(0, fn.lastIndexOf('.')).toLowerCase();
@@ -228 +211 @@
                 }
 
+                Paths.getEditionGDF().mkdirs();
+                for (File f : Paths.getEditionGDF().listFiles(new FilenameFilter() {
+                        public boolean accept(File arg0, String arg1) {
+                                String s = arg1.toLowerCase();
+                                return s.endsWith(".dat")
+                                                || s.endsWith(".raw")
+                                                || s.endsWith(".sep")
+                                                || (s.equals("intro.bik") && !SettingsManager
+                                                                .getInstance().get("copyintro", false))
+                                                || (s.equals("outro.bik") && !SettingsManager
+                                                                .getInstance().get("copyoutro", false));
+                        }
+                })) {
+                        String l = f.getName().toLowerCase();
+                        l = l.substring(0, l.length() - 4);
+                        if ((levelsAffectedBefore == null)
+                                        || levelsAffectedBefore.contains(l)
+                                        || levelsAffectedNow.contains(l))
+                                f.delete();
+                }
+
                 applyPatches(levels, foldersPatches, listener, log);
 
-                combineBinaryFiles(levels, listener, log);
+                TreeSet<String> levelsAffectedBoth = new TreeSet<String>();
+                levelsAffectedBoth.addAll(levelsAffectedBefore);
+                levelsAffectedBoth.addAll(levelsAffectedNow);
+                combineBinaryFiles(levels, levelsAffectedBoth, listener, log);
                 combineBSLFolders(mods, listener, log);
 
@@ -238 +245 @@
                         unlockLevels(unlockLevels, log);
                 }
+
+                ModInstallationList mil = ModInstallationList.getInstance();
+                mil.setAffectedLevels(levelsAffectedNow);
+                TreeSet<Integer> modsInstalled = new TreeSet<Integer>();
+                for (Package p : mods) {
+                        modsInstalled.add(p.getPackageNumber());
+                }
+                mil.setInstalledMods(modsInstalled);
+                mil.saveList();
 
                 log.println();
@@ -509 +525 @@
         private static void combineBinaryFiles(
                         TreeMap<String, Vector<File>> oniLevelFolders,
-                        InstallProgressListener listener, Logger log) {
+                        TreeSet<String> levelsUpdated, InstallProgressListener listener,
+                        Logger log) {
                 long startMS = new Date().getTime();
 
@@ -522 +539 @@
                                         "Installing level " + l);
 
-                        ApplicationInvocationResult res = OniSplit.packLevel(
-                                        oniLevelFolders.get(l), new File(Paths.getEditionGDF(),
-                                                        sanitizeLevelName(l) + ".dat"));
-                        log.logAppOutput(res, true);
+                        if (levelsUpdated.contains(l.toLowerCase())) {
+                                ApplicationInvocationResult res = OniSplit.packLevel(
+                                                oniLevelFolders.get(l), new File(Paths.getEditionGDF(),
+                                                                sanitizeLevelName(l) + ".dat"));
+                                log.logAppOutput(res, true);
+                        } else {
+                                log.println("\t\tLevel not affected by new mod selection");
+                                log.println();
+                        }
 
                         stepsDone++;
@@ -539 +561 @@
                 if (SettingsManager.getInstance().get("copyintro", false)) {
                         File src = new File(Paths.getVanillaGDF(), "intro.bik");
+                        File target = new File(Paths.getEditionGDF(), "intro.bik");
                         log.println("Copying intro");
-                        if (src.exists()) {
+                        if (src.exists() && !target.exists()) {
                                 try {
                                         FileUtils.copyFileToDirectory(src, Paths.getEditionGDF());
@@ -552 +575 @@
                 if (SettingsManager.getInstance().get("copyoutro", true)) {
                         File src = new File(Paths.getVanillaGDF(), "outro.bik");
+                        File target = new File(Paths.getEditionGDF(), "outro.bik");
                         log.println("Copying outro");
-                        if (src.exists()) {
+                        if (src.exists() && !target.exists()) {
                                 try {
                                         FileUtils.copyFileToDirectory(src, Paths.getEditionGDF());

java/installer2/src/net/oni2/aeinstaller/backend/packages/PackageManager.java

@@ -14 +14 @@
 
 import net.oni2.aeinstaller.backend.Paths;
-import net.oni2.aeinstaller.backend.oni.management.Installer;
+import net.oni2.aeinstaller.backend.oni.management.ModInstallationList;
 import net.oni2.aeinstaller.backend.oni.management.tools.ToolInstallationList;
 import net.oni2.moddepot.DepotManager;
@@ -32 +32 @@
         private HashMap<Integer, Package> mods = new HashMap<Integer, Package>();
         private HashMap<Integer, Package> tools = new HashMap<Integer, Package>();
-
-        private Vector<Integer> currentlyInstalled = new Vector<Integer>();
 
         /**
@@ -131 +129 @@
                                 mods.put(m.getPackageNumber(), m);
                 }
-
-                updateInstalledMods();
-        }
-
-        /**
-         * Update the list of currently installed mods
-         */
-        public void updateInstalledMods() {
-                currentlyInstalled = Installer.getInstalledMods();
-                if (currentlyInstalled == null)
-                        currentlyInstalled = new Vector<Integer>();
         }
 
@@ -219 +206 @@
         public TreeSet<Package> getInstalledMods() {
                 TreeSet<Package> res = new TreeSet<Package>();
-                for (int n : Installer.getInstalledMods()) {
+                for (int n : ModInstallationList.getInstance().getInstalledMods()) {
                         res.add(getPackageByNumber(n));
                 }
@@ -358 +345 @@
          */
         boolean isModInstalled(Package m) {
-                return currentlyInstalled.contains(m.getPackageNumber());
+                return ModInstallationList.getInstance().isInstalled(m.getPackageNumber());
         }
 }

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

@@ -782 +782 @@
         @SuppressWarnings("unused")
         private void installDone() {
-                PackageManager.getInstance().updateInstalledMods();
                 switch (installState) {
                         case DONE: