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

Timestamp:

Jan 16, 2013, 11:25:00 AM (12 years ago)

Author:

alloc

Message:

AEI2 0.83:

• Dependencies from Mods to Tools supported
• Installed tools can get a menu entry to launch them
• Mods can unlock levels in persist.dat through UnlockLevel-tag

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• Images.properties (modified) (1 diff)
• backend/AppExecution.java (added)
• backend/QuickAppExecution.java (deleted)
• backend/Settings.java (modified) (2 diffs)
• backend/mods/Mod.java (modified) (8 diffs)
• backend/mods/ModManager.java (modified) (1 diff)
• gui/MainWin.java (modified) (8 diffs)
• gui/MainWin.properties (modified) (1 diff)
• gui/MainWin.yml (modified) (3 diffs)
• images/transparent.png (added)

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

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.82
+appversion=0.83
 
 invalidPath.title=Wrong directory

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

@@ -32 +32 @@
 img.ae=/net/oni2/aeinstaller/images/AElogo.png
 img.oni=/net/oni2/aeinstaller/images/oni.png
+img.transparent=/net/oni2/aeinstaller/images/transparent.png

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

@@ -80 +80 @@
                 Vector<String> res = null;
                 try {
-                        res = QuickAppExecution.execute(cmd);
+                        res = AppExecution.executeAndWait(cmd);
                 } catch (IOException e) {
                         e.printStackTrace();
@@ -134 +134 @@
                                 Vector<String> res = null;
                                 try {
-                                        res = QuickAppExecution.execute(cmd);
+                                        res = AppExecution.executeAndWait(cmd);
                                 } catch (IOException e) {
                                         e.printStackTrace();

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

@@ -26 +26 @@
 
         private HashSet<Type> types = new HashSet<Type>();
+        private boolean tool = false;
         private ECompatiblePlatform platform = null;
         private String version = "";
@@ -36 +37 @@
         private net.oni2.aeinstaller.backend.depot.model.File file = null;
 
+        private File exeFile = null;
+        private File iconFile = null;
+        private String workingDir = "Base";
+
         private HashSet<Integer> incompatibilities = new HashSet<Integer>();
         private HashSet<Integer> dependencies = new HashSet<Integer>();
+        private HashSet<Integer> unlockLevel = new HashSet<Integer>();
 
         private long localTimestamp = 0;
@@ -52 +58 @@
                 packageNumber = nm.getPackageNumber();
                 platform = nm.getPlatform();
+                tool = nm.isTool();
                 for (TaxonomyTerm tt : nm.getTypes()) {
                         Type t = ModManager.getInstance().getTypeByName(tt.getName());
                         types.add(t);
-                        if (!nm.isTool() && !isMandatoryMod() && isValidOnPlatform())
+                        if (!tool && !isMandatoryMod() && isValidOnPlatform())
                                 t.addEntry(this);
                 }
@@ -76 +83 @@
                 File config = new File(getLocalPath(), "Mod_Info.cfg");
                 File aeicfg = new File(getLocalPath(), "aei.cfg");
+                File plain = new File(getLocalPath(), "plain");
                 if (config.exists()) {
                         try {
@@ -131 +139 @@
                                                         }
                                                 }
+                                        } else if (sName.equalsIgnoreCase("UnlockLevel")) {
+                                                String[] levelsS = sVal.split(",");
+                                                for (String s : levelsS) {
+                                                        try {
+                                                                int level = Integer.parseInt(s);
+                                                                unlockLevel.add(level);
+                                                        } catch (NumberFormatException e) {
+                                                                System.err
+                                                                                .format("Mod %05d does contain a non-number UnlockLevel value: '%s'\n",
+                                                                                                packageNumber, s);
+                                                        }
+                                                }
+                                        } else if (sName.equalsIgnoreCase("ExeName")) {
+                                                exeFile = new File(Paths.getEditionBasePath(), sVal);
+                                        } else if (sName.equalsIgnoreCase("WorkingDir")) {
+                                                workingDir = sVal;
+                                        } else if (sName.equalsIgnoreCase("IconName")) {
+                                                iconFile = new File(Paths.getEditionBasePath(), sVal);
                                         }
                                 }
