Merge pull request #29 from KizKizz/backend-rework

part2 bug fix
KizKizz · Jul 18, 2022 · 9f39116 · 9f39116
2 parents 8983f09 + c4ed3bc
commit 9f39116
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 22 deletions.
diff --git a/app_version_check/app_version.json b/app_version_check/app_version.json
@@ -1,9 +1,8 @@
 {
     "name": "PSO2NGS Mod Manager",
-    "version": "1.4.1",
+    "version": "1.4.2",
     "description": [
-        "Added a new refresh list button (near search bar)",
-        "Fixed a bug when applying duplicated mods",
+        "Fixed a bug when applying duplicated mods - part 2",
         "Minor bug fixes"
     ],
     "windows_file": "",

diff --git a/lib/file_functions.dart b/lib/file_functions.dart
@@ -105,6 +105,7 @@ Future<void> modsToDataAdder(List<ModFile> modList) async {
     File(checkSumFilePath!).copySync('$binDirPath${s}data${s}win32$s${checkSumFilePath!.split(s).last}');
   }
 
+  //Bulk apply
   if (modList.length > 1) {
     for (var modFile in modList) {
       await Future(
@@ -134,17 +135,35 @@ Future<void> modsToDataAdder(List<ModFile> modList) async {
               //check for dub applied mod
               //set backup path to file
               modFile.backupIcePath = '$backupDirPath$s${modFile.iceName}';
-              for (var lists in modFilesList) {
-                List<ModFile> matchingList = lists.where((element) => element.iceName == modFile.iceName && element.isApplied == true).toList();
-                if (matchingList.isNotEmpty) {
-                  duplicateModsApplied.add(matchingList);
+              //   for (var lists in modFilesList) {
+              //     List<ModFile> matchingList = lists.where((element) => element.iceName == modFile.iceName && element.isApplied == true).toList();
+              //     if (matchingList.isNotEmpty) {
+              //       duplicateModsApplied.add(matchingList);
+
+              //       if (appliedModsList.isNotEmpty) {
+              //         for (var mod in matchingList) {
+              //           for (var appliedList in appliedModsList) {
+              //             appliedList.firstWhere((element) => element.iceName == mod.iceName).isApplied = false;
+              //             appliedList.remove(mod);
+              //           }
+              //            mod.isApplied = false;
+              //             mod.appliedDate = '';
+              //         }
+              //         appliedModsList.removeWhere((element) => element.isEmpty);
+              //       }
+              //     }
+              //   }
+              // }
+
+              for (var file in allModFiles) {
+                if (file.iceName == modFile.iceName && file.isApplied) {
+                  duplicateModsApplied.add([file]);
 
                   if (appliedModsList.isNotEmpty) {
-                    for (var mod in matchingList) {
-                      for (var appliedList in appliedModsList) {
-                        appliedList.remove(mod);
-                      }
+                    for (var appliedList in appliedModsList) {
+                      appliedList.remove(file);
                     }
+
                     appliedModsList.removeWhere((element) => element.isEmpty);
                   }
                 }
@@ -178,6 +197,8 @@ Future<void> modsToDataAdder(List<ModFile> modList) async {
         element.isApplied = false;
       }
     }
+
+    //Single apply
   } else {
     for (var modFile in modList) {
       //Backup file check and apply
@@ -205,18 +226,31 @@ Future<void> modsToDataAdder(List<ModFile> modList) async {
           //check for dub applied mod
           //set backup path to file
           modFile.backupIcePath = '$backupDirPath$s${modFile.iceName}';
-          for (var lists in modFilesList) {
-            List<ModFile> matchingList =
-                lists.where((element) => (element.iceName == modFile.iceName || element.modName == modFile.modName) && element.isApplied == true).toList();
-            if (matchingList.isNotEmpty) {
-              duplicateModsApplied.add(matchingList);
+          //   for (var lists in modFilesList) {
+          //     List<ModFile> matchingList = lists.where((element) => (element.iceName == modFile.iceName) && element.isApplied == true).toList();
+          //     if (matchingList.isNotEmpty) {
+          //       duplicateModsApplied.add(matchingList);
+
+          //       if (appliedModsList.isNotEmpty) {
+          //         for (var mod in matchingList) {
+          //           for (var appliedList in appliedModsList) {
+          //             appliedList.remove(mod);
+          //           }
+          //         }
+          //         appliedModsList.removeWhere((element) => element.isEmpty);
+          //       }
+          //     }
+          //   }
+
+          for (var file in allModFiles) {
+            if (file.iceName == modFile.iceName && file.isApplied) {
+              duplicateModsApplied.add([file]);
 
               if (appliedModsList.isNotEmpty) {
-                for (var mod in matchingList) {
-                  for (var appliedList in appliedModsList) {
-                    appliedList.remove(mod);
-                  }
+                for (var appliedList in appliedModsList) {
+                  appliedList.remove(file);
                 }
+
                 appliedModsList.removeWhere((element) => element.isEmpty);
               }
             }

diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc
@@ -63,13 +63,13 @@ IDI_APP_ICON            ICON                    "resources\\app_icon.ico"
 #ifdef FLUTTER_BUILD_NUMBER
 #define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
 #else
-#define VERSION_AS_NUMBER 1,4,1
+#define VERSION_AS_NUMBER 1,4,2
 #endif
 
 #ifdef FLUTTER_BUILD_NAME
 #define VERSION_AS_STRING #FLUTTER_BUILD_NAME
 #else
-#define VERSION_AS_STRING "1.4.1"
+#define VERSION_AS_STRING "1.4.2"
 #endif
 
 VS_VERSION_INFO VERSIONINFO