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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: appforge-cli
-Version: 1.6.4
+Version: 1.6.6
 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.4 → appforge_cli-1.6.6}/appforge/create.py

@@ -60,6 +60,37 @@ def generate_html_template(project_name):
     with open(os.path.join(project_name, "www", "index.html"), "w") as f:
         f.write(html_content)
 
+# --- Add this new helper function inside create.py ---
+def sanitize_pubspec(project_dir):
+    """Removes monorepo-specific broken links from pubspec.yaml"""
+    pubspec_path = os.path.join(project_dir, "pubspec.yaml")
+    if not os.path.exists(pubspec_path):
+        return
+
+    with open(pubspec_path, "r", encoding='utf-8') as f:
+        lines = f.readlines()
+
+    new_lines = []
+    skip_next = False
+    for line in lines:
+        if skip_next:
+            skip_next = False
+            continue
+        
+        # Remove the 'analysis_defaults' dependency and its 'path:' line
+        if "analysis_defaults:" in line:
+            skip_next = True # Skip this line and the next one (path: ...)
+            continue
+        
+        # Remove the 'resolution: workspace' line if it exists
+        if "resolution: workspace" in line:
+            continue
+            
+        new_lines.append(line)
+
+    with open(pubspec_path, "w", encoding='utf-8') as f:
+        f.writelines(new_lines)
+
 def create_project(framework, project_name):
     if framework not in TEMPLATES:
         print_error(f"Unknown framework: {framework}.")

{appforge_cli-1.6.4 → appforge_cli-1.6.6}/appforge/github.py

@@ -22,8 +22,6 @@ def get_headers():
         "X-GitHub-Api-Version": "2022-11-28"
     }
 
-# --- Inside github.py ---
-
 def zip_project(category, sub_path=".", zip_name="app_source.zip"):
     """Zips the project, ensuring the icon is ready for @capacitor/assets."""
     config = load_local_config()
@@ -57,7 +55,6 @@ def zip_project(category, sub_path=".", zip_name="app_source.zip"):
 
         except Exception as e:
             print_error(f"Failed to prepare app assets for upload: {e}")
-    # ------------------------------------
 
     def do_zip():
         original_dir = os.getcwd()
@@ -191,8 +188,8 @@ def push_and_build(config):
                 "project_type": proj_type,
                 "app_version": full_config.get("version", "1.0.0"),
                 "sub_path": sub_path,
-                "app_name": app_name,         # <-- THESE NOW SEND "Vdl"
-                "package_id": package_id,      # <-- AND "com.appforge.vdl"
+                "app_name": app_name,     
+                "package_id": package_id,     
                 "build_type": build_type
             }
         }
@@ -209,7 +206,6 @@ def push_and_build(config):
     from datetime import datetime
     project_name = os.path.basename(os.getcwd())
 