@@ -166 +192 @@
                         }
                 }
+                if (node == null)
+                        tool = plain.exists();
         }
 
@@ -254 +282 @@
 
         /**
+         * @return Is this mod actually a tool?
+         */
+        public boolean isTool() {
+                return tool;
+        }
+
+        /**
          * @return Compatible platforms
          */
@@ -326 +361 @@
         public HashSet<Integer> getDependencies() {
                 return dependencies;
+        }
+
+        /**
+         * @return the levels this mod will unlock
+         */
+        public HashSet<Integer> getUnlockLevels() {
+                return unlockLevel;
+        }
+
+        /**
+         * @return Executable name of this tool
+         */
+        public File getExeFile() {
+                return exeFile;
+        }
+        /**
+         * @return Icon file of this tool
+         */
+        public File getIconFile() {
+                return iconFile;
+        }
+
+        /**
+         * @return Working directory of this tool
+         */
+        public File getWorkingDir() {
+                if (workingDir.equalsIgnoreCase("Exe")) {
+                        if (exeFile != null)
+                                return exeFile.getParentFile();
+                        else
+                                return Paths.getEditionGDF();
+                } else if (workingDir.equalsIgnoreCase("GDF"))
+                        return Paths.getEditionGDF();
+                else
+                        return Paths.getEditionBasePath();
         }
 

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

@@ -253 +253 @@
 
         /**
-         * Get a mod by its package number
+         * @return Currently installed tools
+         */
+        public TreeSet<Mod> getInstalledTools() {
+                TreeSet<Mod> res = new TreeSet<Mod>();
+                for (int n : Installer.getInstalledTools()) {
+                        res.add(getModByNumber(n));
+                }
+                return res;
+        }
+
+        /**
+         * Get a mod/tool by its package number
          * 
          * @param number
          *            Package number
-         * @return Mod or null
+         * @return Mod/tool or null
          */
         public Mod getModByNumber(int number) {
-                for (Mod m : mods.values()) {
-                        if (m.getPackageNumber() == number)
-                                return m;
-                }
+                if (mods.containsKey(number))
+                        return mods.get(number);
+                if (tools.containsKey(number))
+                        return tools.get(number);
                 return null;
         }

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

@@ -8 +8 @@
 import java.io.File;
 import java.io.IOException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -17 +18 @@
 import java.util.Vector;
 
+import javax.swing.AbstractAction;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
@@ -38 +42 @@
 import javax.swing.table.TableRowSorter;
 
+import net.oni2.aeinstaller.AEInstaller2;
+import net.oni2.aeinstaller.backend.AppExecution;
 import net.oni2.aeinstaller.backend.Paths;
 import net.oni2.aeinstaller.backend.Settings;
@@ -80 +86 @@
 
         private JMenu mainMenu;
+        private JMenu toolsMenu;
+        private TreeSet<JMenuItem> toolsMenuItems = new TreeSet<JMenuItem>();
 
         private JSplitPane contents;
@@ -412 +420 @@
 
         @SuppressWarnings("unused")
