Changeset 602 for AE/installer2/src/net/oni2

Timestamp:

Jan 10, 2013, 4:39:53 PM (12 years ago)

Author:

alloc

Message:

AEI2

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• AEInstaller2.java (modified) (1 diff)
• backend/Paths.java (modified) (1 diff)
• backend/depot/DepotConfig.java (modified) (1 diff)
• backend/mods/Mod.java (modified) (6 diffs)
• backend/mods/ModManager.java (modified) (4 diffs)
• backend/oni/Installer.java (modified) (3 diffs)
• backend/oni/OniSplit.java (modified) (3 diffs)
• gui/MainWin.java (modified) (2 diffs)
• gui/MainWin.properties (modified) (1 diff)
• gui/MainWin.yml (modified) (1 diff)
• gui/modtable/ModTableFilter.java (modified) (1 diff)

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

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.50
+appversion=0.55
 
 invalidPath.title=Wrong directory

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

@@ -132 +132 @@
                 System.out.println("Architect: " + Settings.getArchitecture());
                 System.out.println(".NET:      " + OniSplit.isDotNETInstalled());
+                System.out.println("OniSplit:  " + OniSplit.isOniSplitInstalled());
                 System.out.println("Globalized:" + Installer.isEditionInitialized());
 

AE/installer2/src/net/oni2/aeinstaller/backend/Paths.java

@@ -16 +16 @@
          */
         public static File getInstallerPath() {
-                String jarPath = Settings.class.getProtectionDomain().getCodeSource()
-                                .getLocation().getPath();
-                String decodedPath = null;
-                try {
-                        decodedPath = URLDecoder.decode(jarPath, "UTF-8");
-                } catch (UnsupportedEncodingException e) {
-                        e.printStackTrace();
-                }
-                return new File(decodedPath).getParentFile();
+//              String jarPath = Settings.class.getProtectionDomain().getCodeSource()
+//                              .getLocation().getPath();
+//              String decodedPath = null;
+//              try {
+//                      decodedPath = URLDecoder.decode(jarPath, "UTF-8");
+//              } catch (UnsupportedEncodingException e) {
+//                      e.printStackTrace();
+//              }
+//              return new File(decodedPath).getParentFile();
+                String wd = System.getProperty("user.dir");
+                return new File(wd);
         }
 

AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotConfig.java

@@ -61 +61 @@
                 return "Package";
         }
+        
+        /**
+         * @return Taxonomy term name for modtype Tool
+         */
+        public static String getTaxonomyName_ModType_Tool() {
+                return "Tool";
+        }
 }

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

@@ -13 +13 @@
 import net.oni2.aeinstaller.backend.Settings;
 import net.oni2.aeinstaller.backend.Settings.Platform;
+import net.oni2.aeinstaller.backend.depot.DepotConfig;
 import net.oni2.aeinstaller.backend.depot.DepotManager;
 import net.oni2.aeinstaller.backend.depot.model.NodeMod;
@@ -22 +23 @@
 public class Mod implements Comparable<Mod> {
         // TODO: Dependencies/Conflicts
-        
+
         private String name = "";
         private int packageNumber = 0;
@@ -37 +38 @@
         private net.oni2.aeinstaller.backend.depot.model.File file = null;
 
+        private HashSet<Integer> conflicts = new HashSet<Integer>();
+        private HashSet<Integer> dependencies = new HashSet<Integer>();
+
         private long localTimestamp = 0;
 
@@ -52 +56 @@
                         Type t = ModManager.getInstance().getTypeByName(tt.getName());
                         types.add(t);
-                        t.addEntry(this);
+                        if (!t.getName().equals(DepotConfig.getTaxonomyName_ModType_Tool()))
+                                t.addEntry(this);
                 }
                 platform = nm.getPlatform();
@@ -268 +273 @@
          * @return Is a mod that is always installed?
          */