-    # Create the history entry
     new_entry = {
         "app_id": app_id,
         "run_id": run_id,
@@ -222,6 +218,7 @@ def push_and_build(config):
 def check_status():
     """Streams live build logs from GitHub Actions with step-by-step animations."""
     headers = get_headers()
+    app_id = get_app_id()
     url = f"{GITHUB_API_URL}/repos/{BUILD_REPO_OWNER}/{BUILD_REPO_NAME}/actions/runs?per_page=1"
     res = requests.get(url, headers=headers)
     
@@ -230,14 +227,26 @@ def check_status():
         return
 
     runs = res.json().get("workflow_runs", [])
+    my_run = None
+    for run in runs:
+        if f"ID: {app_id}" in run.get("display_title", ""):
+            my_run = run
+            break
+    
+    if not my_run:
+        print_info(f"No active builds found for your App ID ({app_id}).")
+        print(f"{GRAY}Note: New builds may take 10 seconds to appear in the list.{RESET}")
+        return
+    
+    run_id = my_run["id"]
+    status = my_run["status"]
+
+    print_info(f"Connected to your Cloud Build #{run_id}. Streaming live logs...\n")
+
     if not runs:
         print_info("No builds found in the cloud yet.")
         return
     
-    latest_run = runs[0]
-    run_id = latest_run["id"]
-    status = latest_run["status"]
-    
     if status == "completed":
         conclusion = latest_run.get("conclusion")
         if conclusion == "success":

appforge_cli-1.6.6/appforge/injector.py

@@ -0,0 +1,143 @@
+import os
+import shutil
+import re
+from .utils import print_info, print_success, print_warning
+
+def inject_metadata_locally(config):
+    """
+    Universally injects App Name, Package ID, Version, and Icons locally 
+    for Android, iOS, Windows, and Linux before zipping.
+    """
+    
+    app_name = config.get("appName", "AppForge App")
+    package_id = config.get("packageId", "com.appforge.app")
+    app_version = config.get("version", "1.0.0")
+    icon_path = config.get("iconPath")
+    web_dir = config.get("webDir", "dist")
+    
+    # Calculate build number (e.g., 1.0.5 -> 10005)
+    try:
+        parts = app_version.split('.')
+        build_number = int(f"{parts[0]}{parts[1].zfill(2)}{parts[2].zfill(2)}")
+    except:
+        build_number = 1
+
+    # Slug for Binary Names (e.g., "Vault OS" -> "vault_os")
+    binary_slug = re.sub(r'[^a-zA-Z0-9]', '_', app_name).lower()
+
+    print_info("Injecting metadata locally before upload...")
+
+    # --- 1. ANDROID & CAPACITOR INJECTION ---
+    manifest_path = "app/src/main/AndroidManifest.xml" if os.path.exists("app/src/main/AndroidManifest.xml") else "android/app/src/main/AndroidManifest.xml"
+    gradle_groovy = "app/build.gradle" if os.path.exists("app/build.gradle") else "android/app/build.gradle"
+    gradle_kts = gradle_groovy + ".kts"
+
+    if os.path.exists(manifest_path):
+        with open(manifest_path, 'r', encoding='utf-8') as f:
+            manifest = f.read()
+        manifest = re.sub(r'android:label="[^"]+"', f'android:label="{app_name}"', manifest)
+        if 'xmlns:tools=' not in manifest:
+            manifest = manifest.replace('<manifest', '<manifest xmlns:tools="http://schemas.android.com/tools"')
+        if 'tools:replace="android:label"' not in manifest:
+            manifest = manifest.replace('<application', '<application tools:replace="android:label"')
+        if 'package=' in manifest:
+            manifest = re.sub(r'package="[^"]+"', f'package="{package_id}"', manifest)
+        with open(manifest_path, 'w', encoding='utf-8') as f:
+            f.write(manifest)
+        print_success(f"Injected Android Name: {app_name}")
+
+    target_gradle = gradle_kts if os.path.exists(gradle_kts) else (gradle_groovy if os.path.exists(gradle_groovy) else None)
+    if target_gradle:
+        with open(target_gradle, 'r', encoding='utf-8') as f:
+            gradle = f.read()
+        gradle = re.sub(r'applicationId\s*=?\s*["\'][^"\']+["\']', f'applicationId = "{package_id}"', gradle)
+        gradle = re.sub(r'namespace\s*=?\s*["\'][^"\']+["\']', f'namespace = "{package_id}"', gradle)
+        gradle = re.sub(r'versionName\s*=?\s*["\'][^"\']+["\']', f'versionName = "{app_version}"', gradle)
+        gradle = re.sub(r'versionCode\s*=?\s*\d+', f'versionCode = {build_number}', gradle)
+        with open(target_gradle, 'w', encoding='utf-8') as f:
+            f.write(gradle)
+        print_success(f"Injected Android Package ID: {package_id}")
+
+    # --- 2. WINDOWS DESKTOP INJECTION ---
+    win_cmake = "windows/CMakeLists.txt"
+    if os.path.exists(win_cmake):
+        with open(win_cmake, 'r', encoding='utf-8') as f:
+            content = f.read()
+        # Set project name and binary name
+        content = re.sub(r'set\(BINARY_NAME "[^"]+"\)', f'set(BINARY_NAME "{binary_slug}")', content)
+        content = re.sub(r'project\([^)]+\)', f'project({binary_slug} LANGUAGES CXX)', content)
+        with open(win_cmake, 'w', encoding='utf-8') as f:
+            f.write(content)
+        
+        # Update Window Title in main.cpp
+        win_main = "windows/runner/main.cpp"
+        if os.path.exists(win_main):
+            with open(win_main, 'r', encoding='utf-8') as f:
+                cpp = f.read()
+            cpp = re.sub(r'window\.CreateAndShow\(L"[^"]+"', f'window.CreateAndShow(L"{app_name}"', cpp)
+            with open(win_main, 'w', encoding='utf-8') as f:
+                f.write(cpp)
+        print_success(f"Injected Windows Title: {app_name}")
+
+    # --- 3. LINUX DESKTOP INJECTION ---
+    linux_cmake = "linux/CMakeLists.txt"
+    if os.path.exists(linux_cmake):
+        with open(linux_cmake, 'r', encoding='utf-8') as f:
+            content = f.read()
+        content = re.sub(r'set\(BINARY_NAME "[^"]+"\)', f'set(BINARY_NAME "{binary_slug}")', content)
+        with open(linux_cmake, 'w', encoding='utf-8') as f:
+            f.write(content)
+        
+        # Update Window Title in application.cc
+        # Usually found in linux/my_application.cc
+        for file in os.listdir("linux"):
+            if file.endswith(".cc"):
+                cc_path = os.path.join("linux", file)
+                with open(cc_path, 'r', encoding='utf-8') as f:
+                    cc = f.read()
+                cc = re.sub(r'gtk_window_set_title\(GTK_WINDOW\(window\), "[^"]+"\)', f'gtk_window_set_title(GTK_WINDOW(window), "{app_name}")', cc)
+                with open(cc_path, 'w', encoding='utf-8') as f:
+                    f.write(cc)
+        print_success(f"Injected Linux Title: {app_name}")
+
+    # --- 4. FLUTTER PUBSPEC INJECTION ---
+    if os.path.exists("pubspec.yaml"):
+        with open("pubspec.yaml", 'r', encoding='utf-8') as f:
+            pubspec = f.read()
+        pubspec = re.sub(r'^version:\s*.*$', f'version: {app_version}+{build_number}', pubspec, flags=re.MULTILINE)
+        pubspec = re.sub(r'^name:\s*.*$', f'name: {binary_slug}', pubspec, flags=re.MULTILINE)
+        with open("pubspec.yaml", 'w', encoding='utf-8') as f:
+            f.write(pubspec)
+        print_success(f"Updated pubspec.yaml version and name.")
+
+    # --- 5. UNIVERSAL ICON INJECTION ---
+    if icon_path and os.path.exists(icon_path):
+        injected_icons = False
+
+        # Android Mipmaps (Local)
+        if os.path.exists(manifest_path):
+            res_dir = os.path.join(os.path.dirname(manifest_path), 'res')
+            mipmaps = ['mipmap-mdpi', 'mipmap-hdpi', 'mipmap-xhdpi', 'mipmap-xxhdpi', 'mipmap-xxxhdpi']
+            for m in mipmaps:
+                target_dir = os.path.join(res_dir, m)
+                if os.path.exists(target_dir):
+                    shutil.copy2(icon_path, os.path.join(target_dir, 'ic_launcher.png'))
+                    if os.path.exists(os.path.join(target_dir, 'ic_launcher_round.png')):
+                        shutil.copy2(icon_path, os.path.join(target_dir, 'ic_launcher_round.png'))
+                    injected_icons = True
+
+        # Web/Flutter Web (Favicons & PWA)
+        web_targets = ["web", "public", web_dir]
+        for w_dir in web_targets:
+            if os.path.exists(w_dir):
+                shutil.copy2(icon_path, os.path.join(w_dir, 'favicon.png'))
+                icons_dir = os.path.join(w_dir, 'icons')
+                if os.path.exists(icons_dir):
+                    for p_icon in ['Icon-192.png', 'Icon-512.png', 'Icon-maskable-192.png', 'Icon-maskable-512.png']:
+                        shutil.copy2(icon_path, os.path.join(icons_dir, p_icon))
+                injected_icons = True
+        
+        if injected_icons:
+            print_success("Injected App Icons across all detected platforms.")
+
+    print_success("Local Metadata Injection Complete.")

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: appforge-cli
-Version: 1.6.4
+Version: 1.6.6
 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.4 → appforge_cli-1.6.6}/pyproject.toml

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

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

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

