appforge-cli 1.6.2__tar.gz → 1.6.4__tar.gz

{appforge_cli-1.6.2 → appforge_cli-1.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: appforge-cli
-Version: 1.6.2
+Version: 1.6.4
 Summary: Convert web, Flutter, and native apps into Android/iOS apps automatically using cloud builds.
 Author: AppForge Team
 Author-email: AppForge Team <juniorsir.bot@gmail.com>

{appforge_cli-1.6.2 → appforge_cli-1.6.4}/appforge/cli.py

@@ -15,30 +15,34 @@ from .capacitor import install_plugins
 from .create import create_project
 
 def init_project():
+    # 1. Load existing config first to see if 'create' already set things up
+    current_config = load_local_config()
+    
     project_info = detect_project()
     category = project_info.get("category", "web")
     proj_type = project_info.get("type", "unknown")
     default_icon_dest = os.path.join(os.getcwd(), "appforge_icon.png")
 
-    current_config = load_local_config()
     if not current_config.get("iconPath") or not os.path.exists(current_config.get("iconPath")):
         try:
             cli_dir = os.path.dirname(os.path.abspath(__file__))
             bundled_icon = os.path.join(cli_dir, "default_icon.png")
-
             if os.path.exists(bundled_icon):
                 shutil.copy2(bundled_icon, default_icon_dest)
                 save_local_config({"iconPath": default_icon_dest})
                 print_info("Installed default AppForge app icon.")
-        except Exception as e:
+        except Exception:
             pass
 
+    # 2. Get the platform that was saved during 'create' (default to android if new)
+    saved_platform = current_config.get("platform", "android")
     save_local_config({"category": category, "project_type": proj_type})
 
     if category == "web":
-        web_dir = prompt("Confirm web build directory", project_info["webDir"])
-        platform_choice = prompt("Select platforms (android, ios, both)", "android").lower()
-        if platform_choice == "both" or platform_choice == "all": 
+        web_dir = prompt("Confirm web build directory", current_config.get("webDir", project_info["webDir"]))
+        # --- FIXED: Uses saved_platform as default ---
+        platform_choice = prompt("Select platforms (android, ios, both)", saved_platform).lower()
+        if platform_choice in ["both", "all"]: 
             platforms = ["android", "ios"]
             platform_choice = "android,ios"
         elif "ios" in platform_choice: 
@@ -54,43 +58,36 @@ def init_project():
         print_info(f"Native {proj_type} project detected. Bypassing Capacitor setup.")
         
         if proj_type == "flutter":
-            platform_choice = prompt("Select platforms (e.g., android, ios, windows, linux, or 'all')", "android").lower()
-            if platform_choice == "all" or platform_choice == "both":
+            # --- FIXED: Uses saved_platform as default ---
+            platform_choice = prompt("Select platforms (e.g., android, ios, windows, linux, or 'all')", saved_platform).lower()
+            if platform_choice in ["all", "both"]:
                 platform_choice = "android,ios,windows,linux"
         else:
-            platform_choice = prompt("Select platform to build in cloud (android)", "android").lower()
+            # Standard Kotlin/Java is Android only
             platform_choice = "android"
         
         save_local_config({"platform": platform_choice})
 
+    # AI Scanning logic...
     print("")
     detected_features = scan_codebase_for_permissions()
-
     if detected_features:
         print_success(f"AI detected {len(detected_features)} native features required by your app:")
-
         for data in detected_features.values():
             print(f"  {CYAN}●{RESET} {data['feature']} {GRAY}({data['desc']}){RESET}")
-
-        print_info("The AppForge Cloud Server will automatically inject these permissions during the build process.")
+        print_info("The AppForge Cloud Server will automatically inject these permissions.")
     else:
         print_info("AI scan complete. No special native permissions detected.")
     
+    # Monorepo logic...
     try:
         import subprocess
-        git_root = subprocess.check_output(
-            ['git', 'rev-parse', '--show-toplevel'],
-            text=True,
-            stderr=subprocess.DEVNULL
-        ).strip()
-
-        sub_path = os.path.relpath(os.getcwd(), git_root)
-
+        git_root = subprocess.check_output(['git', 'rev-parse', '--show-toplevel'], text=True, stderr=subprocess.DEVNULL).strip()
+        sub_path = os.relpath(os.getcwd(), git_root)
         if sub_path and sub_path != '.':
             print_info(f"Detected sub-project path: {GRAY}{sub_path}{RESET}")
             save_local_config({"sub_path": sub_path})
-
-    except (subprocess.CalledProcessError, FileNotFoundError):
+    except Exception:
         save_local_config({"sub_path": "."})
         
     print_success("Ready to send to the AppForge Cloud Builder.")
@@ -102,29 +99,31 @@ def configure_project():
     package_id = prompt("Package ID", config.get("packageId", "com.example.app"))
     build_mode = prompt("Default Build Mode (debug/release)", config.get("buildMode", "debug")).lower()
     if build_mode not in ['debug', 'release']: build_mode = 'debug'
+    
     current_icon = config.get("iconPath", "")
     icon_prompt = prompt("Icon path (local PNG)", current_icon)
-    
-    # If they typed a new path, use it. Otherwise, keep the old one.
     final_icon_path = icon_prompt if icon_prompt else current_icon
 
     splash_img = prompt("Splash image (local PNG)", config.get("splashImg", ""))
     splash_bg = prompt("Splash background color (HEX)", config.get("splashBg", "#ffffff"))
 
+    # FIXED: Removed duplicate iconPath key
     new_config = {
         "appName": app_name,
         "packageId": package_id,
         "buildMode": build_mode, 
         "iconPath": final_icon_path,
-        "iconPath": icon_path,
         "splashImg": splash_img,
         "splashBg": splash_bg
     }
     save_local_config(new_config)
 
-    web_dir = config.get("webDir", "dist")
+    # FIXED: Only run apply_configuration once, and ONLY for web projects
     if config.get("category") == "web":
+        web_dir = config.get("webDir", "dist")
         apply_configuration(app_name, package_id, final_icon_path, splash_img, splash_bg, web_dir)
+        
+    print_success("Configuration updated successfully.")
     return new_config
 
 def display_app_details(config):
@@ -330,7 +329,7 @@ def show_argu():
     print("  appforge init       - Initialize an AppForge project")
     print("  appforge configure  - Open interactive settings")
     print(f"  {CYAN}info{RESET}  - View CLI version and release notes")
-    print(f"  {CYAN}create <framework> <name>{RESET} Scaffold a new app (vite, flutter, html, kotlin, win, linux), {BLUE}Ex - appforge create flutter myapp{RESET}")
+    print(f"  {CYAN}create <framework> <name>{RESET} Scaffold a new app (vite, flutter, html, kotlin), {BLUE}Ex - appforge create flutter myapp{RESET}")
     print("  appforge build      - Package project and send to build repo")
     print("  appforge status     - Check build status")
     print("  appforge download   - Download the built APK")

appforge_cli-1.6.4/appforge/create.py

@@ -0,0 +1,165 @@
+import os
+import shutil
+import subprocess
+import re
+import time
+from .utils import print_success, print_info, print_error, prompt, print_progress_bar, run_with_spinner, CYAN, RESET, BOLD
+from .config import save_local_config
+
+TEMPLATES = {
+    "vite": {
+        "cmd": "npm create vite@latest {name} -- --template react-ts",
+        "desc": "React + TypeScript + Vite (Fast Web App)",
+        "type": "vite",
+        "category": "web"
+    },
+    "flutter": {
+        "cmd": "git clone --progress --depth 1 https://github.com/flutter/samples.git _temp_samples",
+        "desc": "Official Flutter Starter App (Native)",
+        "type": "flutter",
+        "category": "native"
+    },
+    "kotlin": {
+        "cmd": "git clone --progress --depth 1 https://github.com/android/architecture-samples.git _temp_kt",
+        "desc": "Native Android Kotlin (Jetpack Compose)",
+        "type": "android_native",
+        "category": "native"
+    },
+    "html": {
+        "cmd": None,
+        "desc": "Plain HTML/CSS/JS (Simple Web App)",
+        "type": "html",
+        "category": "web"
+    }
+}
+
+def generate_html_template(project_name):
+    os.makedirs(project_name, exist_ok=True)
+    os.makedirs(os.path.join(project_name, "www"), exist_ok=True)
+    
+    html_content = f"""<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <title>{project_name}</title>
+    <style>
+        body {{ font-family: system-ui, -apple-system, sans-serif; display: flex; justify-content: center; align-items: center; height: 100vh; margin: 0; background-color: #0f172a; color: white; }}
+        .card {{ background: rgba(255,255,255,0.1); padding: 2rem; border-radius: 16px; text-align: center; border: 1px solid rgba(255,255,255,0.2); backdrop-filter: blur(10px); }}
+        h1 {{ margin-top: 0; color: #6366f1; }}
+    </style>
+</head>
+<body>
+    <div class="card">
+        <h1>Welcome to {project_name}</h1>
+        <p>Built with ▲ AppForge</p>
+    </div>
+</body>
+</html>"""
+
+    with open(os.path.join(project_name, "www", "index.html"), "w") as f:
+        f.write(html_content)
+
+def create_project(framework, project_name):
+    if framework not in TEMPLATES:
+        print_error(f"Unknown framework: {framework}.")
+
+    if os.path.exists(project_name):
+        print_error(f"Directory '{project_name}' already exists.")
+
+    template = TEMPLATES[framework]
+    print_info(f"Creating a new {BOLD}{template['desc']}{RESET} project in {CYAN}./{project_name}{RESET}...")
+    
+    # 1. Platform selection
+    print("")
+    if framework == "flutter":
+        p_choice = prompt("Select platforms (android, ios, windows, linux, or 'all')", "android").lower()
+        if p_choice in ["all", "both"]: p_choice = "android,ios,windows,linux"
+    elif template["category"] == "web":
+        p_choice = prompt("Select platforms (android, ios, both)", "android").lower()
+        if p_choice in ["all", "both"]: p_choice = "android,ios"
+    else:
+        p_choice = "android"
+    print("")
+
+    # 2. Download with Smoothing
+    if framework == "html":
+        generate_html_template(project_name)
+    else:
+        cmd = template["cmd"].format(name=project_name)
+        try:
+            # We use non-blocking IO to allow the bar to animate even between data chunks
+            process = subprocess.Popen(
+                cmd, shell=True, stderr=subprocess.PIPE, stdout=subprocess.DEVNULL, text=True, bufsize=0
+            )
+            os.set_blocking(process.stderr.fileno(), False)
+
+            progress_regex = re.compile(r"(\d+)%")
+            real_p = 0.0
+            display_p = 0.0
+            
+            # --- SMOOTHING LOOP ---
+            while process.poll() is None or display_p < real_p:
+                try:
+                    # Read all available data from stderr
+                    data = process.stderr.read()
+                    if data:
+                        matches = progress_regex.findall(data)
+                        if matches:
+                            real_p = float(matches[-1])
+                except (TypeError, IOError):
+                    pass # No data available right now
+
+                # If real_p hasn't updated yet, keep display_p moving slowly (fake inertia)
+                if display_p < real_p:
+                    # Catch up 10% of the remaining distance per frame
+                    step = (real_p - display_p) * 0.15
+                    display_p += max(step, 0.5)
+                elif display_p < 99.0 and process.poll() is None:
+                    # Creep forward slowly while waiting for more data
+                    display_p += 0.1
+
+                if display_p > 100: display_p = 100.0
+                
+                print_progress_bar(display_p, f"Downloading {framework} template")
+                time.sleep(0.05) # ~20 FPS for smoothness
+
+            print_progress_bar(100.0, f"Downloading {framework} template")
+            
+            # Step 2: Extracting
+            def do_extract():
+                if framework == "flutter":
+                    shutil.move("_temp_samples/provider_counter", project_name)
+                elif framework == "kotlin":
+                    shutil.move("_temp_kt", project_name)
+            run_with_spinner(do_extract, "Extracting starter project")
+
+            # Step 3: Cleaning
+            def do_cleanup():
+                if os.path.exists("_temp_samples"): shutil.rmtree("_temp_samples", ignore_errors=True)
+                if os.path.exists("_temp_kt"): shutil.rmtree("_temp_kt", ignore_errors=True)
+                git_dir = os.path.join(project_name, ".git")
+                if os.path.exists(git_dir): shutil.rmtree(git_dir, ignore_errors=True)
+            run_with_spinner(do_cleanup, "Optimizing project size")
+
+        except Exception as e:
+            print_error(f"Creation failed: {e}")
+
+    # Step 4: Auto-Initialization
+    def do_init():
+        orig = os.getcwd()
+        os.chdir(project_name)
+        save_local_config({
+            "category": template["category"],
+            "project_type": template["type"],
+            "platform": p_choice,
+            "appName": project_name,
+            "packageId": f"com.appforge.{project_name.lower().replace('-', '_')}",
+            "version": "1.0.0"
+        })
+        os.chdir(orig)
+    
+    run_with_spinner(do_init, "Generating AppForge config")
+
+    print_success(f"\nProject '{project_name}' is ready!")
+    print(f"Next steps: {CYAN}cd {project_name}{RESET} -> {CYAN}appforge init{RESET}\n")

{appforge_cli-1.6.2 → appforge_cli-1.6.4}/appforge/utils.py

@@ -14,7 +14,7 @@ RED = "\033[31m"
 GRAY = "\033[90m"
 BLUE = "\033[34m"
 
-CLI_VERSION = "1.6.2"
+CLI_VERSION = "1.6.4"
 
 def check_for_cli_updates():
     try:

{appforge_cli-1.6.2 → appforge_cli-1.6.4}/appforge_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: appforge-cli
-Version: 1.6.2
+Version: 1.6.4
 Summary: Convert web, Flutter, and native apps into Android/iOS apps automatically using cloud builds.
 Author: AppForge Team
 Author-email: AppForge Team <juniorsir.bot@gmail.com>

{appforge_cli-1.6.2 → appforge_cli-1.6.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "appforge-cli"
-version = "1.6.2"
+version = "1.6.4"
 authors = [
   { name="AppForge Team", email="juniorsir.bot@gmail.com" },
 ]

{appforge_cli-1.6.2 → appforge_cli-1.6.4}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name="appforge",
-    version="1.6.2",
+    version="1.6.4",
     description="Convert web apps into Android apps automatically using Capacitor and GitHub cloud builds.",
     author="AppForge Team",
     packages=["appforge"],

appforge_cli-1.6.2/appforge/create.py

@@ -1,106 +0,0 @@
-import os
-import shutil
-import subprocess
-import re
-from .utils import print_success, print_info, print_error, prompt, print_progress_bar, CYAN, RESET, BOLD
-
-TEMPLATES = {
-    "vite": {
-        "cmd": "npm create vite@latest {name} -- --template react-ts",
-        "desc": "React + TypeScript + Vite (Fast Web App)"
-    },
-    "flutter": {
-        "cmd": "git clone --progress https://github.com/flutter/samples.git _temp_samples && mv _temp_samples/provider_counter {name} && rm -rf _temp_samples",
-        "desc": "Official Flutter Starter App (Native)"
-    },
-    "kotlin": {
-        "cmd": "git clone --progress https://github.com/android/architecture-samples.git _temp_kt && mv _temp_kt {name} && rm -rf _temp_kt",
-        "desc": "Native Android Kotlin (Jetpack Compose)"
-    },
-    "html": {
-        "cmd": None,
-        "desc": "Plain HTML/CSS/JS (Simple Web App)"
-    },
-    "win": {
-        "cmd": "git clone --progress https://github.com/flutter/samples.git _temp_samples",
-        "desc": "Flutter Windows Desktop App (.exe)",
-        "base_framework": "flutter" # It uses Flutter under the hood!
-    },
-    "linux": {
-        "cmd": "git clone --progress https://github.com/flutter/samples.git _temp_samples",
-        "desc": "Flutter Linux Desktop App",
-        "base_framework": "flutter" # It uses Flutter under the hood!
-    }
-}
-
-def generate_html_template(project_name):
-    # This function stays exactly the same
-    os.makedirs(project_name, exist_ok=True)
-    os.makedirs(os.path.join(project_name, "www"), exist_ok=True)
-    html_content = f"""...""" # Keep your HTML content
-    with open(os.path.join(project_name, "www", "index.html"), "w") as f:
-        f.write(html_content)
-
-def create_project(framework, project_name):
-    """Generates a new project with a real progress bar for git clone."""
-    if framework not in TEMPLATES:
-        print_error(f"Unknown framework: {framework}.")
-
-    if os.path.exists(project_name):
-        print_error(f"Directory '{project_name}' already exists.")
-
-    template = TEMPLATES[framework]
-    print_info(f"Creating a new {BOLD}{template['desc']}{RESET} project in {CYAN}./{project_name}{RESET}...")
-    
-    if framework == "html":
-        generate_html_template(project_name)
-    else:
-        # --- NEW REAL-TIME PROGRESS BAR LOGIC ---
-        cmd = template["cmd"].format(name=project_name)
-        
-        try:
-            # We open a subprocess and read its stderr line by line
-            process = subprocess.Popen(
-                cmd,
-                shell=True,
-                stderr=subprocess.PIPE,
-                stdout=subprocess.DEVNULL, # Hide normal git output
-                text=True,
-                bufsize=1 # Line-buffered
-            )
-
-            # Regex to find the percentage in git's output
-            # It looks for "Receiving objects:  25%"
-            progress_regex = re.compile(r"(\d+)%")
-            
-            # Read each line of output from the running git command
-            for line in iter(process.stderr.readline, ''):
-                match = progress_regex.search(line)
-                if match:
-                    percentage = float(match.group(1))
-                    print_progress_bar(percentage, f"Downloading {framework} template")
-            
-            process.wait() # Wait for the command to finish
-            if process.returncode != 0:
-                raise Exception("Git clone failed.")
-
-            print_progress_bar(100.0, f"Downloading {framework} template")
-            
-            # Post-clone cleanup for Flutter
-            if framework == "flutter":
-                shutil.move("_temp_samples/provider_counter", project_name)
-                shutil.rmtree("_temp_samples", ignore_errors=True)
-                shutil.rmtree(os.path.join(project_name, ".git"), ignore_errors=True)
-
-        except Exception as e:
-            # Clean up partial downloads on failure
-            if os.path.exists("_temp_samples"):
-                shutil.rmtree("_temp_samples", ignore_errors=True)
-            print_error(f"Project creation failed: {e}")
-        # --- END OF NEW LOGIC ---
-
-    print_success(f"Project '{project_name}' created successfully!")
-    print("\nNext steps:")
-    print(f"  {CYAN}cd {project_name}{RESET}")
-    print(f"  {CYAN}appforge init{RESET}")
-    print("")