Changeset 1016 for java

Timestamp:

Mar 23, 2015, 7:26:24 PM (10 years ago)

Author:

alloc

Message:

Should support plain files in normal mod packages, but only copies those within GDF. (Refs #89)

Location:

java/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• backend/oni/management/Installer.java (modified) (3 diffs)

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

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=.18
+appversion=.19

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

@@ -29 +29 @@
 import net.oni2.aeinstaller.backend.oni.PersistDat;
 import net.oni2.aeinstaller.backend.oni.XMLTools;
+import net.oni2.aeinstaller.backend.oni.management.tools.ToolFileIterator;
+import net.oni2.aeinstaller.backend.oni.management.tools.ToolFileIteratorEntry;
 import net.oni2.aeinstaller.backend.oni.management.tools.ToolInstallationList;
 import net.oni2.aeinstaller.backend.packages.EBSLInstallType;
@@ -247 +249 @@
                 combineBSLFolders(mods, listener, log);
 
+                copyPlainFiles (log, mods, listener);
+                
                 copyVideos(log);
 
@@ -600 +604 @@
         }
 
+        private static void copyPlainFiles(final Logger log, TreeSet<Package> mods, InstallProgressListener listener) {
+                listener.installProgressUpdate(97, 100, "Copying plain files");
+                log.println();
+                log.println("Copying plain files from mods");
+
+                for (Package p : mods) {
+                        ToolFileIterator.iteratePlatformToolFiles(p,
+                                        new ToolFileIteratorEntry() {
+                                                @Override
+                                                public void toolFile(File source, File target) {
+                                                        copyPlainFile(source, target, log);
+                                                }
+                                        });
+                }
+        }
+
+        private static void copyPlainFile(File src, File target, Logger log) {
+                try {
+                        if (!src.getAbsolutePath().toLowerCase().contains("gamedatafolder")) {
+                                File targetFile = CaseInsensitiveFile.getCaseInsensitiveFile(
+                                                target.getParentFile(), target.getName());
+
+                                // Case mismatch?
+                                if (!targetFile.getName().equals(src.getName()))
+                                        targetFile.delete();
+
+                                FileUtils.copyFile(src, target);
+                        } else {
+                                log.printlnFmt("Not copying \"%s\": Not within GameDataFolder", src.getPath());
+                        }
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }
+        }
+
+
         private static void unlockLevels(TreeSet<Integer> unlockLevels, Logger log) {
                 File dat = new File(Paths.getEditionBasePath(), "persist.dat");