Changeset 857 for java/installer2/src/net/oni2/aeinstaller/backend/packages/Package.java

Timestamp:

May 3, 2013, 11:52:50 PM (12 years ago)

Author:

alloc

Message:

AEI2.10:

• Switched caching from Raw Depot cache to AEI packages cache (more compact, faster startup)

File:

• java/installer2/src/net/oni2/aeinstaller/backend/packages/Package.java (modified) (11 diffs)

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

@@ -37 +37 @@
         private String submitter = "";
         private String creator = "";
-        private EBSLInstallType bslInstallType = EBSLInstallType.NORMAL;
+        private transient EBSLInstallType bslInstallType = EBSLInstallType.NORMAL;
         private String description = "";
-        private double aeVersion = 0;
+        private transient double aeVersion = 0;
         private int zipSize = 0;
-        private NodeMod node = null;
-        private net.oni2.moddepot.model.File file = null;
-
-        private File exeFile = null;
-        private EExeType exeType = EExeType.OSBINARY;
-        private File iconFile = null;
-        private String workingDir = "Base";
-
-        private HashSet<Integer> incompatibilities = new HashSet<Integer>();
-        private HashSet<Integer> dependencies = new HashSet<Integer>();
-        private HashSet<Integer> unlockLevel = new HashSet<Integer>();
-
-        private long localTimestamp = 0;
+
+        private URI nodeUrl = null;
+        private String fileUrl = null;
+
+        private long createdMillis = -1;
+        private long updatedMillis = -1;
+
+        private transient File exeFile = null;
+        private transient EExeType exeType = EExeType.OSBINARY;
+        private transient File iconFile = null;
+        private transient String workingDir = "Base";
+
+        private transient HashSet<Integer> incompatibilities = new HashSet<Integer>();
+        private transient HashSet<Integer> dependencies = new HashSet<Integer>();
+        private transient HashSet<Integer> unlockLevel = new HashSet<Integer>();
+
+        private transient long localTimestamp = 0;
 
         /**
@@ -62 +66 @@
          */
         public Package(NodeMod nm) {
-                node = nm;
                 name = nm.getTitle();
                 packageNumber = nm.getPackageNumber();
@@ -73 +76 @@
                                 t.addEntry(this);
                 }
+
+                createdMillis = nm.getCreated();
+                updatedMillis = nm.getUploads().firstElement().getTimestamp();
+
+                try {
+                        nodeUrl = new URI(nm.getPath());
+                } catch (URISyntaxException e) {
+                        e.printStackTrace();
+                }
+
+                fileUrl = nm.getUploads().firstElement().getUri_full();
+                zipSize = nm.getUploads().firstElement().getFilesize();
+
                 version = nm.getVersion();
                 submitter = nm.getName();
@@ -81 +97 @@
                                 description = "<p>" + description + "</p>";
                 }
-                file = nm.getUploads().firstElement();
-                zipSize = file.getFilesize();
 
                 if (isLocalAvailable())
@@ -115 +129 @@
                         aeVersion = mi.getAeVersion();
                         bslInstallType = mi.getBslInstallType();
-                        if (node == null) {
+                        if (isLocalOnly()) {
                                 name = mi.getName();
                                 creator = mi.getCreator();
@@ -132 +146 @@
                 } else {
                         clearLocalOnlyInfo();
-                        System.err.println("No config found for mod folder: "
-                                        + getLocalPath().getPath());
+//                      System.err.println("No config found for mod folder: "
+//                                      + getLocalPath().getPath());
                 }
                 if (aeicfg.exists()) {
@@ -159 +173 @@
                         }
                 }
-                if (node == null)
+                if (isLocalOnly())
                         tool = plain.exists();
         }
@@ -212 +226 @@
          */
         public boolean isNewerAvailable() {
-                if (file != null)
-                        return file.getTimestamp() > localTimestamp;
+                if (!isLocalOnly())
+                        return updatedMillis > localTimestamp;
                 else
                         return false;
@@ -226 +240 @@
 
         /**
+         * @return If this mod is only locally available (not on Depot)
+         */
+        public boolean isLocalOnly() {
+                return nodeUrl == null;
+        }
+
+        /**
          * @return Is mod installed?
          */
         public boolean isInstalled() {
                 if (tool)
-                        return ToolInstallationList.getInstance().isInstalled(packageNumber);
+                        return ToolInstallationList.getInstance()
+                                        .isInstalled(packageNumber);
                 else
                         return PackageManager.getInstance().isModInstalled(this);
@@ -320 +342 @@
 
         /**
+         * @return the createdMillis
+         */
+        public long getCreatedMillis() {
+                return createdMillis;
+        }
+
+        /**
+         * @return the updatedMillis
+         */
+        public long getUpdatedMillis() {
+                return updatedMillis;
+        }
+
+        /**
+         * @return the fileUrl
+         */
+        public String getFileUrl() {
+                return fileUrl;
+        }
+
+        /**
          * @return Is a package that is always installed?
          */
@@ -327 +370 @@
 
         /**
-         * @return Get the depot file entry
-         */
-        public net.oni2.moddepot.model.File getFile() {
-                return file;
-        }
-
-        /**
-         * @return Get the depot Node
-         */
-        public NodeMod getNode() {
-                return node;
-        }
-
-        /**
          * @return Depot page URI
          */
         public URI getUrl() {
-                if (node == null)
-                        return null;
-                if (node.getPath() == null)
-                        return null;
-                URI res = null;
-                try {
-                        res = new URI(node.getPath());
-                } catch (URISyntaxException e) {
-                        e.printStackTrace();
-                }
-                return res;
+                return nodeUrl;
         }