Fix progress reporting

kbinani · Dec 24, 2023 · 6e8f6f1 · 6e8f6f1
1 parent d058c21
commit 6e8f6f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/ConvertXbox360ToJava.swift b/src/ConvertXbox360ToJava.swift
@@ -12,13 +12,15 @@ class ConvertXbox360ToJava: Converter {
     }
 
     func numProgressSteps() -> Int32 {
-        return 1
+        return 2
     }
 
     func description(forStep step: Int32) -> String? {
         switch step {
         case 0:
             return "Convert"
+        case 1:
+            return "Zip"
         default:
             return nil
         }
@@ -28,6 +30,8 @@ class ConvertXbox360ToJava: Converter {
         switch step {
         case 0:
             return nil
+        case 1:
+            return nil
         default:
             return nil
         }

diff --git a/src/Core.mm b/src/Core.mm
@@ -291,7 +291,7 @@ Result UnsafeJavaToBedrock(id<Converter> converter, NSURL* input, NSURL *tempDir
         return Result::Error(kJe2beErrorCodeConverterError, *st.error());
     }
 
-    ZipProgress zipProgress(3, converter, delegate);
+    ZipProgress zipProgress(4, converter, delegate);
     fs::path fsZipOut = fsTempRoot / fsInput.filename().replace_extension(".mcworld");
     NSURL *zipOut = NSURLFromPath(fsZipOut);
     auto zipResult = je2be::ZipFile::Zip(fsOutput, fsZipOut, zipProgress);
@@ -443,7 +443,7 @@ Result UnsafeXbox360ToBedrock(id<Converter> converter, NSURL* input, NSURL *temp
         }
     }
 
-    ZipProgress zipProgress(3, converter, delegate);
+    ZipProgress zipProgress(4, converter, delegate);
     fs::path fsZipOut = fsTempRoot / fsInput.filename().replace_extension(".mcworld");
     NSURL *zipOut = NSURLFromPath(fsZipOut);
     auto zipResult = je2be::ZipFile::Zip(fsTempOutput, fsZipOut, zipProgress);