Update app.py

app.py

@@ -1,113 +1,45 @@
-import json
-import os
-import shutil
 import subprocess
 import gradio as gr
+import os
 
-OUTPUT_DIR = "generated_apks"
-ICON_DIR = "icons"
-os.makedirs(OUTPUT_DIR, exist_ok=True)
-os.makedirs(ICON_DIR, exist_ok=True)
-
-# Directly use the provided manifest
-def update_manifest(app_name, icon_path):
-    # Define the manifest as provided
-    manifest = {
-        "shortName": app_name,
-        "name": app_name,
-        "startUrl": "/",
-        "display": "standalone",
-        "backgroundColor": "#FFFFFF",
-        "themeColor": "#000000",
-        "icons": [
-            {"src": "icon-192.png", "type": "image/png", "sizes": "192x192"},
-            {"src": "icon-512.png", "type": "image/png", "sizes": "512x512"}
-        ]
-    }
-
-    # Save the updated manifest
-    manifest_path = os.path.join(OUTPUT_DIR, "manifest.json")
-    with open(manifest_path, "w") as f:
-        json.dump(manifest, f, indent=4)
-
-    # If an icon was provided, move it to the output directory
-    if icon_path:
-        new_icon_path_192 = os.path.join(OUTPUT_DIR, "icon-192.png")
-        new_icon_path_512 = os.path.join(OUTPUT_DIR, "icon-512.png")
-        shutil.copy(icon_path, new_icon_path_192)
-        shutil.copy(icon_path, new_icon_path_512)
-
-    return manifest_path, None
-
-def generate_apk(url, app_name, icon_path=None):
-    """Generates an APK from a given URL using Bubblewrap, with an optional custom icon."""
-    package_name = f"com.pwa.{app_name.lower()}"
-    app_path = os.path.join(OUTPUT_DIR, app_name)
-
-    if os.path.exists(app_path):
-        shutil.rmtree(app_path)
-
-    os.makedirs(app_path, exist_ok=True)
-
-    manifest_path, error = update_manifest(app_name, icon_path)
-    if error:
-        return error, None
-
+# Function to run Bulldozer via Node.js from Python
+def run_bulldozer(pwa_url, app_name, output_dir="output_apk"):
     try:
-        # Bubblewrap Init
+        # Ensure the output directory exists
+        if not os.path.exists(output_dir):
+            os.makedirs(output_dir)
+
+        # Run Bulldozer Node.js script using subprocess
         result = subprocess.run(
-            ['bubblewrap', 'init', '--manifest', manifest_path, '--directory', app_path],
+            ['node', 'bulldozer.js', pwa_url, app_name, output_dir],
             check=True, capture_output=True, text=True
         )
-        print(result.stdout)
-        
-        # Bubblewrap Build
-        subprocess.run(
-            ['bubblewrap', 'build', '--directory', app_path],
-            check=True
-        )
-
-        apk_path = os.path.join(app_path, "app-release.apk")
-        if os.path.exists(apk_path):
-            final_apk_path = os.path.join(OUTPUT_DIR, f"{app_name}.apk")
-            shutil.move(apk_path, final_apk_path)
-            return "✅ APK Generated Successfully! Download below.", final_apk_path
-        else:
-            return "Error: APK generation failed.", None
+        return f"APK generated successfully: {os.path.join(output_dir, f'{app_name}.apk')}", os.path.join(output_dir, f'{app_name}.apk')
     except subprocess.CalledProcessError as e:
-        print(f"Error: {e}")
-        print(f"Stdout: {e.stdout}")
-        print(f"Stderr: {e.stderr}")
-        return f"Error: {e}", None
+        return f"Error generating APK: {e.stderr}", None
 
-# Gradio UI and processing logic remain the same
-def process_url(url, app_name, icon_file):
-    icon_path = None
-    if icon_file:
-        icon_path = os.path.join(ICON_DIR, f"{app_name}.png")
-        try:
-            shutil.move(icon_file.name, icon_path)
-        except Exception as e:
-            return f"Error while moving icon: {e}", None
-
-    status, apk_path = generate_apk(url, app_name, icon_path)
-    if apk_path:
-        return status, apk_path
-    return status, None
+# Create the Gradio interface
+def process_url(pwa_url, app_name):
+    status, apk_path = run_bulldozer(pwa_url, app_name)
+    return status, apk_path
 
 with gr.Blocks() as demo:
-    gr.Markdown("# 🌐 Convert Website to Android App")
+    gr.Markdown("# Convert Website to Android App")
     
+    # User Inputs for the URL and app name
     url_input = gr.Textbox(label="Enter Website URL", placeholder="https://example.com")
-    name_input = gr.Textbox(label="App Name", placeholder="MyApp")
-    icon_input = gr.File(label="Upload App Icon (PNG)", file_types=[".png"])
+    name_input = gr.Textbox(label="App Name", placeholder="MyWebApp")
     
+    # Output area for status and download link
     output_text = gr.Textbox(label="Status")
     download_link = gr.File(label="Download APK")
-    
+
+    # Button to trigger the conversion
     submit_btn = gr.Button("Generate APK")
 
-    submit_btn.click(process_url, inputs=[url_input, name_input, icon_input], outputs=[output_text, download_link])
+    submit_btn.click(process_url, inputs=[url_input, name_input], outputs=[output_text, download_link])
 
+# Launch Gradio app
 demo.launch(share=True)
 
+