Upload folder using huggingface_hub

app.py

@@ -1,102 +1,138 @@
-from flask import Flask, request, send_file, redirect
+from flask import Flask, request, send_file, redirect, jsonify
 from flask_cors import CORS
 import subprocess
 import os
 import uuid
-import re
+import plistlib
+import zipfile
+from pathlib import Path
 
 app = Flask(__name__)
-CORS(app) 
+CORS(app)
 
-# Base URL for your Hugging Face Space
 BASE_URL = "https://gabefromsimplebit-simplebit-signer.hf.space"
 
-@app.route('/')
+
+@app.route("/")
 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 """
+    """
+    Extract the real bundle ID from the IPA Info.plist safely.
+    """
     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
+        with zipfile.ZipFile(ipa_path, "r") as ipa:
+            plist_file = next(
+                f for f in ipa.namelist()
+                if f.startswith("Payload/") and f.endswith("Info.plist")
+            )
+
+            with ipa.open(plist_file) as fp:
+                plist_data = plistlib.load(fp)
+
+            return plist_data.get("CFBundleIdentifier")
+
+    except Exception as e:
+        print(f"Bundle ID extraction failed: {e}")
+
     return None
 
-@app.route('/sign', methods=['POST'])
+
+@app.route("/sign", methods=["POST"])
 def sign():
-    job_id = str(uuid.uuid4())[:8]
-    os.makedirs(job_id, exist_ok=True)
-    
-    ipa = request.files['ipa']
-    p12 = request.files['p12']
-    prov = request.files['provision']
-    password = request.form.get('password', '1234')
-
-    ipa_path = os.path.join(job_id, "app.ipa")
-    p12_path = os.path.join(job_id, "cert.p12")
-    prov_path = os.path.join(job_id, "prov.mobileprovision")
-    out_path = os.path.join(job_id, "signed.ipa")
-
-    ipa.save(ipa_path)
-    p12.save(p12_path)
-    prov.save(prov_path)
-
-    # STEP 1: Get the REAL Bundle ID first
-    bundle_id = get_actual_bundle_id(ipa_path)
-    
-    # STEP 2: Sign the app
-    command = [
-        "zsign",
-        "-k", p12_path,
-        "-p", password,
-        "-m", prov_path,
-        "-o", out_path,
-        "-z", "0",
-        ipa_path
-    ]
-    
     try:
-        result = subprocess.run(command, capture_output=True, text=True, check=True)
-        
-        # If extraction failed earlier, try one last time from zsign logs
+        # Validate uploads
+        if "ipa" not in request.files:
+            return jsonify({"error": "Missing IPA file"}), 400
+
+        if "p12" not in request.files:
+            return jsonify({"error": "Missing P12 certificate"}), 400
+
+        if "provision" not in request.files:
+            return jsonify({"error": "Missing mobileprovision file"}), 400
+
+        job_id = str(uuid.uuid4())[:8]
+        job_dir = Path(job_id)
+        job_dir.mkdir(exist_ok=True)
+
+        ipa = request.files["ipa"]
+        p12 = request.files["p12"]
+        prov = request.files["provision"]
+
+        password = request.form.get("password", "1234")
+
+        ipa_path = job_dir / "app.ipa"
+        p12_path = job_dir / "cert.p12"
+        prov_path = job_dir / "prov.mobileprovision"
+        out_path = job_dir / "signed.ipa"
+
+        ipa.save(ipa_path)
+        p12.save(p12_path)
+        prov.save(prov_path)
+
+        # Extract bundle ID before signing
+        bundle_id = get_actual_bundle_id(ipa_path)
+
+        # Run zsign
+        command = [
+            "zsign",
+            "-k", str(p12_path),
+            "-p", password,
+            "-m", str(prov_path),
+            "-o", str(out_path),
+            "-z", "0",
+            str(ipa_path)
+        ]
+
+        result = subprocess.run(
+            command,
+            capture_output=True,
+            text=True
+        )
+
+        if result.returncode != 0:
+            return jsonify({
+                "error": "Signing failed",
+                "details": result.stderr
+            }), 500
+
+        # Fallback bundle ID
         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"
+            bundle_id = "com.simplebit.dynamic"
 
-        # Save the confirmed ID for the /plist route
-        with open(os.path.join(job_id, "bundle_id.txt"), "w") as f:
+        # Save bundle ID
+        with open(job_dir / "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}")
-        
-    except subprocess.CalledProcessError as e:
-        return f"Signing failed: {e.stderr}", 500
 
-@app.route('/plist/<job_id>')
+        return redirect(
+            f"itms-services://?action=download-manifest&url={plist_url}"
+        )
+
+    except Exception as e:
+        return jsonify({
+            "error": str(e)
+        }), 500
+
+
+@app.route("/plist/<job_id>")
 def serve_plist(job_id):
+    job_dir = Path(job_id)
+
     try:
-        with open(os.path.join(job_id, "bundle_id.txt"), "r") as f:
+        with open(job_dir / "bundle_id.txt", "r") as f:
             bundle_id = f.read().strip()
     except:
         bundle_id = "com.simplebit.dynamic"
 
     ipa_direct_url = f"{BASE_URL}/download/{job_id}"
-    
+
     plist_content = f"""<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
+"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
     <key>items</key>
@@ -111,14 +147,18 @@ def serve_plist(job_id):
                     <string>{ipa_direct_url}</string>
                 </dict>
             </array>
+
             <key>metadata</key>
             <dict>
                 <key>bundle-identifier</key>
                 <string>{bundle_id}</string>
+
                 <key>bundle-version</key>
                 <string>1.0</string>
+
                 <key>kind</key>
                 <string>software</string>
+
                 <key>title</key>
                 <string>SimpleBit Signed App</string>
             </dict>
@@ -126,16 +166,31 @@ def serve_plist(job_id):
     </array>
 </dict>
 </plist>"""
-    
-    plist_path = os.path.join(job_id, "manifest.plist")
+
+    plist_path = job_dir / "manifest.plist"
+
     with open(plist_path, "w") as f:
         f.write(plist_content)
-        
-    return send_file(plist_path, mimetype='text/xml')
 
-@app.route('/download/<job_id>')
+    return send_file(
+        plist_path,
+        mimetype="application/xml"
+    )
+
+
+@app.route("/download/<job_id>")
 def download_ipa(job_id):
-    return send_file(os.path.join(job_id, "signed.ipa"), as_attachment=True)
+    ipa_path = Path(job_id) / "signed.ipa"
+
+    if not ipa_path.exists():
+        return jsonify({"error": "IPA not found"}), 404
+
+    return send_file(
+        ipa_path,
+        as_attachment=True,
+        download_name="signed.ipa"
+    )
+
 
 if __name__ == "__main__":
     app.run(host="0.0.0.0", port=7860)