-        public boolean isDefaultMod() {
+        public boolean isMandatoryMod() {
                 return packageNumber < 10000;
         }
@@ -282 +287 @@
         public String toString() {
                 return name;
+        }
+
+        /**
+         * @return the conflicts
+         */
+        public HashSet<Integer> getConflicts() {
+                return conflicts;
+        }
+
+        /**
+         * @return the dependencies
+         */
+        public HashSet<Integer> getDependencies() {
+                return dependencies;
         }
 

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

@@ -5 +5 @@
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.TreeSet;
 import java.util.Vector;
 
 import net.oni2.aeinstaller.backend.Paths;
+import net.oni2.aeinstaller.backend.depot.DepotConfig;
 import net.oni2.aeinstaller.backend.depot.DepotManager;
 import net.oni2.aeinstaller.backend.depot.model.NodeMod;
@@ -23 +26 @@
         private HashMap<String, Type> types = new HashMap<String, Type>();
         private HashMap<Integer, Mod> mods = new HashMap<Integer, Mod>();
+        private HashMap<Integer, Mod> tools = new HashMap<Integer, Mod>();
 
         /**
@@ -52 +56 @@
                 }
 
+                TaxonomyTerm toolTerm = DepotManager.getInstance().getTaxonomyTerm(
+                                DepotConfig.getTaxonomyName_ModType_Tool());
                 for (NodeMod nm : DepotManager.getInstance().getModPackageNodes()) {
                         if (nm.getUploads().size() == 1) {
                                 Mod m = new Mod(nm);
-                                mods.put(m.getPackageNumber(), m);
+                                if (nm.getTypes().contains(toolTerm))
+                                        tools.put(m.getPackageNumber(), m);
+                                else
+                                        mods.put(m.getPackageNumber(), m);
                                 modFolders.remove(m.getPackageNumber());
                         }
@@ -102 +111 @@
          * @return Mods which are always installed
          */
-        public Collection<Mod> getDefaultMods() {
+        public Collection<Mod> getMandatoryMods() {
                 Vector<Mod> res = new Vector<Mod>();
                 for (Mod m : mods.values()) {
-                        if (m.isDefaultMod())
+                        if (m.isMandatoryMod())
                                 res.add(m);
                 }
                 return res;
         }
+        
+        /**
+         * @return Collection of tools
+         */
+        public Collection<Mod> getTools() {
+                return tools.values();
+        }
+        
+        /**
+         * @return Tools which are always installed
+         */
+        public Collection<Mod> getMandatoryTools() {
+                Vector<Mod> res = new Vector<Mod>();
+                for (Mod m : tools.values()) {
+                        if (m.isMandatoryMod())
+                                res.add(m);
+                }
+                return res;
+        }
+
+        /**
+         * Get a mod by its package number
+         * 
+         * @param number
+         *            Package number
+         * @return Mod or null
+         */
+        public Mod getModByNumber(int number) {
+                for (Mod m : mods.values()) {
+                        if (m.getPackageNumber() == number)
+                                return m;
+                }
+                return null;
+        }
+
+        /**
+         * Check for unresolved dependencies within the given mods
+         * 
+         * @param mods
+         *            Mods to check
+         * @return Unmet dependencies
+         */
+        public HashMap<Mod, HashSet<Mod>> checkDependencies(TreeSet<Mod> mods) {
+                // TODO: Verify functionality
+                HashMap<Mod, HashSet<Mod>> res = new HashMap<Mod, HashSet<Mod>>();
+
+                for (Mod m : mods) {
+                        for (int depNum : m.getDependencies()) {
+                                Mod other = getModByNumber(depNum);
+                                if (!mods.contains(other)) {
+                                        if (!res.containsKey(m))
+                                                res.put(m, new HashSet<Mod>());
+                                        res.get(m).add(other);
+                                }
+                        }
+                }
+
+                return res;
+        }
+
+        /**
+         * Check for conflicts between given mods
+         * 
+         * @param mods
+         *            Mods to check
+         * @return Conflicting mods
+         */
+        public HashMap<Mod, HashSet<Mod>> checkConflicts(TreeSet<Mod> mods) {
+                // TODO: Verify functionality
+                HashMap<Mod, HashSet<Mod>> res = new HashMap<Mod, HashSet<Mod>>();
+
+                for (Mod m : mods) {
+                        for (int confNum : m.getConflicts()) {
+                                Mod other = getModByNumber(confNum);
+                                if (mods.contains(other)) {
+                                        if (!res.containsKey(m))
+                                                res.put(m, new HashSet<Mod>());
+                                        res.get(m).add(other);
+                                }
+                        }
+                }
+
+                return res;
+        }
+
 }

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

@@ -39 +39 @@
         }
 
