Changeset 603 for AE/installer2/src/net/oni2/aeinstaller/backend

Timestamp:

Jan 10, 2013, 5:25:51 PM (12 years ago)

Author:

alloc

Message:

AEI2

Location:

AE/installer2/src/net/oni2/aeinstaller/backend

Files:

• StuffToRefactorLater.java (deleted)
• depot/DepotManager.java (modified) (6 diffs)
• depot/model/NodeMod.java (modified) (1 diff)
• mods/Mod.java (modified) (4 diffs)
• mods/ModManager.java (modified) (2 diffs)
• oni/Installer.java (modified) (2 diffs)

AE/installer2/src/net/oni2/aeinstaller/backend/depot/DepotManager.java

@@ -87 +87 @@
 
                         // Get taxonomy vocabulary
-                        listener.cacheUpdateProgress("Updating taxonomy vocabulary", 0, 100);
+                        if (listener != null)
+                                listener.cacheUpdateProgress("Updating taxonomy vocabulary", 0,
+                                                100);
                         page = 0;
                         do {
@@ -100 +102 @@
 
                         // Get taxonomy terms
-                        listener.cacheUpdateProgress("Updating taxonomy terms", 0, 100);
+                        if (listener != null)
+                                listener.cacheUpdateProgress("Updating taxonomy terms", 0, 100);
                         page = 0;
                         do {
@@ -113 +116 @@
 
                         // Check nodes for new information
-                        listener.cacheUpdateProgress("Checking for new/updated nodes", 1,
-                                        100);
+                        if (listener != null)
+                                listener.cacheUpdateProgress("Checking for new/updated nodes",
+                                                1, 100);
                         HashSet<Integer> nodesToUpdate = new HashSet<Integer>();
                         page = 0;
@@ -142 +146 @@
 
                         // Check files for new stuff
-                        listener.cacheUpdateProgress("Checking for new/updated files", 2,
-                                        100);
+                        if (listener != null)
+                                listener.cacheUpdateProgress("Checking for new/updated files",
+                                                2, 100);
                         HashSet<Integer> filesToUpdate = new HashSet<Integer>();
                         page = 0;
@@ -168 +173 @@
                         // Update nodes with new information
                         for (int nid : nodesToUpdate) {
-                                listener.cacheUpdateProgress("Updating nodes", step++, total);
+                                if (listener != null)
+                                        listener.cacheUpdateProgress("Updating nodes", step++,
+                                                        total);
 
                                 ja = DrupalJSONQuery.getItem("node", nid, "");
@@ -188 +195 @@
                         // Update new files
                         for (int fid : filesToUpdate) {
-                                listener.cacheUpdateProgress("Updating files", step++, total);
+                                if (listener != null)
+                                        listener.cacheUpdateProgress("Updating files", step++,
+                                                        total);
 
                                 ja = DrupalJSONQuery.getItem("file", fid, "&file_contents=0");

AE/installer2/src/net/oni2/aeinstaller/backend/depot/model/NodeMod.java

@@ -148 +148 @@
                 return Integer.parseInt(fields.get("package_number"));
         }
+
+        /**
+         * @return Is this mod a tool?
+         */
+        public boolean isTool() {
+                TaxonomyTerm tt = DepotManager.getInstance().getTaxonomyTerm(
+                                DepotConfig.getTaxonomyName_ModType_Tool());
+                return getTypes().contains(tt);
+        }
 }

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

@@ -13 +13 @@
 import net.oni2.aeinstaller.backend.Settings;
 import net.oni2.aeinstaller.backend.Settings.Platform;
-import net.oni2.aeinstaller.backend.depot.DepotConfig;
 import net.oni2.aeinstaller.backend.depot.DepotManager;
 import net.oni2.aeinstaller.backend.depot.model.NodeMod;
@@ -56 +55 @@
                         Type t = ModManager.getInstance().getTypeByName(tt.getName());
                         types.add(t);
-                        if (!t.getName().equals(DepotConfig.getTaxonomyName_ModType_Tool()))
+                        if (!nm.isTool())
                                 t.addEntry(this);
                 }
@@ -187 +186 @@
          */
         public boolean isNewerAvailable() {
-                if (node != null)
-                        return node.getUploads().firstElement().getTimestamp() > localTimestamp;
+                if (file != null)
+                        return file.getTimestamp() > localTimestamp;
                 else
                         return false;
@@ -261 +260 @@
         public int getZipSize() {
                 return zipSize;
-        }
-
-        /**
-         * @return Depot Mod-Node
-         */
-        public NodeMod getNode() {
-                return node;
         }
 

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

@@ -10 +10 @@
 
 import net.oni2.aeinstaller.backend.Paths;
-import net.oni2.aeinstaller.backend.depot.DepotConfig;
 import net.oni2.aeinstaller.backend.depot.DepotManager;
 import net.oni2.aeinstaller.backend.depot.model.NodeMod;
@@ -56 +55 @@
                 }
 
-                TaxonomyTerm toolTerm = DepotManager.getInstance().getTaxonomyTerm(
-                                DepotConfig.getTaxonomyName_ModType_Tool());
                 for (NodeMod nm : DepotManager.getInstance().getModPackageNodes()) {
                         if (nm.getUploads().size() == 1) {
                                 Mod m = new Mod(nm);
-                                if (nm.getTypes().contains(toolTerm))
+                                if (nm.isTool())
                                         tools.put(m.getPackageNumber(), m);
                                 else

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

@@ -272 +272 @@
                                 FileUtils.copyFile(keyConfVanilla, keyConfEdition);
 
-                        // TODO: FileUtils.deleteDirectory(init);
+                        FileUtils.deleteDirectory(init);
+                        
                         Date end = new Date();
                         log.println("Initialization ended at " + sdf.format(end));
@@ -384 +385 @@
                 }
         }
+
+        /**
+         * Verify that the Edition is within a subfolder to vanilla Oni (..../Oni/Edition/AEInstaller)
+         * @return true if GDF can be found in the parent's parent-path
+         */
+        public static boolean verifyRunningDirectory() {
+                return Paths.getVanillaGDF().exists() && Paths.getVanillaGDF().isDirectory();
+        }
 }