Update app.py

app.py

@@ -3,43 +3,69 @@ import os
 import zipfile
 import subprocess
 import shutil
-import time
+import glob
 
 # Page Config
 st.set_page_config(page_title="Android Build Server", layout="centered")
 
-st.title("📱 Android APK/AAB Generator")
-st.markdown("Apna Android Studio Project (ZIP) upload karein aur server APK bana dega.")
+st.title("📱 Android APK Generator (Auto-Signed)")
+st.markdown("Zip upload karein. Server APK banayega aur **Sign** karke dega taake install ho sakay.")
 
-# File Uploader
+# --- HELPER FUNCTION: FIND TOOLS ---
+def find_tool(tool_name):
+    # System path mein dhoondo
+    tool_path = shutil.which(tool_name)
+    if tool_path:
+        return tool_path
+    
+    # Agar nahi mila, to Android SDK folder mein dhoondo
+    sdk_root = os.environ.get("ANDROID_HOME", "/opt/android-sdk")
+    found_files = glob.glob(f"{sdk_root}/build-tools/*/{tool_name}")
+    if found_files:
+        return found_files[-1] # Latest version utha lo
+    return None
+
+# --- HELPER FUNCTION: GENERATE KEYSTORE ---
+def generate_keystore():
+    keystore_path = "debug.keystore"
+    if not os.path.exists(keystore_path):
+        # Keytool command to create a generic key
+        cmd = [
+            "keytool", "-genkey", "-v", 
+            "-keystore", keystore_path, 
+            "-storepass", "android", 
+            "-alias", "androiddebugkey", 
+            "-keypass", "android", 
+            "-keyalg", "RSA", 
+            "-keysize", "2048", 
+            "-validity", "10000",
+            "-dname", "CN=AndroidDebug,O=Android,C=US"
+        ]
+        subprocess.run(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    return keystore_path
+
+# --- MAIN UI ---
 uploaded_file = st.file_uploader("Project ZIP File Upload Karein", type=["zip"])
 
 if uploaded_file is not None:
-    # Button Layout
-    col1, col2 = st.columns(2)
-    build_apk = col1.button("🔨 Create APK")
-    build_aab = col2.button("📦 Create AAB")
-
-    if build_apk or build_aab:
+    if st.button("🔨 Create & Sign APK"):
         status_text = st.empty()
         progress_bar = st.progress(0)
         
-        # 1. Cleanup old files
+        # 1. Cleanup
         if os.path.exists("project_extract"):
             shutil.rmtree("project_extract")
         os.makedirs("project_extract", exist_ok=True)
         
-        # 2. Save and Extract Zip
+        # 2. Extract
         status_text.info("Extracting ZIP file...")
         with open("uploaded_project.zip", "wb") as f:
             f.write(uploaded_file.getbuffer())
-            
         with zipfile.ZipFile("uploaded_project.zip", "r") as zip_ref:
             zip_ref.extractall("project_extract")
-        
         progress_bar.progress(20)
         
-        # 3. Find root directory (Smart Find)
+        # 3. Find Root
         project_root = None
         for root, dirs, files in os.walk("project_extract"):
             if "gradlew" in files:
@@ -49,67 +75,87 @@ if uploaded_file is not None:
         if not project_root:
             st.error("❌ ZIP file mein 'gradlew' nahi mila.")
         else:
-            # 4. Permissions fix
-            status_text.info("Setting up Gradle environment...")
+            # 4. Permissions
+            status_text.info("Setting up Gradle...")
             gradlew_path = os.path.join(project_root, "gradlew")
             subprocess.run(["chmod", "+x", gradlew_path])
             
-            # 5. Build Command
-            # Note: Hum 'assemble' use kar rahay hain taake agar release sign na ho to debug ban jaye
-            build_type = "assemble" if build_apk else "bundle"
-            status_text.info(f"Building Project... (Wait karein)")
+            # 5. Build (Use assembleRelease for production feel)
+            # Hum 'assembleRelease' use karenge, jo unsigned APK dega, phir hum usay sign karenge
+            status_text.info("Building APK... (Wait karein)")
+            
+            # Note: Hum 'clean' nahi kar rahay taake jaldi ho, agar error aye to clean add kar lena
+            build_cmd = ["./gradlew", "assembleRelease", "--no-daemon", "--stacktrace"]
             
             try:
                 result = subprocess.run(
-                    [f"./gradlew", build_type],
+                    build_cmd,
                     cwd=project_root,
                     stdout=subprocess.PIPE,
                     stderr=subprocess.PIPE,
                     text=True
                 )
                 
-                progress_bar.progress(80)
+                progress_bar.progress(60)
                 
                 if result.returncode == 0:
-                    status_text.success("✅ Build Successful!")
-                    progress_bar.progress(100)
-                    
-                    # 6. SMART SEARCH for Output File
-                    output_path = None
-                    file_ext = ".apk" if build_apk else ".aab"
+                    status_text.info("✅ Build Successful! Ab Signing kar rahay hain...")
                     
-                    # Pure folder mein dhoondo
+                    # 6. Find Unsigned APK
+                    unsigned_apk = None
                     for root, dirs, files in os.walk(project_root):
                         for file in files:
-                            if file.endswith(file_ext):
-                                # Ignore karna intermediate files ko
-                                if "unaligned" in file:
-                                    continue
-                                # Prefer release, but accept debug
-                                current_file = os.path.join(root, file)
-                                output_path = current_file
-                                # Agar release mil jaye to loop break kardo
-                                if "release" in file:
-                                    break
-                        if output_path and "release" in output_path:
-                            break
+                            if file.endswith(".apk") and "release" in file:
+                                unsigned_apk = os.path.join(root, file)
+                                break
                     
-                    if output_path and os.path.exists(output_path):
-                        file_label = "APP-RELEASE" if "release" in output_path else "APP-DEBUG"
-                        st.write(f"🔍 File Found: {os.path.basename(output_path)}")
+                    if unsigned_apk:
+                        # 7. SIGNING PROCESS ✍️
+                        keystore = generate_keystore()
+                        apksigner = find_tool("apksigner")
                         
-                        with open(output_path, "rb") as f:
-                            st.download_button(
-                                label=f"⬇️ Download {file_ext.upper()}",
-                                data=f,
-                                file_name=f"generated-app{file_ext}",
-                                mime="application/vnd.android.package-archive"
-                            )
-                    else:
-                        st.error("Build pass hogaya lekin koi APK/AAB file generate nahi hui. Shayad ye Library project hai?")
-                        st.warning("Check Log below:")
-                        st.text_area("Build Output", result.stdout[-2000:], height=200)
+                        if apksigner:
+                            signed_apk_name = "production_ready_app.apk"
+                            
+                            # Align APK (Optimization)
+                            zipalign = find_tool("zipalign")
+                            aligned_apk = "aligned.apk"
+                            if zipalign:
+                                subprocess.run([zipalign, "-v", "-p", "4", unsigned_apk, aligned_apk], stdout=subprocess.DEVNULL)
+                                apk_to_sign = aligned_apk
+                            else:
+                                apk_to_sign = unsigned_apk
 
+                            # Sign APK
+                            sign_cmd = [
+                                apksigner, "sign",
+                                "--ks", keystore,
+                                "--ks-pass", "pass:android",
+                                "--out", signed_apk_name,
+                                apk_to_sign
+                            ]
+                            
+                            sign_result = subprocess.run(sign_cmd, capture_output=True, text=True)
+                            
+                            if sign_result.returncode == 0:
+                                status_text.success("🎉 APK Signed & Ready!")
+                                progress_bar.progress(100)
+                                
+                                with open(signed_apk_name, "rb") as f:
+                                    st.download_button(
+                                        label="⬇️ Download Signed APK",
+                                        data=f,
+                                        file_name=signed_apk_name,
+                                        mime="application/vnd.android.package-archive"
+                                    )
+                            else:
+                                st.error("Build pass hui, magar Signing fail hogayi.")
+                                st.text_area("Signing Error", sign_result.stderr)
+                        else:
+                            st.error("Server par 'apksigner' tool nahi mila.")
+                    else:
+                        st.error("Build ho gayi magar APK file dhoondne mein masla hua.")
+                        
                 else:
                     st.error("❌ Build Failed!")
                     st.text_area("Error Log", result.stderr, height=300)
@@ -117,6 +163,5 @@ if uploaded_file is not None:
             except Exception as e:
                 st.error(f"System Error: {str(e)}")
 
-        # Cleanup
         if os.path.exists("uploaded_project.zip"):
             os.remove("uploaded_project.zip")