Also detect modpacks that don't have a mod-list.json

Version to 0.1.2
narrowtux · Jul 4, 2015 · 6e97078 · 6e97078
1 parent 7a9935e
commit 6e97078
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.narrowtux</groupId>
     <artifactId>FactorioModManager</artifactId>
-    <version>0.1.1</version>
+    <version>0.1.2</version>
 
     <build>
         <plugins>

diff --git a/src/main/java/com/narrowtux/fmm/Datastore.java b/src/main/java/com/narrowtux/fmm/Datastore.java
@@ -40,7 +40,11 @@ public void scanDirectory(Path path) throws IOException {
             @Override
             public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
                 System.out.println(getTabs() + "Enter directory " + dir);
-                if (Files.exists(Paths.get(dir.toString(), "mod-list.json"))) {
+                Path modList = dir.resolve("mod-list.json");
+                if (!Files.exists(modList) && dir.getParent().equals(getFMMDir())) {
+                    Modpack.writeModList(modList);
+                }
+                if (Files.exists(modList)) {
                     currentModpack = new Modpack(dir.getFileName().toString(), dir);
                     System.out.println(getTabs() + "Enter modpack " + currentModpack.getName());
                     currentTabs++;
@@ -109,7 +113,7 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOEx
                                 .findAny()
                                     .ifPresent(mod2 -> mod2.setEnabled(enabled));
                     }
-
+                    currentModpack.writeModList();
                     Datastore.getInstance().getModpacks().add(currentModpack);
                     currentModpack = null;
                 }

diff --git a/src/main/java/com/narrowtux/fmm/Mod.java b/src/main/java/com/narrowtux/fmm/Mod.java
@@ -19,7 +19,7 @@ public Mod(String name, String version, Path path, Modpack modpack) {
         setModpack(modpack);
 
         enabledProperty().addListener((observableValue, ov, nv) -> {
-            getModpack().writeModList();
+            modpack.writeModList();
         });
     }
 

diff --git a/src/main/java/com/narrowtux/fmm/Modpack.java b/src/main/java/com/narrowtux/fmm/Modpack.java
@@ -66,13 +66,17 @@ public String toString() {
     }
 
     public void writeModList() {
+        writeModList(getPath().resolve("mod-list.json"), getMods().toArray(new Mod[0]));
+    }
+
+    public static void writeModList(Path file, Mod ... mods) {
         JsonObject root = new JsonObject();
         JsonArray modList = new JsonArray();
         JsonObject baseMod = new JsonObject();
         baseMod.addProperty("name", "base");
         baseMod.addProperty("enabled", true);
         modList.add(baseMod);
-        for (Mod mod : getMods()) {
+        for (Mod mod : mods) {
             JsonObject modInfo = new JsonObject();
             modInfo.addProperty("name", mod.getName());
             modInfo.addProperty("enabled", mod.getEnabled());
@@ -82,7 +86,7 @@ public void writeModList() {
         try {
             Gson gson = new Gson();
             String json = gson.toJson(root);
-            FileWriter writer = new FileWriter(new File(getPath().toString(), "mod-list.json"));
+            FileWriter writer = new FileWriter(file.toFile());
             writer.write(json);
             writer.close();
         } catch (IOException e) {