appforge_cli-1.6.4/appforge/injector.py

@@ -1,125 +0,0 @@
-import os
-import shutil
-import re
-from .utils import print_info, print_success, print_warning
-
-def inject_metadata_locally(config):
-    """Injects App Name, Package ID, Version, and Icons locally before zipping."""
-    
-    app_name = config.get("appName", "AppForge App")
-    package_id = config.get("packageId", "com.appforge.app")
-    app_version = config.get("version", "1.0.0")
-    icon_path = config.get("iconPath")
-    web_dir = config.get("webDir", "dist")
-    project_category = config.get("category", "web")
-    
-    try:
-        parts = app_version.split('.')
-        build_number = int(f"{parts[0]}{parts[1].zfill(2)}{parts[2].zfill(2)}")
-    except:
-        build_number = 1
-
-    print_info("Injecting metadata locally before upload...")
-
-    # --- PATH DETECTION ---
-    manifest_path = "app/src/main/AndroidManifest.xml" if os.path.exists("app/src/main/AndroidManifest.xml") else "android/app/src/main/AndroidManifest.xml"
-    gradle_groovy = "app/build.gradle" if os.path.exists("app/build.gradle") else "android/app/build.gradle"
-    gradle_kts = gradle_groovy + ".kts"
-
-    # --- 1. INJECT APP NAME (AndroidManifest.xml) ---
-    if os.path.exists(manifest_path):
-        with open(manifest_path, 'r', encoding='utf-8') as f:
-            manifest = f.read()
-        
-        manifest = re.sub(r'android:label="[^"]+"', f'android:label="{app_name}"', manifest)
-        if 'xmlns:tools=' not in manifest:
-            manifest = manifest.replace('<manifest', '<manifest xmlns:tools="http://schemas.android.com/tools"')
-        if 'tools:replace="android:label"' not in manifest:
-            manifest = manifest.replace('<application', '<application tools:replace="android:label"')
-        if 'package=' in manifest:
-            manifest = re.sub(r'package="[^"]+"', f'package="{package_id}"', manifest)
-
-        with open(manifest_path, 'w', encoding='utf-8') as f:
-            f.write(manifest)
-        print_success(f"Injected App Name: {app_name}")
-
-    # --- 2. INJECT PACKAGE ID & VERSION (build.gradle) ---
-    target_gradle = gradle_kts if os.path.exists(gradle_kts) else (gradle_groovy if os.path.exists(gradle_groovy) else None)
-    
-    if target_gradle:
-        with open(target_gradle, 'r', encoding='utf-8') as f:
-            gradle = f.read()
-
-        gradle = re.sub(r'applicationId\s*=?\s*["\'][^"\']+["\']', f'applicationId = "{package_id}"', gradle)
-        gradle = re.sub(r'applicationId\s+["\'][^"\']+["\']', f'applicationId "{package_id}"', gradle)
-        gradle = re.sub(r'namespace\s*=?\s*["\'][^"\']+["\']', f'namespace = "{package_id}"', gradle)
-        gradle = re.sub(r'namespace\s+["\'][^"\']+["\']', f'namespace "{package_id}"', gradle)
-        gradle = re.sub(r'versionName\s*=?\s*["\'][^"\']+["\']', f'versionName = "{app_version}"', gradle)
-        gradle = re.sub(r'versionName\s+["\'][^"\']+["\']', f'versionName "{app_version}"', gradle)
-        gradle = re.sub(r'versionCode\s*=?\s*\d+', f'versionCode = {build_number}', gradle)
-        gradle = re.sub(r'versionCode\s+\d+', f'versionCode {build_number}', gradle)
-
-        with open(target_gradle, 'w', encoding='utf-8') as f:
-            f.write(gradle)
-        print_success(f"Injected Package ID: {package_id} & Version: {app_version}")
-
-    # --- 3. INJECT PUBSPEC.YAML (Flutter Specifics) ---
-    if os.path.exists("pubspec.yaml"):
-        with open("pubspec.yaml", 'r', encoding='utf-8') as f:
-            pubspec = f.read()
-        
-        # 3a. Update Version
-        if re.search(r'^version:\s*.*$', pubspec, re.MULTILINE):
-            pubspec = re.sub(r'^version:\s*.*$', f'version: {app_version}+{build_number}', pubspec, flags=re.MULTILINE)
-        
-        # 3b. Update Project Name (Must be snake_case for Dart!)
-        # e.g. "Vault Downloader" -> "vault_downloader"
-        snake_case_name = re.sub(r'[^a-zA-Z0-9]', '_', app_name).lower()
-        if re.search(r'^name:\s*.*$', pubspec, re.MULTILINE):
-            pubspec = re.sub(r'^name:\s*.*$', f'name: {snake_case_name}', pubspec, flags=re.MULTILINE)
-
-        with open("pubspec.yaml", 'w', encoding='utf-8') as f:
-            f.write(pubspec)
-        print_success(f"Updated pubspec.yaml (name: {snake_case_name}, version: {app_version})")
-
-    # --- 4. INJECT APP ICONS (Universal) ---
-    if icon_path and os.path.exists(icon_path):
-        injected_icons = False
-
-        # 4a. Android Mipmaps
-        if os.path.exists(manifest_path):
-            res_dir = os.path.join(os.path.dirname(manifest_path), 'res')
-            mipmaps = ['mipmap-mdpi', 'mipmap-hdpi', 'mipmap-xhdpi', 'mipmap-xxhdpi', 'mipmap-xxxhdpi']
-            for m in mipmaps:
-                target_dir = os.path.join(res_dir, m)
-                if os.path.exists(target_dir):
-                    shutil.copyfile(icon_path, os.path.join(target_dir, 'ic_launcher.png'))
-                    round_icon = os.path.join(target_dir, 'ic_launcher_round.png')
-                    if os.path.exists(round_icon):
-                        shutil.copyfile(icon_path, round_icon)
-                    injected_icons = True
-
-        # 4b. Web / Flutter Web Icons (PWA Support)
-        # Check standard web directories
-        web_targets = ["web", "public", web_dir]
-        for w_dir in web_targets:
-            if os.path.exists(w_dir):
-                # Replace Favicon
-                shutil.copyfile(icon_path, os.path.join(w_dir, 'favicon.png'))
-                if os.path.exists(os.path.join(w_dir, 'favicon.ico')):
-                    shutil.copyfile(icon_path, os.path.join(w_dir, 'favicon.ico'))
-                
-                # Replace PWA Icons
-                icons_dir = os.path.join(w_dir, 'icons')
-                if os.path.exists(icons_dir):
-                    pwa_icons = ['Icon-192.png', 'Icon-512.png', 'Icon-maskable-192.png', 'Icon-maskable-512.png']
-                    for p_icon in pwa_icons:
-                        shutil.copyfile(icon_path, os.path.join(icons_dir, p_icon))
-                injected_icons = True
-                
-        if injected_icons:
-            print_success("Injected custom App Icons across Native and Web directories.")
-        else:
-            print_warning("Icon path found, but no valid target directories (res/mipmap or web/icons) exist yet.")
-
-    print_success("Local Metadata Injection Complete. Project is ready for upload.")