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

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/backend/oni/management

Files:

• Installer.java (modified) (3 diffs)
• tools (added)
• tools/ToolFileIterator.java (added)
• tools/ToolFileIteratorEntry.java (added)
• tools/ToolInstallationList.java (added)
• tools/ToolsManager.java (moved) (moved from java/installer2/src/net/oni2/aeinstaller/backend/oni/management/ToolsManager.java ) (3 diffs)

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();
         }
-
 }