Changeset 605 for AE/installer2/src/net/oni2/aeinstaller/gui

Timestamp:

Jan 13, 2013, 8:11:07 PM (12 years ago)

Author:

alloc

Message:

AEI2:

• Added mod download prior to installation
• Dependency checking (needs verification)
• Conflicts checking basis (not implemented)
• Run Oni through AEI

Location:

AE/installer2/src/net/oni2/aeinstaller/gui

Files:

• MainWin.java (modified) (8 diffs)
• MainWin.properties (modified) (2 diffs)
• MainWin.yml (modified) (2 diffs)
• downloadwindow (added)
• downloadwindow/Downloader.java (added)
• downloadwindow/Downloader.properties (added)
• downloadwindow/Downloader.yml (added)
• modtable/ModTableModel.java (modified) (1 diff)

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

@@ -2 +2 @@
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.ResourceBundle;
 import java.util.TreeMap;
 import java.util.TreeSet;
+import java.util.Vector;
 
 import javax.swing.JButton;
@@ -42 +46 @@
 import net.oni2.aeinstaller.backend.oni.Installer;
 import net.oni2.aeinstaller.gui.about.AboutDialog;
+import net.oni2.aeinstaller.gui.downloadwindow.Downloader;
 import net.oni2.aeinstaller.gui.modtable.DownloadSizeListener;
 import net.oni2.aeinstaller.gui.modtable.ModTableFilter;
@@ -97 +102 @@
 
                 getRootPane().setDefaultButton(btnInstall);
+                lblDownloadSizeVal.setText(SizeFormatter.format(0, 2));
         }
 
@@ -160 +166 @@
         }
 
-        private boolean askClose() {
-                int res = JOptionPane.showConfirmDialog(this,
-                                bundle.getString("askClose.text"),
-                                bundle.getString("askClose.title"), JOptionPane.YES_NO_OPTION,
-                                JOptionPane.QUESTION_MESSAGE);
-                return res == JOptionPane.YES_OPTION;
-        }
-
         private void exit() {
                 setVisible(false);
@@ -319 +317 @@
                                                 public void updateStatus(ModDownloader source,
                                                                 State state, int filesDown, int filesTotal,
-                                                                int bytesDown, int bytesTotal) {
+                                                                int bytesDown, int bytesTotal, int duration,
+                                                                int remaining, int speed) {
                                                         evt.setProgressEnd(filesTotal);
                                                         evt.setProgressValue(filesDown);
@@ -339 +338 @@
         @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().getMandatoryMods());
                 mods.addAll(model.getSelectedMods());
 
-                System.out.println("Install mods:");
-                for (Mod m : mods) {
-                        System.out.println("  " + m.getPackageNumberString() + ": "
-                                        + m.getName());
-                }
-
-                Installer.install(mods, new InstallProgressListener() {
-                        @Override
-                        public void installProgressUpdate(int done, int total, String step) {
-                                evt.setProgressEnd(total);
-                                evt.setProgressValue(done);
-                                evt.setProgressMessage(step);
-                        }
-                });
+                boolean instReady = false;
+
+                while (!instReady) {
+                        System.out.println("Checking downloads:");
+                        TreeSet<Mod> toDownload = new TreeSet<Mod>();
+                        for (Mod m : mods) {
+                                if (!m.isLocalAvailable())
+                                        toDownload.add(m);
+                        }
+                        if (toDownload.size() > 0) {
+                                System.out.println("Download files: " + toDownload.toString());
+                                Downloader dl = new Downloader(toDownload);
+                                dl.setVisible(true);
+                                if (!dl.isFinished())
+                                        break;
+                        }
+                        HashMap<Mod, HashSet<Mod>> dependencies = ModManager.getInstance()
+                                        .checkDependencies(mods);
+                        if (dependencies.size() > 0) {
+                                System.out.println("Unmet dependencies: "
+                                                + dependencies.toString());
+                                for (Mod m : dependencies.keySet()) {
+                                        for (Mod mDep : dependencies.get(m))
+                                                mods.add(mDep);
+                                }
+                        } else {
+                                HashMap<Mod, HashSet<Mod>> conflicts = ModManager.getInstance()
+                                                .checkConflicts(mods);
+                                if (conflicts.size() > 0) {
+                                        System.err.println("Conflicting mods: "
+                                                        + conflicts.toString());
+                                        break;
+                                } else {
+                                        instReady = true;
+                                }
+                        }
+                }
+
+                if (instReady) {
+                        Installer.install(mods, new InstallProgressListener() {
+                                @Override
+                                public void installProgressUpdate(int done, int total,
+                                                String step) {
+                                        evt.setProgressEnd(total);
+                                        evt.setProgressValue(done);
+                                        evt.setProgressMessage(step);
+                                }
+                        });
+                }
+
+                JOptionPane.showMessageDialog(this,
+                                bundle.getString("installDone.text"),
+                                bundle.getString("installDone.title"),
+                                JOptionPane.INFORMATION_MESSAGE);
         }
 
