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

Timestamp:

Mar 15, 2016, 4:47:02 PM (9 years ago)

Author:

alloc

Message:

v.25: Added some debug information to mod installation, auto flush log, print detected platform

File:

• java/installer2/src/net/oni2/aeinstaller/backend/oni/management/Installer.java (modified) (4 diffs)

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

@@ -198 +198 @@
                 TreeMap<String, Vector<File>> levels = new TreeMap<String, Vector<File>>(
                                 new NaturalOrderComparator());
+                log.println("Building sources list");
                 for (File path : foldersOni) {
+                        log.println("\tFolder " + path.getPath());
                         for (File levelF : path.listFiles()) {
+                                boolean isSecondaryFile = false;
+                                log.println("\t\tFolder/file " + levelF.getPath());
                                 String fn = levelF.getName().toLowerCase();
                                 String levelN = null;
@@ -207 +211 @@
                                 } else if (fn.endsWith(".dat")) {
                                         levelN = fn.substring(0, fn.lastIndexOf('.')).toLowerCase();
+                                } else if (fn.endsWith(".raw") || fn.endsWith(".sep")) {
+                                        isSecondaryFile = true;
                                 }
                                 if (levelN != null) {
+                                        log.println("\t\t\tAdded for level " + levelN);
                                         if (!levels.containsKey(levelN))
                                                 levels.put(levelN, new Vector<File>());
                                         levels.get(levelN).add(levelF);
+                                } else if (!isSecondaryFile) {
+                                        log.println("\t\t\tNot a level file!?");
                                 }
                         }
@@ -422 +431 @@
 
                         log.println("\t\tPatches for " + level);
-
+                        
+                        log.println("\t\t\tSource files/folders:");
+                        for (File srcFolder : oniLevelFolders.get(level)) {
+                                log.println("\t\t\t\t" + srcFolder.getPath());
+                        }
+
+                        // Get files to be patched from vanilla.dat
                         Vector<String> exportPatterns = new Vector<String>();
-                        // Get files to be patched from vanilla.dat
                         for (File patch : patches.get(level)) {
                                 String patternWildcard = patch.getName();
@@ -449 +463 @@
                                                 patternWildcard.indexOf(".oni-patch"));
                                 patternWildcard = patternWildcard.replace('-', '*');
-                                patternWildcard = patternWildcard + ".oni";
                                 Vector<String> patterns = new Vector<String>();
                                 patterns.add(patternWildcard);
+                                patternWildcard = patternWildcard + ".oni";
                                 final Pattern patternRegex = Pattern.compile(
                                                 patternWildcard.replaceAll("\\*", ".\\*"),