Changeset 663 for AE/installer2

Timestamp:

Feb 4, 2013, 12:00:01 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99n:

• Allow for IGMD folders to be protected from being overwritten by mod installations (ignore.txt)

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• backend/oni/Installer.java (modified) (5 diffs)

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

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.99m
+appversion=0.99n

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

@@ -208 +208 @@
         public static void install(TreeSet<Package> mods,
                         InstallProgressListener listener) {
-                try {
-                        createEmptyPath(Paths.getEditionGDF());
-                } catch (IOException e) {
-                        e.printStackTrace();
-                }
-
                 File logFile = new File(Paths.getInstallerPath(), "Installation.log");
                 PrintWriter log = null;
@@ -226 +220 @@
 
                 log.println();
-                log.println("AEI2 version: " + SwingJavaBuilder.getConfig().getResource("appversion"));
+                log.println("AEI2 version: "
+                                + SwingJavaBuilder.getConfig().getResource("appversion"));
                 log.println("Installed tools:");
                 for (Package t : PackageManager.getInstance().getInstalledTools()) {
@@ -236 +231 @@
                 }
                 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") && !Settings.getInstance()
+                                                                .get("copyintro", false))
+                                                || (s.equals("outro.bik") && !Settings.getInstance()
+                                                                .get("copyoutro", false));
+                        }
+                })) {
+                        f.delete();
+                }
+                File IGMD = new File(Paths.getEditionGDF(), "IGMD");
+                if (IGMD.exists()) {
+                        for (File f : IGMD.listFiles(new FileFilter() {
+                                @Override
+                                public boolean accept(File pathname) {
+                                        return pathname.isDirectory();
+                                }
+                        })) {
+                                File ignore = new File(f, "ignore.txt");
+                                if (!ignore.exists()) {
+                                        try {
+                                                FileUtils.deleteDirectory(f);
+                                        } catch (IOException e) {
+                                                // TODO Auto-generated catch block
+                                                e.printStackTrace();
+                                        }
+                                }
+                        }
+                }
 
                 File installCfg = new File(Paths.getEditionGDF(), "installed_mods.xml");
@@ -267 +297 @@
                         }
                 }
-                
+
                 combineBinaryFiles(foldersOni, listener, log);
                 combineBSLFolders(mods, listener, log);
@@ -370 +400 @@
                         if (!targetPath.exists())
                                 targetPath.mkdir();
-                        for (File fbsl : f.listFiles()) {
-                                File targetFile = new File(targetPath, fbsl.getName());
-                                if (addon || !targetFile.exists()) {
-                                        try {
-                                                FileUtils.copyFile(fbsl, targetFile);
-                                        } catch (IOException e) {
-                                                e.printStackTrace();
+                        if (!(new File(targetPath, "ignore.txt").exists())) {
+                                for (File fbsl : f.listFiles()) {
+                                        File targetFile = new File(targetPath, fbsl.getName());
+                                        if (addon || !targetFile.exists()) {
+                                                try {
+                                                        FileUtils.copyFile(fbsl, targetFile);
+                                                } catch (IOException e) {
+                                                        e.printStackTrace();
+                                                }
                                         }
                                 }