Changeset 804 for java/installer2/src/net/oni2/aeinstaller

Timestamp:

Apr 12, 2013, 5:57:57 PM (12 years ago)

Author:

alloc

Message:

AEI2.02:

• Fixes #5 and #14

Location:

java/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• backend/FileChecksum.java (added)
• backend/oni/management/Installer.java (modified) (3 diffs)
• backend/oni/management/tools (added)
• backend/oni/management/tools/ToolFileIterator.java (added)
• backend/oni/management/tools/ToolFileIteratorEntry.java (added)
• backend/oni/management/tools/ToolInstallationList.java (added)
• backend/oni/management/tools/ToolsManager.java (moved) (moved from java/installer2/src/net/oni2/aeinstaller/backend/oni/management/ToolsManager.java ) (3 diffs)
• backend/packages/Package.java (modified) (2 diffs)
• backend/packages/PackageManager.java (modified) (4 diffs)
• gui/MainWin.java (modified) (4 diffs)
• gui/toolmanager/ToolManager.java (modified) (1 diff)
• localization/Global.properties (modified) (1 diff)

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

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=.01
+appversion=.02

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

@@ -25 +25 @@
 import net.oni2.aeinstaller.backend.oni.PersistDat;
 import net.oni2.aeinstaller.backend.oni.XMLTools;
+import net.oni2.aeinstaller.backend.oni.management.tools.ToolInstallationList;
 import net.oni2.aeinstaller.backend.packages.EBSLInstallType;
 import net.oni2.aeinstaller.backend.packages.Package;
@@ -100 +101 @@
                 log.println("AEI2 version: "
                                 + SwingJavaBuilder.getConfig().getResource("appversion"));
+
+                ToolInstallationList til = ToolInstallationList.getInstance();
                 log.println("Installed tools:");
                 for (Package t : PackageManager.getInstance().getInstalledTools()) {
-                        log.println(String.format(" - %s (%s)", t.getName(), t.getVersion()));
+                        log.println(String.format(" - %s (%s)", t.getName(), t.getVersion())
+                                        + (til.isModified(t.getPackageNumber()) ? " (! LOCALLY MODIFIED !)"
+                                                        : ""));
                 }
                 log.println("Installing mods:");
@@ -236 +241 @@
                 log.println();
                 Date end = new Date();
-                log.println("Initialization ended at " + sdf.format(end));
+                log.println("Installation ended at " + sdf.format(end));
                 log.println("Process took "
                                 + ((end.getTime() - start.getTime()) / 1000) + " seconds");

java/installer2/src/net/oni2/aeinstaller/backend/oni/management/tools/ToolsManager.java

@@ -1 @@
-package net.oni2.aeinstaller.backend.oni.management;
+package net.oni2.aeinstaller.backend.oni.management.tools;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.TreeSet;
 
 import net.oni2.aeinstaller.backend.CaseInsensitiveFile;
+import net.oni2.aeinstaller.backend.FileChecksum;
 import net.oni2.aeinstaller.backend.Paths;
 import net.oni2.aeinstaller.backend.packages.Package;
-import net.oni2.platformtools.PlatformInformation;
-import net.oni2.platformtools.PlatformInformation.Platform;
+import net.oni2.aeinstaller.backend.packages.PackageManager;
 
 import org.apache.commons.io.FileUtils;
