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

Timestamp:

Mar 13, 2013, 8:00:39 PM (12 years ago)

Author:

alloc

Message:

AEI2 0.99s:

• Fix for update window file size display
• Fix for download speed/time estimation
• Added patches-support

Location:

AE/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• backend/oni/Installer.java (modified) (7 diffs)
• backend/oni/OniSplit.java (modified) (2 diffs)
• backend/oni/XMLTools.java (added)
• backend/packages/download/ModDownloader.java (modified) (3 diffs)
• gui/MainWin.java (modified) (2 diffs)

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

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=0.99r
+appversion=0.99s

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

@@ -19 +19 @@
 import java.util.TreeSet;
 import java.util.Vector;
+import java.util.regex.Pattern;
 
 import net.oni2.aeinstaller.AEInstaller2;
@@ -29 +30 @@
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.filefilter.RegexFileFilter;
+import org.apache.commons.io.filefilter.TrueFileFilter;
 import org.javabuilders.swing.SwingJavaBuilder;
 
@@ -260 +263 @@
                                                 FileUtils.deleteDirectory(f);
                                         } catch (IOException e) {
-                                                // TODO Auto-generated catch block
                                                 e.printStackTrace();
                                         }
@@ -274 +276 @@
                 Vector<File> foldersOni = new Vector<File>();
                 foldersOni.add(Paths.getVanillaOnisPath());
+
+                Vector<File> foldersPatches = new Vector<File>();
 
                 for (Package m : mods) {
@@ -296 +300 @@
                                 }
                         }
-                }
-
-                combineBinaryFiles(foldersOni, listener, log);
+
+                        File patches = new File(m.getLocalPath(), "patches");
+                        if (patches.exists()) {
+                                if (m.hasSeparatePlatformDirs()) {
+                                        File patchesCommon = new File(patches, "common");
+                                        File patchesMac = new File(patches, "mac_only");
+                                        File patchesWin = new File(patches, "win_only");
+                                        if (patchesCommon.exists())
+                                                foldersPatches.add(patchesCommon);
+                                        if (Settings.getPlatform() == Platform.MACOS
+                                                        && patchesMac.exists())
+                                                foldersPatches.add(patchesMac);
+                                        else if (patchesWin.exists())
+                                                foldersPatches.add(patchesWin);
+                                } else {
+                                        foldersPatches.add(patches);
+                                }
+                        }
+                }
+
+                TreeMap<String, Vector<File>> levels = new TreeMap<String, Vector<File>>();
+                for (File path : foldersOni) {
+                        for (File levelF : path.listFiles()) {
+                                String fn = levelF.getName().toLowerCase();
+                                String levelN = null;
+                                if (levelF.isDirectory()) {
+                                        levelN = fn;
+                                } else if (fn.endsWith(".dat")) {
+                                        levelN = fn.substring(0, fn.lastIndexOf('.')).toLowerCase();
+                                }
+                                if (levelN != null) {
+                                        if (!levels.containsKey(levelN))
+                                                levels.put(levelN, new Vector<File>());
+                                        levels.get(levelN).add(levelF);
+                                }
+                        }
+                }
+
+                applyPatches(levels, foldersPatches, listener, log);
+
+                combineBinaryFiles(levels, listener, log);
                 combineBSLFolders(mods, listener, log);
 
@@ -417 +459 @@
         }
 
