Merge pull request #223 from KizKizz/system-rework

prep
KizKizz · Jun 13, 2024 · b6d3b7d · b6d3b7d
2 parents b58701f + 0fbaa99
commit b6d3b7d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/ItemRefSheets/PSO2ModManRefSheetsVer.txt b/ItemRefSheets/PSO2ModManRefSheetsVer.txt
@@ -1 +1 @@
-18
+19
diff --git a/app_version_check/app_version.json b/app_version_check/app_version.json
@@ -1,6 +1,6 @@
 {
     "name": "PSO2NGS Mod Manager",
-    "version": "2.7.6",
+    "version": "2.7.7",
     "description": [
         "Added support for weapons and camos (recognizes when adding mods and weapons-camos swapping)",
         "More bug fixes",

diff --git a/lib/boundary/mods_boundary_edit.dart b/lib/boundary/mods_boundary_edit.dart
@@ -83,6 +83,7 @@ void boundaryEdit(context, SubMod submod) async {
   Directory(modManAddModsTempDirPath).createSync(recursive: true);
   List<String> boundaryRemovedFiles = [];
   List<String> boundaryNotFoundFiles = [];
+  int packRetries = 0;
   //if (itemCategory == defaultCateforyDirs[16] || itemCategory == defaultCateforyDirs[1] || itemName.contains('[Fu]')) {
   // if (itemCategory == defaultCategoryDirs[1] ||
   //     itemCategory == defaultCategoryDirs[3] ||
@@ -133,11 +134,19 @@ void boundaryEdit(context, SubMod submod) async {
             Provider.of<StateProvider>(context, listen: false).setBoundaryEditProgressStatus(curLangText!.uiPackingFiles);
             await Future.delayed(const Duration(milliseconds: 100));
             //pack
-            await Process.run('$modManZamboniExePath -c -pack -outdir "${p.dirname(aqpFile.parent.path)}"', [Uri.file(p.dirname(aqpFile.parent.path)).toFilePath()]);
+            while (!File(Uri.file('${p.dirname(aqpFile.parent.path)}.ice').toFilePath()).existsSync()) {
+              await Process.run('$modManZamboniExePath -c -pack -outdir "${p.dirname(aqpFile.parent.path)}"', [Uri.file(p.dirname(aqpFile.parent.path)).toFilePath()]);
+              packRetries++;
+              debugPrint(packRetries.toString());
+              if (packRetries == 10) {
+                break;
+              }
+            }
+            packRetries = 0;
             Provider.of<StateProvider>(context, listen: false).setBoundaryEditProgressStatus(curLangText!.uiReplacingModFiles);
             await Future.delayed(const Duration(milliseconds: 100));
-            File renamedFile = await File(Uri.file('${p.dirname(aqpFile.parent.path)}.ice').toFilePath()).rename(Uri.file(p.dirname(aqpFile.parent.path).replaceAll('_ext', '')).toFilePath());
             try {
+              File renamedFile = await File(Uri.file('${p.dirname(aqpFile.parent.path)}.ice').toFilePath()).rename(Uri.file(p.dirname(aqpFile.parent.path).replaceAll('_ext', '')).toFilePath());
               await renamedFile.copy(modFile.location);
             } catch (e) {
               Provider.of<StateProvider>(context, listen: false).setBoundaryEditProgressStatus('${curLangText!.uiError}\n${e.toString()}');

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 2.7.6
+version: 2.7.7
 
 environment:
   sdk: ">=3.0.0"

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 2,7,6
+#define VERSION_AS_NUMBER 2,7,7
 #endif
 
 #ifdef FLUTTER_BUILD_NAME
 #define VERSION_AS_STRING #FLUTTER_BUILD_NAME
 #else
-#define VERSION_AS_STRING "2.7.6"
+#define VERSION_AS_STRING "2.7.7"
 #endif
 
 VS_VERSION_INFO VERSIONINFO