Changeset 605 for AE/installer2/src/net/oni2/aeinstaller/backend/unpack

Timestamp:

Jan 13, 2013, 8:11:07 PM (12 years ago)

Author:

alloc

Message:

AEI2:

• Added mod download prior to installation
• Dependency checking (needs verification)
• Conflicts checking basis (not implemented)
• Run Oni through AEI

File:

• AE/installer2/src/net/oni2/aeinstaller/backend/unpack/Unpacker.java (modified) (3 diffs)

AE/installer2/src/net/oni2/aeinstaller/backend/unpack/Unpacker.java

@@ -117 +117 @@
                                         try {
                                                 int pathStart = 0;
+                                                String pathStartName = "";
 
                                                 ZipFile zf = new ZipFile(zip);
@@ -124 +125 @@
                                                         ZipEntry ze = e.nextElement();
                                                         if (ze.getName().toLowerCase()
-                                                                        .endsWith("mod_info.cfg")) {
+                                                                        .endsWith("/mod_info.cfg")
+                                                                        || ze.getName().toLowerCase()
+                                                                                        .equals("mod_info.cfg")) {
                                                                 pathStart = ze.getName().toLowerCase()
                                                                                 .indexOf("mod_info.cfg");
+                                                                pathStartName = ze.getName().substring(0,
+                                                                                pathStart);
                                                         }
                                                 }
@@ -136 +141 @@
                                                         ZipEntry ze = e.nextElement();
                                                         if (!ze.isDirectory()) {
-                                                                File targetFile = new File(target, ze.getName()
-                                                                                .substring(pathStart));
-                                                                targetFile.getParentFile().mkdirs();
+                                                                if (ze.getName().startsWith(pathStartName)) {
+                                                                        File targetFile = new File(target, ze
+                                                                                        .getName().substring(pathStart));
+                                                                        File parent = targetFile.getParentFile();
+                                                                        parent.mkdirs();
 
-                                                                InputStream in = zf.getInputStream(ze);
+                                                                        InputStream in = zf.getInputStream(ze);
 
-                                                                int read = 0;
-                                                                byte[] data = new byte[1024];
-                                                                FileOutputStream fileOut = new FileOutputStream(
-                                                                                targetFile);
-                                                                while ((read = in.read(data, 0, 1024)) != -1) {
-                                                                        fileOut.write(data, 0, read);
+                                                                        int read = 0;
+                                                                        byte[] data = new byte[1024];
+                                                                        FileOutputStream fileOut = new FileOutputStream(
+                                                                                        targetFile);
+                                                                        while ((read = in.read(data, 0, 1024)) != -1) {
+                                                                                fileOut.write(data, 0, read);
+                                                                        }
+                                                                        fileOut.close();
                                                                 }
-                                                                fileOut.close();
                                                         }
                                                 }