Changeset 631 for AE/installer2/src/net/oni2/aeinstaller/backend

Timestamp:

Jan 18, 2013, 4:45:11 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.90:

• Added blank persist.dat for UnlockLevel to always work
• Made local paths use the sanitized mod-name
• Added mod-state column to mod table

Location:

AE/installer2/src/net/oni2/aeinstaller/backend

Files:

• mods/Mod.java (modified) (4 diffs)
• mods/ModManager.java (modified) (1 diff)
• oni/Installer.java (modified) (4 diffs)

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

@@ -216 +216 @@
         }
 
+        private String getSanitizedPathName() {
+                return name.replaceAll("[^a-zA-Z0-9_.-]", "_");
+        }
+
         /**
          * @return Path to local mod folder
@@ -233 +237 @@
                 }
 
-                return new File(Paths.getModsPath(), folderStart);
+                return new File(Paths.getModsPath(), folderStart
+                                + getSanitizedPathName());
         }
 
@@ -254 +259 @@
 
         /**
+         * @return Is mod installed?
+         */
+        public boolean isInstalled() {
+                return ModManager.getInstance().isModInstalled(this);
+        }
+
+        /**
          * @return Name of mod
          */
@@ -376 +388 @@
                 return exeFile;
         }
+
         /**
          * @return Icon file of this tool

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

@@ -334 +334 @@
          * @return Is mod installed?
          */
-        public boolean isModInstalled(Mod m) {
+        boolean isModInstalled(Mod m) {
                 return currentlyInstalled.contains(m.getPackageNumber());
         }

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

@@ -8 +8 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
@@ -19 +20 @@
 import java.util.Vector;
 
+import net.oni2.aeinstaller.AEInstaller2;
 import net.oni2.aeinstaller.backend.Paths;
 import net.oni2.aeinstaller.backend.Settings;
@@ -244 +246 @@
                 combineBSLFolders(mods, listener);
 
-                if (Settings.getInstance().get("copyintro", false)) {
-                        File src = new File(Paths.getVanillaGDF(), "intro.bik");
-                        if (src.exists()) {
-                                try {
-                                        FileUtils.copyFileToDirectory(src, Paths.getEditionGDF());
-                                } catch (IOException e) {
-                                        e.printStackTrace();
-                                }
-                        }
-                }
-                if (Settings.getInstance().get("copyoutro", true)) {
-                        File src = new File(Paths.getVanillaGDF(), "outro.bik");
-                        if (src.exists()) {
-                                try {
-                                        FileUtils.copyFileToDirectory(src, Paths.getEditionGDF());
-                                } catch (IOException e) {
-                                        e.printStackTrace();
-                                }
-                        }
-                }
+                copyVideos();
 
                 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?
-                        }
+                        unlockLevels(unlockLevels);
                 }
         }
@@ -445 +419 @@
         }
 
+        private static void copyVideos() {
+                if (Settings.getInstance().get("copyintro", false)) {
+                        File src = new File(Paths.getVanillaGDF(), "intro.bik");
+                        if (src.exists()) {
+                                try {
+                                        FileUtils.copyFileToDirectory(src, Paths.getEditionGDF());
+                                } catch (IOException e) {
+                                        e.printStackTrace();
+                                }
+                        }
+                }
+                if (Settings.getInstance().get("copyoutro", true)) {
+                        File src = new File(Paths.getVanillaGDF(), "outro.bik");
+                        if (src.exists()) {
+                                try {
+                                        FileUtils.copyFileToDirectory(src, Paths.getEditionGDF());
+                                } catch (IOException e) {
+                                        e.printStackTrace();
+                                }
+                        }
+                }
+        }
+
+        private static void unlockLevels(HashSet<Integer> unlockLevels) {
+                File dat = new File(Paths.getEditionBasePath(), "persist.dat");
+                if (!dat.exists()) {
+                        InputStream is = AEInstaller2.class.getResourceAsStream("/net/oni2/aeinstaller/resources/persist.dat");
+                        try {
+                                FileUtils.copyInputStreamToFile(is, dat);
+                        } catch (IOException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
+                }
+                PersistDat save = new PersistDat(dat);
+                HashSet<Integer> currentlyUnlocked = save.getUnlockedLevels();
+                currentlyUnlocked.addAll(unlockLevels);
+                save.setUnlockedLevels(currentlyUnlocked);
+                save.close();
+        }
+
         /**
          * Initializes the Edition core