Changeset 608 for AE/installer2/src/net/oni2/aeinstaller/backend/oni

Timestamp:

Jan 14, 2013, 6:49:25 PM (12 years ago)

Author:

alloc

Message:

AEI2:

• Added BSL handling to installation
• Updated config-terms for dependencies/incompatibilities
• Fixed mod counts for types
• Open Edition folder through menu
• Open folder of already downloaded mod through context menu
• (Semi?)Fixed launching Oni on MacOS
• Settings: Added checkbox for update notification

File:

• AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java (modified) (8 diffs)

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

@@ -9 +9 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Scanner;
@@ -18 +19 @@
 import net.oni2.aeinstaller.backend.Settings;
 import net.oni2.aeinstaller.backend.Settings.Platform;
+import net.oni2.aeinstaller.backend.mods.EBSLInstallType;
 import net.oni2.aeinstaller.backend.mods.Mod;
 import net.oni2.aeinstaller.backend.mods.ModManager;
@@ -27 +29 @@
  */
 public class Installer {
+        private static FileFilter dirFileFilter = new FileFilter() {
+                @Override
+                public boolean accept(File pathname) {
+                        return pathname.isDirectory();
+                }
+        };
+
         /**
          * @return Is Edition Core initialized
@@ -97 +106 @@
                 }
         }
+
         /**
          * Install the given set of mods
@@ -116 +126 @@
                 ModManager.getInstance().saveModSelection(installCfg, mods);
 
-                Vector<File> folders = new Vector<File>();
-                folders.add(Paths.getVanillaOnisPath());
+                Vector<File> foldersOni = new Vector<File>();
+                foldersOni.add(Paths.getVanillaOnisPath());
 
                 for (Mod m : mods) {
@@ -127 +137 @@
                                         File oniWin = new File(oni, "win_only");
                                         if (oniCommon.exists())
-                                                folders.add(oniCommon);
+                                                foldersOni.add(oniCommon);
                                         if (Settings.getPlatform() == Platform.MACOS
                                                         && oniMac.exists())
-                                                folders.add(oniMac);
+                                                foldersOni.add(oniMac);
                                         else if (oniWin.exists())
-                                                folders.add(oniWin);
+                                                foldersOni.add(oniWin);
                                 } else {
-                                        folders.add(oni);
-                                }
-                        }
-                }
-
-                combineBinaryFiles(folders, listener);
-
-                // TODO: bsl()
+                                        foldersOni.add(oni);
+                                }
+                        }
+                }
+                combineBinaryFiles(foldersOni, listener);
+                combineBSLFolders(mods, listener);
+        }
+
+        private static void combineBSLFolders(TreeSet<Mod> mods,
+                        InstallProgressListener listener) {
+                listener.installProgressUpdate(95, 100, "Installing BSL files");
+
+                HashMap<EBSLInstallType, Vector<Mod>> modsToInclude = new HashMap<EBSLInstallType, Vector<Mod>>();
+                modsToInclude.put(EBSLInstallType.NORMAL, new Vector<Mod>());
+                modsToInclude.put(EBSLInstallType.ADDON, new Vector<Mod>());
+
+                for (Mod m : mods.descendingSet()) {
+                        File bsl = new File(m.getLocalPath(), "bsl");
+                        if (bsl.exists()) {
+                                if (m.hasSeparatePlatformDirs()) {
+                                        File bslCommon = new File(bsl, "common");
+                                        File bslMac = new File(bsl, "mac_only");
+                                        File bslWin = new File(bsl, "win_only");
+                                        if ((Settings.getPlatform() == Platform.MACOS && bslMac
+                                                        .exists())
+                                                        || ((Settings.getPlatform() == Platform.WIN || Settings
+                                                                        .getPlatform() == Platform.LINUX) && bslWin
+                                                                        .exists()) || bslCommon.exists()) {
+                                                modsToInclude.get(m.getBSLInstallType()).add(m);
+                                        }
+                                } else {
+                                        modsToInclude.get(m.getBSLInstallType()).add(m);
+                                }
+                        }
+                }
+
+                for (Mod m : modsToInclude.get(EBSLInstallType.NORMAL)) {
+                        copyBSL(m, false);
+                }
+                for (Mod m : modsToInclude.get(EBSLInstallType.ADDON)) {
+                        copyBSL(m, true);
+                }
+        }
+
+        private static void copyBSL(Mod sourceMod, boolean addon) {
+                File targetBaseFolder = new File(Paths.getEditionGDF(), "IGMD");
+                if (!targetBaseFolder.exists())
+                        targetBaseFolder.mkdir();
+
+                Vector<File> sources = new Vector<File>();
+                File bsl = new File(sourceMod.getLocalPath(), "bsl");
+                if (sourceMod.hasSeparatePlatformDirs()) {
+                        File bslCommon = new File(bsl, "common");
+                        File bslMac = new File(bsl, "mac_only");
+                        File bslWin = new File(bsl, "win_only");
+                        if (Settings.getPlatform() == Platform.MACOS && bslMac.exists()) {
+                                for (File f : bslMac.listFiles(dirFileFilter)) {
+                                        File targetBSL = new File(targetBaseFolder, f.getName());
+                                        if (addon || !targetBSL.exists())
+                                                sources.add(f);
+                                }
+                        }
+                        if ((Settings.getPlatform() == Platform.WIN || Settings
+                                        .getPlatform() == Platform.LINUX) && bslWin.exists()) {
+                                for (File f : bslWin.listFiles(dirFileFilter)) {
+                                        File targetBSL = new File(targetBaseFolder, f.getName());
+                                        if (addon || !targetBSL.exists())
+                                                sources.add(f);
+                                }
+                        }
+                        if (bslCommon.exists()) {
+                                for (File f : bslCommon.listFiles(dirFileFilter)) {
+                                        File targetBSL = new File(targetBaseFolder, f.getName());
+                                        if (addon || !targetBSL.exists())
+                                                sources.add(f);
+                                }
+                        }
+                } else {
+                        for (File f : bsl.listFiles(dirFileFilter)) {
+                                File targetBSL = new File(targetBaseFolder, f.getName());
+                                if (addon || !targetBSL.exists())
+                                        sources.add(f);
+                        }
+                }
+
+                System.out.println("For mod: " + sourceMod.getName()
+                                + " install BSL folders: " + sources.toString());
+                for (File f : sources) {
+                        File targetPath = new File(targetBaseFolder, f.getName());
+                        if (!targetPath.exists())
+                                targetPath.mkdir();
+                        for (File fbsl : f.listFiles()) {
+                                File targetFile = new File(targetPath, fbsl.getName());
+                                if (!targetFile.exists()) {
+                                        try {
+                                                FileUtils.copyFile(fbsl, targetFile);
+                                        } catch (IOException e) {
+                                                // TODO Auto-generated catch block
+                                                e.printStackTrace();
+                                        }
+                                }
+                        }
+                }
         }
 
@@ -171 +276 @@
                 String s : levels.keySet())
                         totalSteps++;
+                totalSteps++;
 
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -202 +308 @@
 
                         log.println();
+                        stepsDone++;
                 }