Upload folder using huggingface_hub

app.py

@@ -15,6 +15,24 @@ BASE_URL = "https://gabefromsimplebit-simplebit-signer.hf.space"
 def home():
     return "SimpleBit Signer is Online!"
 
+def get_actual_bundle_id(ipa_path):
+    """ Extracts the actual Bundle ID from the IPA's Info.plist """
+    try:
+        # Use unzip to peek at the Info.plist and grep for the ID
+        # This is more reliable than parsing zsign logs
+        cmd = f"unzip -p {ipa_path} Payload/*.app/Info.plist | grep -A1 'CFBundleIdentifier' | grep 'string' | sed 's/<[^>]*>//g' | str.strip()"
+        # Using a more robust subprocess call for the same logic:
+        result = subprocess.run(
+            f"unzip -p {ipa_path} Payload/*.app/Info.plist | grep -A1 'CFBundleIdentifier'", 
+            shell=True, capture_output=True, text=True
+        )
+        match = re.search(r"<string>(.*)</string>", result.stdout)
+        if match:
+            return match.group(1).strip()
+    except Exception:
+        pass
+    return None
+
 @app.route('/sign', methods=['POST'])
 def sign():
     job_id = str(uuid.uuid4())[:8]
@@ -34,33 +52,10 @@ def sign():
     p12.save(p12_path)
     prov.save(prov_path)
 
-    # --- FIXED Extraction Method for Binary Plists ---
-    # We read as binary (capture_output=True) and decode safely to avoid UnicodeDecodeError
-    raw_plist = subprocess.run(
-        f"unzip -p {ipa_path} Payload/*.app/Info.plist", 
-        shell=True, capture_output=True
-    ).stdout
-
-    # Decode using latin-1 or ignore errors to handle binary bloat around the strings
-    plist_content = raw_plist.decode('utf-8', errors='ignore')
-
-    # Extract Bundle ID
-    # We use a more relaxed regex because binary plists might have null bytes between characters
-    id_match = re.search(r"CFBundleIdentifier.*?<string>(.*?)</string>", plist_content, re.DOTALL)
-    bundle_id = id_match.group(1).strip() if id_match else "com.simplebit.dynamic"
-
-    # Extract App Name
-    name_match = re.search(r"CFBundleDisplayName.*?<string>(.*?)</string>", plist_content, re.DOTALL)
-    if not name_match:
-        name_match = re.search(r"CFBundleName.*?<string>(.*?)</string>", plist_content, re.DOTALL)
+    # STEP 1: Get the REAL Bundle ID first
+    bundle_id = get_actual_bundle_id(ipa_path)
     
-    app_name = name_match.group(1).strip() if name_match else "Signed App"
-
-    # Clean up any potential XML tags left in strings
-    bundle_id = re.sub('<[^<]+?>', '', bundle_id)
-    app_name = re.sub('<[^<]+?>', '', app_name)
-
-    # Sign the app
+    # STEP 2: Sign the app
     command = [
         "zsign",
         "-k", p12_path,
@@ -72,11 +67,17 @@ def sign():
     ]
     
     try:
-        subprocess.run(command, capture_output=True, text=True, check=True)
+        result = subprocess.run(command, capture_output=True, text=True, check=True)
+        
+        # If extraction failed earlier, try one last time from zsign logs
+        if not bundle_id:
+            combined_output = result.stdout + result.stderr
+            match = re.search(r"Bundle\s?Id:\s+([a-zA-Z0-9\.-]+)", combined_output, re.IGNORECASE)
+            bundle_id = match.group(1).strip() if match else "com.simplebit.dynamic"
 
-        # Store metadata for the /plist route
-        with open(os.path.join(job_id, "meta.txt"), "w") as f:
-            f.write(f"{bundle_id}\n{app_name}")
+        # Save the confirmed ID for the /plist route
+        with open(os.path.join(job_id, "bundle_id.txt"), "w") as f:
+            f.write(bundle_id)
 
         plist_url = f"{BASE_URL}/plist/{job_id}"
         return redirect(f"itms-services://?action=download-manifest&url={plist_url}")
@@ -87,13 +88,10 @@ def sign():
 @app.route('/plist/<job_id>')
 def serve_plist(job_id):
     try:
-        with open(os.path.join(job_id, "meta.txt"), "r") as f:
-            lines = f.readlines()
-            bundle_id = lines[0].strip()
-            app_name = lines[1].strip()
+        with open(os.path.join(job_id, "bundle_id.txt"), "r") as f:
+            bundle_id = f.read().strip()
     except:
         bundle_id = "com.simplebit.dynamic"
-        app_name = "SimpleBit App"
 
     ipa_direct_url = f"{BASE_URL}/download/{job_id}"
     
@@ -122,7 +120,7 @@ def serve_plist(job_id):
                 <key>kind</key>
                 <string>software</string>
                 <key>title</key>
-                <string>{app_name}</string>
+                <string>SimpleBit Signed App</string>
             </dict>
         </dict>
     </array>