+        /**
+         * Install the given set of mods
+         * 
+         * @param mods
+         *            Mods to install
+         * @param listener
+         *            Listener for install progress updates
+         */
         public static void install(TreeSet<Mod> mods,
                         InstallProgressListener listener) {
-
                 Vector<File> folders = new Vector<File>();
                 folders.add(Paths.getVanillaOnisPath());
@@ -65 +72 @@
                 }
 
-                // for (File f : Paths.getModsPath().listFiles()) {
-                // File oni = new File(f, "oni");
-                // if (oni.exists())
-                // folders.add(oni);
-                // }
                 combineBinaryFiles(folders, listener);
 
@@ -140 +142 @@
                                 log.println();
                         }
-                        
+
                         Date end = new Date();
                         log.println("Initialization ended at " + sdf.format(end));

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

@@ -77 +77 @@
 
         /**
+         * @return Is Onisplit installed?
+         */
+        public static boolean isOniSplitInstalled() {
+                return getProgramFile().exists();
+        }
+
+        /**
          * Export given dat-file to target folder
          * 
@@ -112 +119 @@
          * @return OniSplit output
          */
-        public static Vector<String> importLevel(Vector<File> sourceFolders, File targetFile) {
+        public static Vector<String> importLevel(Vector<File> sourceFolders,
+                        File targetFile) {
                 Vector<String> cmdLine = getProgramInvocation();
                 cmdLine.add(getImportParam());
@@ -212 +220 @@
                 if (Settings.getPlatform() != Platform.WIN)
                         res.add("mono");
-                res.add(new File(new File(Paths.getEditionBasePath(), "Tools"),
-                                "Onisplit.exe").getPath());
-                return res;
+                res.add(getProgramFile().getPath());
+                return res;
+        }
+
+        private static File getProgramFile() {
+                return new File(new File(Paths.getEditionBasePath(), "Tools"),
+                                "Onisplit.exe");
         }
 }

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

@@ -264 +264 @@
         }
 
+        @DoInBackground(progressMessage = "mandatoryFiles.title", cancelable = false, indeterminateProgress = false)
+        private void checkMandatoryFiles(final BackgroundEvent evt) {
+                System.out.println("Tools:");
+                for (Mod m : ModManager.getInstance().getTools()) {
+                        System.out.format("  %05d %s", m.getPackageNumber(), m.getName());
+                }
+                System.out.println();
+                
+                System.out.println("Mandatory tools:");
+                for (Mod m : ModManager.getInstance().getMandatoryTools()) {
+                        System.out.format("  %05d %s", m.getPackageNumber(), m.getName());
+                }
+        }
+
         @DoInBackground(progressMessage = "installing.title", cancelable = false, indeterminateProgress = false)
         private void install(final BackgroundEvent evt) {
+                // TODO: Conflicts/Dependencies
+
                 TreeSet<Mod> mods = new TreeSet<Mod>();
-                mods.addAll(ModManager.getInstance().getDefaultMods());
+                mods.addAll(ModManager.getInstance().getMandatoryMods());
                 mods.addAll(model.getSelectedMods());
 
@@ -284 +300 @@
                         }
                 });
-
-                // TODO method stub
-                JOptionPane.showMessageDialog(this, "install", "todo",
-                                JOptionPane.INFORMATION_MESSAGE);
         }
 

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

@@ -46 +46 @@
 initializingEdition.title=Initializing Edition core
 installing.title=Installing mods
+mandatoryFiles.title=Checking for mandatory files

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

@@ -6 +6 @@
   locationRelativeTo: null
   defaultCloseOperation: doNothingOnClose
-  onWindowOpened: [execDepotUpdate,checkUpdates,initialize,focus]
+  onWindowOpened: [execDepotUpdate,checkMandatoryFiles,initialize,checkUpdates,focus]
   onWindowClosing: [askClose,saveLocalData,exit]
   iconImage: img.ae

AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableFilter.java

@@ -26 +26 @@
                 Mod mod = (Mod) entry.getModel().getValueAt(entry.getIdentifier(), -1);
 
-                if (mod.isDefaultMod())
+                if (mod.isMandatoryMod())
                         return false;