@@ -409 +446 @@
                 }
         }
+        
+        private Vector<String> getBasicOniLaunchParams() {
+                Vector<String> params = new Vector<String>();
+                switch (Settings.getPlatform()) {
+                        case WIN:
+                                params.add(new File(Paths.getEditionBasePath(), "Oni.exe")
+                                                .getPath());
+                                break;
+                        case MACOS:
+                                params.add(new File(Paths.getEditionBasePath(), "Oni")
+                                                .getPath());
+                                break;
+                        case LINUX:
+                                String wine = Settings.getWinePath();
+                                if (wine != null) {
+                                        params.add(wine);
+                                        params.add(new File(Paths.getEditionBasePath(), "Oni.exe")
+                                                        .getPath());
+                                }
+                                break;
+                        default:
+                }
+                if (params.size() > 0) {
+                        params.add("-debugfiles");
+                }
+                return params;
+        }
+
+        @SuppressWarnings("unused")
+        private void oniFull() {
+                Vector<String> params = getBasicOniLaunchParams();
+                if (params.size() > 0) {
+                        try {
+                                new ProcessBuilder(params).start();
+                        } catch (IOException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
+                }
+        }
+
+        @SuppressWarnings("unused")
+        private void oniWin() {
+                Vector<String> params = getBasicOniLaunchParams();
+                if (params.size() > 0) {
+                        params.add("-noswitch");
+                        try {
+                                new ProcessBuilder(params).start();
+                        } catch (IOException e) {
+                                // TODO Auto-generated catch block
+                                e.printStackTrace();
+                        }
+                }
+        }
 
         @Override
@@ -435 +526 @@
         @Override
         public void handleQuit(ApplicationEvent event) {
-                if (askClose()) {
-                        event.setHandled(true);
-                        saveLocalData();
-                        exit();
-                } else {
-                        event.setHandled(false);
-                }
+                event.setHandled(true);
+                saveLocalData();
+                exit();
         }
 

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

@@ -11 +11 @@
 
 menu.file=&File
+menu.runOniFull=Run &Oni (fullscreen)
+menu.runOniFullTooltip=Run Oni in fullscreen mode
+menu.runOniWin=Run Oni (&window)
+menu.runOniWinTooltip=Run Oni in windowed mode
 menu.loadConfig=&Load configuration...
 menu.loadConfigTooltip=Load configuration
@@ -35 +39 @@
 updateDepot.title=Updating Mod Depot cache
 
+installDone.title=Installation done
+installDone.text=You can now play AE Oni.
+
 updatesAvailable.title=Updates available
 updatesAvailable.text=Some mods have newer versions available.
-
-askClose.title=Confirm close request
-askClose.text=Are you sure you want to close the program?
 
 askInitialize.title=Initialize Edition

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

@@ -7 +7 @@
   defaultCloseOperation: doNothingOnClose
   onWindowOpened: [execDepotUpdate,checkMandatoryFiles,initialize,checkUpdates,focus]
-  onWindowClosing: [askClose,saveLocalData,exit]
+  onWindowClosing: [saveLocalData,exit]
   iconImage: img.ae
   content:
-    - Action(name=exitAction, text=menu.exit, toolTipText=menu.exitTooltip, icon=img.exit, onAction=[askClose,saveLocalData,exit])
+    - Action(name=exitAction, text=menu.exit, toolTipText=menu.exitTooltip, icon=img.exit, onAction=[saveLocalData,exit])
     - Action(name=settings, text=menu.settings, toolTipText=menu.settingsTooltip, icon=img.settings, onAction=[showSettings])
     - Action(name=about, text=menu.about, toolTipText=menu.aboutTooltip, icon=img.about, onAction=[showAbout])
+    - Action(name=runOniFull, text=menu.runOniFull, toolTipText=menu.runOniFullTooltip, icon=img.oni, onAction=[oniFull])
+    - Action(name=runOniWin, text=menu.runOniWin, toolTipText=menu.runOniWinTooltip, icon=img.oni, onAction=[oniWin])
     - Action(name=loadConfig, text=menu.loadConfig, toolTipText=menu.loadConfigTooltip, icon=img.openFile, onAction=[loadConfig])
     - Action(name=saveConfig, text=menu.saveConfig, toolTipText=menu.saveConfigTooltip, icon=img.saveFile, onAction=[saveConfig])
@@ -23 +25 @@
             - JMenuItem(action=exitAction)
         - JMenu(name=fileMenu, text=menu.file):
+            - JMenuItem(action=runOniFull)
+            - JMenuItem(action=runOniWin)
+            - JSeparator()
             - JMenuItem(action=loadConfig)
             - JMenuItem(action=saveConfig)

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

@@ -217 +217 @@
                                 if (install.get(i)) {
                                         Mod m = items.get(i);
-                                        if (!m.isLocalAvailable() || m.isNewerAvailable())
+                                        if (!m.isLocalAvailable())
                                                 size += m.getZipSize();
                                 }