Update app.py

app.py

@@ -1,145 +1,29 @@
-import os
+import gradio as gr
 import subprocess
-import tempfile
-import shutil
-import re
-import logging
-from flask import Flask, request, send_file, jsonify
-from werkzeug.utils import secure_filename
-
-# Configure logging
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
-
-app = Flask(__name__)
-
-# Configuration
-app.config['MAX_CONTENT_LENGTH'] = 1 * 1024 * 1024  # 1MB max
-app.config['ALLOWED_EXTENSIONS'] = {'png', 'jpg', 'jpeg'}
-app.config['TEMP_DIR'] = '/tmp/pwa2apk'  # Using system temp directory
-app.config['BUBBLEWRAP_MIN_VERSION'] = '1.0.0'
-
-# Ensure temp directory exists
-os.makedirs(app.config['TEMP_DIR'], exist_ok=True)
-
-def is_valid_url(url):
-    """Validate URL format using regex"""
-    regex = re.compile(
-        r'^(https?://)?'  # http:// or https://
-        r'([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}'  # domain
-        r'(/[a-zA-Z0-9-._~:/?#[\]@!$&\'()*+,;=]*)?$',  # path
-        re.IGNORECASE
+import os
+import uuid
+
+def convert_to_apk(manifest_url):
+    apk_id = str(uuid.uuid4())
+    result = subprocess.run(
+        ["bash", "entrypoint.sh", manifest_url, apk_id],
+        capture_output=True,
+        text=True
     )
-    return re.match(regex, url) is not None
-
-def check_bubblewrap():
-    """Verify bubblewrap is installed and meets version requirements"""
-    try:
-        result = subprocess.run(
-            ['bubblewrap', '--version'],
-            capture_output=True,
-            text=True,
-            check=True
-        )
-        version = result.stdout.strip()
-        logger.info(f"Bubblewrap version detected: {version}")
-        return True
-    except Exception as e:
-        logger.error(f"Bubblewrap check failed: {str(e)}")
-        return False
-
-def cleanup_directory(dir_path):
-    """Safely remove temporary directory"""
-    try:
-        if os.path.exists(dir_path):
-            shutil.rmtree(dir_path)
-            logger.info(f"Cleaned up directory: {dir_path}")
-    except Exception as e:
-        logger.error(f"Cleanup failed for {dir_path}: {str(e)}")
 
-def generate_apk_internal(pwa_url, output_dir):
-    """Core APK generation logic"""
-    try:
-        # Initialize project
-        init_cmd = [
-            'bubblewrap', 'init',
-            '--manifest', pwa_url,
-            '--directory', output_dir,
-            '--non-interactive'
-        ]
-        subprocess.run(init_cmd, check=True, timeout=300)
-
-        # Build APK
-        build_cmd = ['bubblewrap', 'build']
-        subprocess.run(build_cmd, cwd=output_dir, check=True, timeout=600)
-
-        # Verify APK was created
-        apk_path = os.path.join(output_dir, 'app-release.apk')
-        if not os.path.exists(apk_path):
-            raise FileNotFoundError("APK file not found after build")
-        
+    apk_path = f"{apk_id}/app-release-signed.apk"
+    if os.path.exists(apk_path):
         return apk_path
+    else:
+        return f"Error:\n{result.stderr}"
 
-    except subprocess.TimeoutExpired as e:
-        logger.error(f"Build timed out: {str(e)}")
-        raise
-    except subprocess.CalledProcessError as e:
-        logger.error(f"Build failed with code {e.returncode}: {e.stderr}")
-        raise
-    except Exception as e:
-        logger.error(f"Unexpected error: {str(e)}")
-        raise
-
-@app.route('/health', methods=['GET'])
-def health_check():
-    """Health check endpoint"""
-    return jsonify({'status': 'healthy', 'bubblewrap': check_bubblewrap()})
-
-@app.route("/generate-apk", methods=["POST"])
-def generate_apk():
-    """Main APK generation endpoint"""
-    if not check_bubblewrap():
-        return jsonify({"error": "Bubblewrap not available"}), 503
-
-    if 'url' not in request.form:
-        return jsonify({"error": "URL parameter is required"}), 400
-
-    pwa_url = request.form['url'].strip()
-    if not is_valid_url(pwa_url):
-        return jsonify({"error": "Invalid URL format"}), 400
-
-    # Create unique temp directory
-    temp_dir = tempfile.mkdtemp(dir=app.config['TEMP_DIR'])
-    logger.info(f"Created temp directory: {temp_dir}")
-
-    try:
-        apk_path = generate_apk_internal(pwa_url, temp_dir)
-        
-        # Generate safe filename
-        domain = pwa_url.split('//')[-1].split('/')[0].replace('.', '_')
-        apk_name = secure_filename(f"{domain}_app.apk")
-
-        logger.info(f"Successfully generated APK: {apk_path}")
-        return send_file(
-            apk_path,
-            as_attachment=True,
-            download_name=apk_name,
-            mimetype='application/vnd.android.package-archive'
-        )
+iface = gr.Interface(
+    fn=convert_to_apk,
+    inputs=gr.Textbox(label="Manifest.json URL"),
+    outputs=gr.File(label="Download APK"),
+    title="URL to APK",
+    description="Paste the public URL of a manifest.json from your PWA"
+)
 
-    except Exception as e:
-        logger.error(f"APK generation failed: {str(e)}")
-        return jsonify({
-            "error": "APK generation failed",
-            "details": str(e)
-        }), 500
-    finally:
-        cleanup_directory(temp_dir)
+iface.launch()
 
-if __name__ == "__main__":
-    # Verify dependencies at startup
-    if not check_bubblewrap():
-        logger.error("Bubblewrap not available - service cannot start")
-        exit(1)
-        
-    app.run(host="0.0.0.0", port=7860)