+        private void refreshToolsMenu() {
+                for (JMenuItem i : toolsMenuItems) {
+                        toolsMenu.remove(i);
+                }
+                toolsMenuItems.clear();
+                for (Mod m : ModManager.getInstance().getInstalledTools()) {
+                        if (m.getExeFile() != null && m.getExeFile().exists()) {
+                                JMenuItem item = new JMenuItem();
+                                final Vector<String> params = new Vector<String>();
+                                params.add(m.getExeFile().getPath());
+                                final File wd = m.getWorkingDir();
+                                Icon ico = null;
+                                if (m.getIconFile() != null && m.getIconFile().exists()) {
+                                        ico = new ImageIcon(m.getIconFile().getPath());
+                                } else {
+                                        URL icon = AEInstaller2.class.getResource("images/transparent.png");
+                                        ico = new ImageIcon(icon);
+                                }
+                                item.setAction(new AbstractAction(m.getName(), ico) {
+                                        private static final long serialVersionUID = 1L;
+
+                                        @Override
+                                        public void actionPerformed(ActionEvent e) {
+                                                AppExecution.execute(params, wd);
+                                        }
+                                });
+                                toolsMenuItems.add(item);
+                                toolsMenu.add(item);
+                        }
+                }
+        }
+
+        @SuppressWarnings("unused")
         private void revertSelection() {
                 model.revertSelection();
@@ -510 +551 @@
 
                 if (instReady) {
-                        Installer.install(mods, new InstallProgressListener() {
+                        TreeSet<Mod> actuallyMods = new TreeSet<Mod>();
+                        TreeSet<Mod> actuallyTools = new TreeSet<Mod>();
+
+                        for (Mod m : mods) {
+                                if (m.isTool())
+                                        actuallyTools.add(m);
+                                else
+                                        actuallyMods.add(m);
+                        }
+
+                        if (actuallyTools.size() > 0) {
+                                Installer.installTools(actuallyTools);
+                        }
+
+                        Installer.install(actuallyMods, new InstallProgressListener() {
                                 @Override
                                 public void installProgressUpdate(int done, int total,
@@ -657 +712 @@
                 Vector<String> params = getBasicOniLaunchParams();
                 if (params.size() > 0) {
-                        try {
-                                ProcessBuilder pb = new ProcessBuilder(params);
-                                pb.directory(Paths.getEditionBasePath());
-                                pb.start();
-                        } catch (IOException e) {
-                                e.printStackTrace();
-                        }
+                        AppExecution.execute(params, Paths.getEditionBasePath());
                 }
         }
@@ -672 +721 @@
                 if (params.size() > 0) {
                         params.add("-noswitch");
-                        try {
-                                ProcessBuilder pb = new ProcessBuilder(params);
-                                pb.directory(Paths.getEditionBasePath());
-                                pb.start();
-                        } catch (IOException e) {
-                                e.printStackTrace();
-                        }
+                        AppExecution.execute(params, Paths.getEditionBasePath());
                 }
         }

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

@@ -24 +24 @@
 menu.reglobalize=&Rebuild Core Data
 menu.reglobalizeTooltip=Rebuild Core Data
-menu.tools=&Manage Tools
-menu.toolsTooltip=Install/Remove Tools
 menu.update=&Check for updates
 menu.updateTooltip=Check for updates to already downloaded packages on the Depot
+
+menu.tools=&Tools
+menu.manageTools=&Manage Tools
+menu.manageToolsTooltip=Install/Remove Tools
 
 btnRevertSelection.text=Revert selection

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

@@ -6 +6 @@
   locationRelativeTo: null
   defaultCloseOperation: doNothingOnClose
-  onWindowOpened: [execDepotUpdate,checkMandatoryFiles,checkInitialize,initialize,checkUpdates,doUpdate]
+  onWindowOpened: [execDepotUpdate,checkMandatoryFiles,checkInitialize,initialize,checkUpdates,doUpdate,refreshToolsMenu,focus]
   onWindowClosing: [saveLocalData,exit]
   iconImage: img.ae
@@ -19 +19 @@
     - Action(name=saveConfig, text=menu.saveConfig, toolTipText=menu.saveConfigTooltip, icon=img.saveFile, onAction=[saveConfig])
     - Action(name=reglobalize, text=menu.reglobalize, toolTipText=menu.reglobalizeTooltip, icon=img.refresh, onAction=[reglobalize])
-    - Action(name=tools, text=menu.tools, toolTipText=menu.toolsTooltip, icon=img.tools, onAction=[tools])
+    - Action(name=tools, text=menu.manageTools, toolTipText=menu.manageToolsTooltip, icon=img.tools, onAction=[tools,refreshToolsMenu])
     - Action(name=update, text=menu.update, toolTipText=menu.updateTooltip, icon=img.update, onAction=[checkUpdates,doUpdate])
     - JMenuBar:
@@ -37 +37 @@
             - JMenuItem(action=reglobalize)
             - JSeparator()
-            - JMenuItem(action=tools)
+            - JMenuItem(action=update)
+        - JMenu(name=toolsMenu, text=menu.tools):
+            - JMenuItem(name=manageToolsItem, action=tools)
             - JSeparator()
-            - JMenuItem(action=update)
     - JToolBar(name=toolbar, floatable=false, orientation=0):
         - JButton(action=exitAction, hideActionText=true)