Fix bug

Author: NovaDev404

Sources/prostore/signing/DownloadSignManager.swift

@@ -153,56 +153,57 @@ class DownloadSignManager: ObservableObject {
         }
     }
 
-    private func signIPA(ipaURL: URL, p12URL: URL, provURL: URL, password: String, appName: String) {
-        DispatchQueue.main.async {
-            self.status = "Starting signing process..."
-            self.progress = 0.5
-        }
-        
-        signer.sign(
-            ipaURL: ipaURL,
-            p12URL: p12URL,
-            provURL: provURL,
-            p12Password: password,
-            progressUpdate: { [weak self] status, progress in
-                DispatchQueue.main.async {
-                    // Convert from 0-1 range within signing phase to 0.5-1.0 overall range
-                    let overallProgress = 0.5 + (progress * 0.5)
-                    self?.progress = overallProgress
-                    let percent = Int(overallProgress * 100)
-                    self?.status = "\(status) (\(percent)%)"
-                }
-            },
-            completion: { [weak self] result in
-                DispatchQueue.main.async {
-                    switch result {
-                    case .success(let signedIPAURL):
-                        self?.progress = 1.0
-                        self?.status = "✅ Successfully signed! Saved to: \(signedIPAURL.lastPathComponent)"
-                        self?.showSuccess = true
-                        
-                        // Hide progress bar after 3 seconds
-                        DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
-                            self?.isProcessing = false
-                            self?.showSuccess = false
-                            self?.progress = 0.0
-                            self?.status = ""
-                        }
-                        
-                        // Clean up original downloaded IPA
-                        try? FileManager.default.removeItem(at: ipaURL)
-                        
-                    case .failure(let error):
-                        self?.status = "❌ Signing failed: \(error.localizedDescription)"
+private func signIPA(ipaURL: URL, p12URL: URL, provURL: URL, password: String, appName: String) {
+    DispatchQueue.main.async {
+        self.status = "Starting signing process..."
+        self.progress = 0.5
+    }
+    
+    signer.sign(
+        ipaURL: ipaURL,
+        p12URL: p12URL,
+        provURL: provURL,
+        p12Password: password,
+        progressUpdate: { [weak self] status, progress in
+            DispatchQueue.main.async {
+                // progress is already in the range 0.0-1.0 for the signing phase
+                // We need to map it to 0.5-1.0 overall
+                let overallProgress = 0.5 + (progress * 0.5)
+                self?.progress = overallProgress
+                let percent = Int(overallProgress * 100)
+                self?.status = "\(status) (\(percent)%)"
+            }
+        },
+        completion: { [weak self] result in
+            DispatchQueue.main.async {
+                switch result {
+                case .success(let signedIPAURL):
+                    self?.progress = 1.0
+                    self?.status = "✅ Successfully signed! Saved to: \(signedIPAURL.lastPathComponent)"
+                    self?.showSuccess = true
+                    
+                    // Hide progress bar after 3 seconds
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
                         self?.isProcessing = false
-                        
-                        // Clean up temp files
-                        try? FileManager.default.removeItem(at: ipaURL)
+                        self?.showSuccess = false
+                        self?.progress = 0.0
+                        self?.status = ""
                     }
+                    
+                    // Clean up original downloaded IPA
+                    try? FileManager.default.removeItem(at: ipaURL)
+                    
+                case .failure(let error):
+                    self?.status = "❌ Signing failed: \(error.localizedDescription)"
+                    self?.isProcessing = false
+                    
+                    // Clean up temp files
+                    try? FileManager.default.removeItem(at: ipaURL)
                 }
             }
-        )
-    }
+        }
+    )
+}
 
     func cancel() {
         downloadTask?.cancel()

Sources/prostore/signing/signer.swift

@@ -72,8 +72,11 @@ fileprivate class SigningManager {
                     to: inputsDir
                 )
                 progressUpdate("Unzipping IPA 🔓", 0.25)
-                try extractIPA(ipaURL: localIPA, to: workDir, progressUpdate: { status, progress in
-                    progressUpdate(status, 0.25 + (progress * 0.25))
+                try extractIPA(ipaURL: localIPA, to: workDir, progressUpdate: { progress in
+                    // Convert 0.0-1.0 progress to 0.25-0.5 range
+                    let overallProgress = 0.25 + (progress * 0.25)
+                    let pct = Int(progress * 100)
+                    progressUpdate("Unzipping IPA 🔓 (\(pct)%)", overallProgress)
                 })
                 let payloadDir = workDir.appendingPathComponent("Payload")
                 let appDir = try findAppBundle(in: payloadDir)
@@ -104,8 +107,11 @@ fileprivate class SigningManager {
                     from: workDir,
                     originalIPAURL: ipaURL,
                     outputDir: tmpRoot,
-                    progressUpdate: { status, progress in
-                        progressUpdate(status, 0.75 + (progress * 0.25))
+                    progressUpdate: { progress in
+                        // Convert 0.0-1.0 progress to 0.75-1.0 range
+                        let overallProgress = 0.75 + (progress * 0.25)
+                        let pct = Int(progress * 100)
+                        progressUpdate("Zipping signed IPA 📦 (\(pct)%)", overallProgress)
                     }
                 )
                 completion(.success(signedIPAURL))
@@ -150,13 +156,12 @@ fileprivate class SigningManager {
     static func extractIPA(
         ipaURL: URL,
         to workDir: URL,
-        progressUpdate: @escaping (String, Double) -> Void
+        progressUpdate: @escaping (Double) -> Void
     ) throws {
         let fm = FileManager.default
         let progress = Progress()
         let observation = progress.observe(\Progress.fractionCompleted) { prog, _ in
-            let pct = Int(prog.fractionCompleted * 100)
-            progressUpdate("Unzipping IPA 🔓 (\(pct)%)", prog.fractionCompleted)
+            progressUpdate(prog.fractionCompleted)
         }
         defer {
             observation.invalidate()
@@ -180,16 +185,14 @@ fileprivate class SigningManager {
         from workDir: URL,
         originalIPAURL: URL,
         outputDir: URL,
-        progressUpdate: @escaping (String, Double) -> Void
+        progressUpdate: @escaping (Double) -> Void
     ) throws -> URL {
         let fm = FileManager.default
-        let originalBase = originalIPAURL.deletingPathExtension().lastPathComponent
         let finalFileName = "signed_\(UUID().uuidString).ipa"
         let signedIpa = outputDir.appendingPathComponent(finalFileName)
         let progress = Progress()
         let observation = progress.observe(\Progress.fractionCompleted) { prog, _ in
-            let pct = Int(prog.fractionCompleted * 100)
-            progressUpdate("Zipping signed IPA 📦 (\(pct)%)", prog.fractionCompleted)
+            progressUpdate(prog.fractionCompleted)
         }
         defer {
             observation.invalidate()