-
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.StaxDriver;
 
 /**
@@ -23 +19 @@
  */
 public class ToolsManager {
+
         /**
-         * @return Currently installed tools
+         * Verify integrity of installed tools
          */
-        @SuppressWarnings("unchecked")
-        public static TreeSet<Integer> getInstalledTools() {
-                File installCfg = new File(Paths.getInstallerPath(),
-                                "installed_tools.xml");
-                TreeSet<Integer> res = new TreeSet<Integer>();
-                try {
-                        if (installCfg.exists()) {
-                                FileInputStream fis = new FileInputStream(installCfg);
-                                XStream xs = new XStream(new StaxDriver());
-                                Object obj = xs.fromXML(fis);
-                                if (obj instanceof TreeSet<?>)
-                                        res = (TreeSet<Integer>) obj;
-                                fis.close();
-                        }
-                } catch (FileNotFoundException e) {
-                        e.printStackTrace();
-                } catch (IOException e) {
-                        e.printStackTrace();
-                }
-                return res;
-        }
-
-        private static void writeInstalledTools(TreeSet<Integer> tools) {
-                File installCfg = new File(Paths.getInstallerPath(),
-                                "installed_tools.xml");
-                try {
-                        FileOutputStream fos = new FileOutputStream(installCfg);
-                        XStream xs = new XStream(new StaxDriver());
-                        xs.toXML(tools, fos);
-                        fos.close();
-                } catch (FileNotFoundException e) {
-                        e.printStackTrace();
-                } catch (IOException e) {
-                        e.printStackTrace();
+        public static void verifyToolsIntegrity() {
+                final ToolInstallationList til = ToolInstallationList.getInstance();
+                for (final Package m : PackageManager.getInstance().getInstalledTools()) {
+                        ToolFileIterator.iteratePlatformToolFiles(m,
+                                        new ToolFileIteratorEntry() {
+                                                @Override
+                                                public void toolFile(File source, File target) {
+                                                        byte[] chkSrc = FileChecksum
+                                                                        .calculateFileMD5(source);
+                                                        if (!target.exists()) {
+                                                                til.markModified(m.getPackageNumber(), true);
+                                                        } else {
+                                                                byte[] chkTrg = FileChecksum
+                                                                                .calculateFileMD5(target);
+                                                                if (!Arrays.equals(chkSrc, chkTrg))
+                                                                        til.markModified(m.getPackageNumber(), true);
+                                                        }
+                                                }
+                                        });
                 }
         }
@@ -70 +52 @@
          */
         public static void installTools(TreeSet<Package> tools, boolean uninstall) {
-                TreeSet<Integer> installed = getInstalledTools();
+                ToolInstallationList til = ToolInstallationList.getInstance();
                 for (Package m : tools) {
-                        if (!uninstall || installed.contains(m.getPackageNumber())) {
-                                File plain = CaseInsensitiveFile.getCaseInsensitiveFile(
-                                                m.getLocalPath(), "plain");
-                                if (plain.exists()) {
-                                        if (m.hasSeparatePlatformDirs()) {
-                                                File plainCommon = CaseInsensitiveFile
-                                                                .getCaseInsensitiveFile(plain, "common");
-                                                File plainMac = CaseInsensitiveFile
-                                                                .getCaseInsensitiveFile(plain, "mac_only");
-                                                File plainWin = CaseInsensitiveFile
-                                                                .getCaseInsensitiveFile(plain, "win_only");
-                                                if (plainCommon.exists())
-                                                        copyRemoveToolsFiles(plainCommon,
-                                                                        Paths.getEditionBasePath(), uninstall);
-                                                if (PlatformInformation.getPlatform() == Platform.MACOS
-                                                                && plainMac.exists())
-                                                        copyRemoveToolsFiles(plainMac,
-                                                                        Paths.getEditionBasePath(), uninstall);
-                                                else if (plainWin.exists())
-                                                        copyRemoveToolsFiles(plainWin,
-                                                                        Paths.getEditionBasePath(), uninstall);
-                                        } else {
-                                                copyRemoveToolsFiles(plain, Paths.getEditionBasePath(),
-                                                                uninstall);
-                                        }
+                        if (!uninstall) { // Install:
+                                final HashSet<String> files = new HashSet<String>();
+                                ToolFileIterator.iteratePlatformToolFiles(m,
+                                                new ToolFileIteratorEntry() {
+                                                        @Override
+                                                        public void toolFile(File source, File target) {
+                                                                copyToolsFiles(source, target, files);
+                                                        }
+                                                });
+                                til.addTool(m.getPackageNumber(), files);
+                        } else { // Uninstall:
+                                if (til.isInstalled(m.getPackageNumber())) {
+                                        removeTool(til.getFiles(m.getPackageNumber()));
+                                        til.removeTool(m.getPackageNumber());
                                 }
                         }
-                        if (uninstall)
-                                installed.remove(m.getPackageNumber());
-                        else
-                                installed.add(m.getPackageNumber());
                 }
-                writeInstalledTools(installed);
+                til.saveList();
         }
 
-        private static void copyRemoveToolsFiles(File srcFolder, File targetFolder,
-                        boolean remove) {
-                for (File f : srcFolder.listFiles()) {
-                        try {
-                                if (f.isDirectory())
-                                        copyRemoveToolsFiles(f,
-                                                        CaseInsensitiveFile.getCaseInsensitiveFile(
-                                                                        targetFolder, f.getName()), remove);
-                                else {
-                                        File targetFile = CaseInsensitiveFile
-                                                        .getCaseInsensitiveFile(targetFolder, f.getName());
-                                        if (remove) {
-                                                if (targetFile.exists())
-                                                        targetFile.delete();
-                                        } else {
-                                                if (!targetFile.getName().equals(f.getName()))
-                                                        targetFile.delete();
-                                                FileUtils.copyFileToDirectory(f, targetFolder);
-                                                if (f.canExecute())
-                                                        CaseInsensitiveFile.getCaseInsensitiveFile(
-                                                                        targetFolder, f.getName()).setExecutable(
-                                                                        true);
-                                        }
-                                }
-                        } catch (IOException e) {
-                                e.printStackTrace();
+        private static void copyToolsFiles(File src, File target,
+                        HashSet<String> files) {
+                try {
+                        File targetFile = CaseInsensitiveFile.getCaseInsensitiveFile(
+                                        target.getParentFile(), target.getName());
+
+                        // Case mismatch?
+                        if (!targetFile.getName().equals(src.getName()))
+                                targetFile.delete();
+
+                        files.add(target.getPath().replace(
+                                        Paths.getEditionBasePath().getPath(), ""));
+
+                        FileUtils.copyFile(src, target);
+                        if (src.canExecute())
+                                target.setExecutable(true);
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }
+        }
+
+        private static void removeTool(HashSet<String> files) {
+                for (String p : files) {
+                        File targetFile = new File(Paths.getEditionBasePath().getPath() + p);
+                        if (targetFile.getPath().contains(
+                                        Paths.getEditionBasePath().getPath())) {
+                                File targetFolder = targetFile.getParentFile();
+
+                                if (targetFile.exists())
+                                        targetFile.delete();
+                                if (targetFolder.list().length == 0)
+                                        targetFolder.delete();
                         }
                 }
-                if (remove)
-                        if (targetFolder.list().length == 0)
-                                targetFolder.delete();
         }
-
 }

java/installer2/src/net/oni2/aeinstaller/backend/packages/Package.java

@@ -14 +14 @@
 import net.oni2.aeinstaller.backend.CaseInsensitiveFile;
 import net.oni2.aeinstaller.backend.Paths;
-import net.oni2.aeinstaller.backend.oni.management.ToolsManager;
+import net.oni2.aeinstaller.backend.oni.management.tools.ToolInstallationList;
 import net.oni2.moddepot.DepotConfig;
 import net.oni2.moddepot.ECompatiblePlatform;
@@ -230 +230 @@
         public boolean isInstalled() {
                 if (tool)
-                        return ToolsManager.getInstalledTools().contains(packageNumber);
+                        return ToolInstallationList.getInstance().isInstalled(packageNumber);
                 else
                         return PackageManager.getInstance().isModInstalled(this);

java/installer2/src/net/oni2/aeinstaller/backend/packages/PackageManager.java

@@ -14 +14 @@
 
 import net.oni2.aeinstaller.backend.Paths;
+import net.oni2.aeinstaller.backend.oni.management.Installer;
+import net.oni2.aeinstaller.backend.oni.management.tools.ToolInstallationList;
 import net.oni2.moddepot.DepotManager;
 import net.oni2.moddepot.model.NodeMod;
 import net.oni2.moddepot.model.TaxonomyTerm;
-import net.oni2.aeinstaller.backend.oni.management.Installer;
-import net.oni2.aeinstaller.backend.oni.management.ToolsManager;
 
 import com.thoughtworks.xstream.XStream;
@@ -266 +266 @@
         public TreeSet<Package> getInstalledTools() {
                 TreeSet<Package> res = new TreeSet<Package>();
-                for (int n : ToolsManager.getInstalledTools()) {
+                for (int n : ToolInstallationList.getInstance().getItems().keySet()) {
                         res.add(getPackageByNumber(n));
                 }
@@ -301 +301 @@
                         for (int depNum : m.getDependencies()) {
                                 Package other = getPackageByNumber(depNum);
-                                if (!mods.contains(other)) {
-                                        if (!res.containsKey(m))
-                                                res.put(m, new HashSet<Package>());
-                                        res.get(m).add(other);
+                                if (other != null) {
+                                        if (!mods.contains(other)) {
+                                                if (!res.containsKey(m))
+                                                        res.put(m, new HashSet<Package>());
+                                                res.get(m).add(other);
+                                        }
                                 }
                         }
@@ -326 +328 @@
                         for (int confNum : m.getIncompabitilities()) {
                                 Package other = getPackageByNumber(confNum);
-                                if (mods.contains(other)) {
-                                        if (!res.containsKey(m))
-                                                res.put(m, new HashSet<Package>());
-                                        res.get(m).add(other);
+                                if (other != null) {
+                                        if (mods.contains(other)) {
+                                                if (!res.containsKey(m))
+                                                        res.put(m, new HashSet<Package>());
+                                                res.get(m).add(other);
+                                        }
                                 }
                         }

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

@@ -50 +50 @@
 import net.oni2.aeinstaller.backend.oni.management.InstallProgressListener;
 import net.oni2.aeinstaller.backend.oni.management.Installer;
-import net.oni2.aeinstaller.backend.oni.management.ToolsManager;
+import net.oni2.aeinstaller.backend.oni.management.tools.ToolInstallationList;
+import net.oni2.aeinstaller.backend.oni.management.tools.ToolsManager;
 import net.oni2.aeinstaller.backend.packages.Package;
 import net.oni2.aeinstaller.backend.packages.PackageManager;
@@ -358 +359 @@
                                 dl.setVisible(true);
                                 if (dl.isFinished()) {
-                                        TreeSet<Integer> installed = ToolsManager
-                                                        .getInstalledTools();
+                                        ToolInstallationList til = ToolInstallationList
+                                                        .getInstance();
                                         TreeSet<Package> tools = new TreeSet<Package>();
                                         for (Package m : execUpdates)
-                                                if (m.isTool()
-                                                                && installed.contains(m.getPackageNumber()))
+                                                if (m.isTool() && til.isInstalled(m.getPackageNumber()))
                                                         tools.add(m);
                                         if (tools.size() > 0) {
+                                                ToolsManager.installTools(tools, true);
                                                 ToolsManager.installTools(tools, false);
                                         }
@@ -548 +549 @@
         private void checkCorePackages() {
                 if (!SettingsManager.getInstance().isOfflineMode()) {
+                        TreeSet<Package> tools = new TreeSet<Package>();
                         for (Package m : PackageManager.getInstance().getCoreTools()) {
                                 if (m.isNewerAvailable()) {
                                         execCoreUpdates.add(m);
+                                        tools.add(m);
                                 }
                         }
@@ -566 +569 @@
                                 }
                         }
-                        ToolsManager.installTools(PackageManager.getInstance()
-                                        .getCoreTools(), false);
-                }
+
+                        ToolsManager.installTools(tools, true);
+                        ToolsManager.installTools(tools, false);
+                }
+                ToolsManager.verifyToolsIntegrity();
+                if (ToolInstallationList.getInstance().getModifiedTools().size() > 0)
+                        System.out.println("Locally modified tools: "
+                                        + ToolInstallationList.getInstance().getModifiedTools()
+                                                        .toString());
         }
 

java/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java

@@ -18 +18 @@
 
 import net.oni2.SettingsManager;
-import net.oni2.aeinstaller.backend.oni.management.ToolsManager;
+import net.oni2.aeinstaller.backend.oni.management.tools.ToolsManager;
 import net.oni2.aeinstaller.backend.packages.Package;
 import net.oni2.aeinstaller.gui.downloadwindow.Downloader;

java/installer2/src/net/oni2/aeinstaller/localization/Global.properties

@@ -3 +3 @@
 
 invalidPath.title=Wrong directory
-invalidPath.text=This program has to be placed in the subfolder Edition/AEInstaller inside a vanilla Oni folder.\nThe full path of the .jar-file has to be:\nOniFolder/Edition/AEInstaller/AEInstaller2.jar
+invalidPath.text=This program has to be placed in the subfolder AE/AEInstaller/bin inside a vanilla Oni folder.\nThe full path of the .jar-file has to be:\nOniFolder/AE/AEInstaller/bin/AEInstaller2.jar
 
 dotNetMissing.title=.NET is not installed