-        private static void combineBinaryFiles(List<File> srcFoldersFiles,
+        private static void applyPatches(
+                        TreeMap<String, Vector<File>> oniLevelFolders,
+                        List<File> patchFolders, InstallProgressListener listener,
+                        PrintWriter log) {
+                // TODO: REMOVE
+                long startMS = new Date().getTime();
+                // TODO: Implement this
+                String tmpFolderName = "installrun_temp-"
+                                + new SimpleDateFormat("yyyy_MM_dd-HH_mm_ss")
+                                                .format(new Date());
+                File tmpFolder = new File(Paths.getTempPath(), tmpFolderName);
+
+                HashMap<String, Vector<File>> patches = new HashMap<String, Vector<File>>();
+                for (File patchFolder : patchFolders) {
+                        for (File levelFolder : patchFolder.listFiles(dirFileFilter)) {
+                                String lvlName = levelFolder.getName().toLowerCase();
+                                for (File f : FileUtils.listFiles(levelFolder,
+                                                new String[] { "oni-patch" }, true)) {
+                                        if (!patches.containsKey(lvlName))
+                                                patches.put(lvlName, new Vector<File>());
+                                        patches.get(lvlName).add(f);
+                                }
+                        }
+                }
+
+                for (String level : patches.keySet()) {
+                        File levelFolder = new File(tmpFolder, level);
+                        levelFolder.mkdir();
+
+                        // Get files to be patched from vanilla.dat / packages
+                        for (File patch : patches.get(level)) {
+                                String patternWildcard = patch.getName();
+                                patternWildcard = patternWildcard.substring(0,
+                                                patternWildcard.indexOf(".oni-patch"));
+                                patternWildcard = patternWildcard.replace('-', '*');
+                                final Pattern patternRegex = Pattern.compile(
+                                                patternWildcard.replaceAll("\\*", ".\\*"),
+                                                Pattern.CASE_INSENSITIVE);
+
+                                for (File srcFolder : oniLevelFolders.get(level)) {
+                                        if (srcFolder.isFile()) {
+                                                // Extract from .dat
+                                                OniSplit.export(levelFolder, srcFolder, patternWildcard);
+                                        } else {
+                                                // Copy from folder with overwrite
+                                                for (File f : FileUtils.listFiles(srcFolder,
+                                                                new RegexFileFilter(patternRegex),
+                                                                TrueFileFilter.TRUE)) {
+                                                        try {
+                                                                FileUtils.copyFileToDirectory(f, levelFolder);
+                                                        } catch (IOException e) {
+                                                                e.printStackTrace();
+                                                        }
+                                                }
+                                        }
+                                }
+                        }
+
+                        // Extract files to XML
+                        File levelFolderXML = new File(levelFolder, "xml");
+                        Vector<File> files = new Vector<File>();
+                        files.add(new File(levelFolder, "*.oni"));
+                        OniSplit.convertOniToXML(levelFolderXML, files);
+
+                        // Apply patches in levelFolderXML
+                        for (File patch : patches.get(level)) {
+                                String patternWildcard = patch.getName();
+                                patternWildcard = patternWildcard.substring(0,
+                                                patternWildcard.indexOf(".oni-patch"));
+                                patternWildcard = patternWildcard.replace('-', '*');
+                                final Pattern patternRegex = Pattern.compile(
+                                                patternWildcard.replaceAll("\\*", ".\\*"),
+                                                Pattern.CASE_INSENSITIVE);
+
+                                for (File toPatch : FileUtils.listFiles(levelFolderXML,
+                                                new RegexFileFilter(patternRegex), null)) {
+                                        // Apply patch "patch" to "toPatch"
+                                        XMLTools.patch(patch, toPatch);
+                                }
+                        }
+
+                        // Create .oni files from XML
+                        files.clear();
+                        files.add(new File(levelFolderXML, "*.xml"));
+                        OniSplit.convertXMLtoOni(levelFolder, files);
+
+                        // Remove XML folder as import will only require .oni's
+                        try {
+                                FileUtils.deleteDirectory(levelFolderXML);
+                        } catch (IOException e) {
+                                e.printStackTrace();
+                        }
+                        
+                        oniLevelFolders.get(level).add(levelFolder);
+                }
+
+                System.out.println("Took: " + (new Date().getTime() - startMS)
+                                + " msec");
+                System.exit(0);
+        }
+
+        private static void combineBinaryFiles(
+                        TreeMap<String, Vector<File>> oniLevelFolders,
                         InstallProgressListener listener, PrintWriter log) {
-                TreeMap<String, Vector<File>> levels = new TreeMap<String, Vector<File>>();
-
-                for (File path : srcFoldersFiles) {
-                        for (File levelF : path.listFiles()) {
-                                String fn = levelF.getName().toLowerCase();
-                                String levelN = null;
-                                if (levelF.isDirectory()) {
-                                        levelN = fn;
-                                } else if (fn.endsWith(".dat")) {
-                                        levelN = fn.substring(0, fn.lastIndexOf('.'));
-                                }
-                                if (levelN != null) {
-                                        if (!levels.containsKey(levelN))
-                                                levels.put(levelN, new Vector<File>());
-                                        levels.get(levelN).add(levelF);
-                                }
-                        }
-                }
-
                 int totalSteps = 0;
                 int stepsDone = 0;
 
                 for (@SuppressWarnings("unused")
-                String s : levels.keySet())
+                String s : oniLevelFolders.keySet())
                         totalSteps++;
                 totalSteps++;
 
                 log.println("Importing levels");
-                for (String l : levels.keySet()) {
+                for (String l : oniLevelFolders.keySet()) {
                         log.println("\tLevel " + l);
                         listener.installProgressUpdate(stepsDone, totalSteps,
                                         "Installing level " + l);
-                        for (File f : levels.get(l)) {
+                        for (File f : oniLevelFolders.get(l)) {
                                 log.println("\t\t\t" + f.getPath());
                         }
 
-                        Vector<String> res = OniSplit.packLevel(levels.get(l), new File(
-                                        Paths.getEditionGDF(), sanitizeLevelName(l) + ".dat"));
+                        Vector<String> res = OniSplit.packLevel(oniLevelFolders.get(l),
+                                        new File(Paths.getEditionGDF(), sanitizeLevelName(l)
+                                                        + ".dat"));
                         if (res != null && res.size() > 0) {
                                 for (String s : res)
@@ -502 +628 @@
                                 FileUtils.copyInputStreamToFile(is, dat);
                         } catch (IOException e) {
-                                // TODO Auto-generated catch block
                                 e.printStackTrace();
                         }

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

@@ -33 +33 @@
          */
         public static Vector<String> export(File targetFolder, File input) {
+                return export(targetFolder, input, null);
+        }
+
+        /**
+         * Export named resources from given dat-file to target folder
+         * 
+         * @param targetFolder
+         *            Target folder
+         * @param input
+         *            Dat file
+         * @param pattern
+         *            Filename pattern for files to export
+         * @return OniSplit output
+         */
+        public static Vector<String> export(File targetFolder, File input,
+                        String pattern) {
                 if (!targetFolder.exists())
                         targetFolder.mkdir();
 
                 Vector<String> cmdLine = getProgramInvocation();
-                cmdLine.add("-export");
+                if (pattern == null)
+                        cmdLine.add("-export");
+                else
+                        cmdLine.add("-export:" + pattern);
                 cmdLine.add(targetFolder.getPath());
                 cmdLine.add(input.getPath());
@@ -134 +153 @@
         }
 
+        /**
+         * Convert given .oni-files to XML and put them in target folder
+         * 
+         * @param targetFolder
+         *            Target folder
+         * @param inputFiles
+         *            .oni files
+         * @return OniSplit output
+         */
+        public static Vector<String> convertOniToXML(File targetFolder,
+                        Vector<File> inputFiles) {
+                if (!targetFolder.exists())
+                        targetFolder.mkdirs();
+
+                Vector<String> cmdLine = getProgramInvocation();
+                cmdLine.add("-extract:xml");
+                cmdLine.add(targetFolder.getPath());
+                for (File f : inputFiles) {
+                        cmdLine.add(f.getPath());
+                }
+                Vector<String> res = null;
+                try {
+                        res = AppExecution.executeAndWait(cmdLine);
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }
+                return res;
+        }
+
+        /**
+         * Convert given XML-files to .oni and put them in target folder
+         * 
+         * @param targetFolder
+         *            Target folder
+         * @param inputFiles
+         *            XML-files
+         * @return OniSplit output
+         */
+        public static Vector<String> convertXMLtoOni(File targetFolder,
+                        Vector<File> inputFiles) {
+                if (!targetFolder.exists())
+                        targetFolder.mkdirs();
+
+                Vector<String> cmdLine = getProgramInvocation();
+                cmdLine.add("-create");
+                cmdLine.add(targetFolder.getPath());
+                for (File f : inputFiles) {
+                        cmdLine.add(f.getPath());
+                }
+                Vector<String> res = null;
+                try {
+                        res = AppExecution.executeAndWait(cmdLine);
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }
+                return res;
+        }
+
         private static String getImportParam() {
                 if (Settings.getPlatform() == Platform.MACOS)

AE/installer2/src/net/oni2/aeinstaller/backend/packages/download/ModDownloader.java

@@ -82 +82 @@
 
         private int getTimeElapsed() {
-                int total = (int) (new Date().getTime() - startMS) / 1000;
+                int total = (int) (new Date().getTime() - startMS);
                 return total;
         }
@@ -88 +88 @@
         private int getDownloadSpeed() {
                 int elap = getTimeElapsed();
-                int down = downloadedComplete + downloadedCurrent;
+                long down = downloadedComplete + downloadedCurrent;
                 if (elap > 0)
-                        return down / elap;
+                        return (int)(down * 1000 / elap);
                 else
                         return 1;
@@ -106 +106 @@
                                         downloads.get(currentDownload).getMod(), state, unpacked,
                                         downloads.size(), downloadedComplete + downloadedCurrent,
-                                        totalSize, getTimeElapsed(), getTimeRemaining(),
+                                        totalSize, getTimeElapsed() / 1000, getTimeRemaining(),
                                         getDownloadSpeed());
                 } else {
                         listener.updateStatus(this, null, state, unpacked,
                                         downloads.size(), downloadedComplete + downloadedCurrent,
-                                        totalSize, getTimeElapsed(), getTimeRemaining(),
+                                        totalSize, getTimeElapsed() / 1000, getTimeRemaining(),
                                         getDownloadSpeed());
                 }

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

@@ -244 +244 @@
                                         size += m.getZipSize();
                                         JCheckBox check = new JCheckBox("Mod: " + m.getName()
-                                                        + " (" + SizeFormatter.format(size, 1) + ")");
+                                                        + " (" + SizeFormatter.format(m.getZipSize(), 1) + ")");
                                         check.setSelected(true);
                                         check.addItemListener(new ItemListener() {
@@ -268 +268 @@
                                         size += m.getZipSize();
                                         JCheckBox check = new JCheckBox("Tool: " + m.getName()
-                                                        + " (" + SizeFormatter.format(size, 1) + ")");
+                                                        + " (" + SizeFormatter.format(m.getZipSize(), 1) + ")");
                                         check.setSelected(true);
                                         check.addItemListener(new ItemListener() {