modforge-cli 0.1.6__tar.gz → 0.1.7__tar.gz

{modforge_cli-0.1.6 → modforge_cli-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modforge-cli
-Version: 0.1.6
+Version: 0.1.7
 Summary: ModForge-CLI — a Modrinth-based Minecraft modpack builder
 License: MIT
 License-File: LICENSE

{modforge_cli-0.1.6 → modforge_cli-0.1.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "modforge-cli"
-version = "0.1.6"
+version = "0.1.7"
 description = "ModForge-CLI — a Modrinth-based Minecraft modpack builder"
 authors = [{ name = "Frank1o3", email = "jahdy1o3@gmail.com" }]
 license = { text = "MIT" }

{modforge_cli-0.1.6 → modforge_cli-0.1.7}/src/modforge_cli/__version__.py

@@ -1,5 +1,5 @@
 """
 Auto-generated file. DO NOT EDIT.
 """
-__version__ = "0.1.6"
+__version__ = "0.1.7"
 __author__ = "Frank1o3"

{modforge_cli-0.1.6 → modforge_cli-0.1.7}/src/modforge_cli/cli.py

@@ -2,11 +2,9 @@ import asyncio
 import json
 import shutil
 import subprocess
-import sys
 from pathlib import Path
 from typing import Optional
 
-import aiohttp
 import typer
 from pyfiglet import figlet_format
 from rich.console import Console
@@ -16,8 +14,16 @@ from rich.table import Table
 from rich.text import Text
 
 from modforge_cli.api import ModrinthAPIConfig
-from modforge_cli.core import Manifest, ModDownloader, SearchResult
+from modforge_cli.core import Manifest
 from modforge_cli.core import ModPolicy, ModResolver
+from modforge_cli.core import (
+    self_update,
+    install_fabric,
+    get_manifest,
+    perform_add,
+    ensure_config_file,
+    run,
+)
 
 # Import version info
 try:
@@ -46,108 +52,14 @@ DEFAULT_MODRINTH_API_URL = "https://raw.githubusercontent.com/Frank1o3/ModForge-
 DEFAULT_POLICY_URL = "https://raw.githubusercontent.com/Frank1o3/ModForge-CLI/refs/heads/main/configs/policy.json"
 
 
-def ensure_config_file(path: Path, url: str, label: str):
-    if path.exists():
-        return
-
-    path.parent.mkdir(parents=True, exist_ok=True)
-
-    console.print(f"[yellow]Missing {label} config.[/yellow] Downloading default…")
-
-    try:
-        import urllib.request
-
-        urllib.request.urlretrieve(url, path)
-        console.print(f"[green]✓ {label} config installed at {path}[/green]")
-    except Exception as e:
-        console.print(f"[red]Failed to download {label} config:[/red] {e}")
-        raise typer.Exit(1)
-
+ensure_config_file(MODRINTH_API, DEFAULT_MODRINTH_API_URL, "Modrinth API", console)
 
-ensure_config_file(
-    MODRINTH_API,
-    DEFAULT_MODRINTH_API_URL,
-    "Modrinth API",
-)
-
-ensure_config_file(
-    POLICY_PATH,
-    DEFAULT_POLICY_URL,
-    "Policy",
-)
+ensure_config_file(POLICY_PATH, DEFAULT_POLICY_URL, "Policy", console)
 
 
 api = ModrinthAPIConfig(MODRINTH_API)
 
 
-# --- Async Helper ---
-async def get_api_session():
-    """Returns a session with the correct ModForge-CLI headers."""
-    return aiohttp.ClientSession(
-        headers={"User-Agent": f"{__author__}/ModForge-CLI/{__version__}"},
-        raise_for_status=True,
-    )
-
-
-def get_manifest(path: Path = Path.cwd()) -> Optional[Manifest]:
-    p = path / "ModForge-CLI.json"
-    if not p.exists():
-        return None
-    try:
-        return Manifest.model_validate_json(p.read_text())
-    except Exception as e:
-        console.print(e)
-        return None
-
-
-def install_fabric(
-    installer: Path,
-    mc_version: str,
-    loader_version: str,
-    game_dir: Path,
-):
-    subprocess.run(
-        [
-            "java",
-            "-jar",
-            installer,
-            "client",
-            "-mcversion",
-            mc_version,
-            "-loader",
-            loader_version,
-            "-dir",
-            str(game_dir),
-            "-noprofile",
-        ],
-        check=True,
-    )
-
-
-def detect_install_method() -> str:
-    prefix = Path(sys.prefix)
-
-    if "pipx" in prefix.parts:
-        return "pipx"
-    return "pip"
-
-def self_update():
-    method = detect_install_method()
-
-    if method == "pipx":
-        console.print("[cyan]Updating ModForge-CLI using pipx...[/cyan]")
-        subprocess.run(["pipx", "upgrade", "ModForge-CLI"], check=True)
-
-    else:
-        console.print("[cyan]Updating ModForge-CLI using pip...[/cyan]")
-        subprocess.run(
-            [sys.executable, "-m", "pip", "install", "--upgrade", "ModForge-CLI"],
-            check=True,
-        )
-
-    console.print("[green]ModForge-CLI updated successfully.[/green]")
-
-
 def render_banner():
     """Renders a high-quality stylized banner"""
     ascii_art = figlet_format("ModForge-CLI", font="slant")
@@ -192,7 +104,9 @@ def main_callback(
     # If no command is provided (e.g., just 'ModForge-CLI')
     if ctx.invoked_subcommand is None:
         render_banner()
-        console.print("\n[bold yellow]Usage:[/bold yellow] ModForge-CLI [COMMAND] [ARGS]...")
+        console.print(
+            "\n[bold yellow]Usage:[/bold yellow] ModForge-CLI [COMMAND] [ARGS]..."
+        )
         console.print("\n[bold cyan]Core Commands:[/bold cyan]")
         console.print("  [green]setup[/green]    Initialize a new modpack project")
         console.print("  [green]ls[/green]       List all registered projects")
@@ -201,17 +115,26 @@ def main_callback(
             "  [green]build[/green]    Download files and setup loader version"
         )
         console.print("  [green]export[/green]   Create the final .mrpack zip")
+        console.print(
+            "  [green]remove[/green]   Removes a modpack that you have locally."
+        )
 
-        console.print("\nRun [white]ModForge-CLI --help[/white] for full command details.\n")
+        console.print(
+            "\nRun [white]ModForge-CLI --help[/white] for full command details.\n"
+        )
 
 
 @app.command()
-def setup(name: str, mc: str = "1.21.1", loader: str = "fabric", loader_version: str = FABRIC_LOADER_VERSION):
+def setup(
+    name: str,
+    mc: str = "1.21.1",
+    loader: str = "fabric",
+    loader_version: str = FABRIC_LOADER_VERSION,
+):
     """Initialize the working directory for a new pack"""
     pack_dir = Path.cwd() / name
     pack_dir.mkdir(parents=True, exist_ok=True)
 
-
     # Standard ModForge-CLI structure (The Watermark)
     for folder in [
         "mods",
@@ -222,7 +145,9 @@ def setup(name: str, mc: str = "1.21.1", loader: str = "fabric", loader_version:
     ]:
         (pack_dir / folder).mkdir(parents=True, exist_ok=True)
 
-    manifest: Manifest = Manifest(name=name, minecraft=mc, loader=loader, loader_version=loader_version)
+    manifest: Manifest = Manifest(
+        name=name, minecraft=mc, loader=loader, loader_version=loader_version
+    )
     (pack_dir / "ModForge-CLI.json").write_text(manifest.model_dump_json(indent=4))
 
     # Register globally
@@ -240,7 +165,6 @@ def setup(name: str, mc: str = "1.21.1", loader: str = "fabric", loader_version:
         "name": name,
         "dependencies": {"minecraft": mc, loader: "*"},
         "files": [],
-        
     }
     (pack_dir / "modrinth.index.json").write_text(json.dumps(index_data, indent=2))
 
@@ -274,49 +198,11 @@ def add(name: str, project_type: str = "mod", pack_name: str = "testpack"):
         console.print(f"[red]Error:[/red] Could not load manifest at {manifest_file}")
         return
 
-    async def perform_add():
-        async with await get_api_session() as session:
-            url = api.search(
-                name,
-                game_versions=[manifest.minecraft],
-                loaders=[manifest.loader],
-                project_type=project_type,
-            )
-
-            async with session.get(url) as response:
-                results = SearchResult.model_validate_json(await response.text())
-
-            if not results or not results.hits:
-                console.print(f"[red]No {project_type} found for '{name}'")
-                return
-
-            # Match slug
-            target_hit = next(
-                (h for h in results.hits if h.slug == name), results.hits[0]
-            )
-            slug = target_hit.slug
-
-            # 3. Modify the existing manifest object
-            # Only 'mod' will reach here currently due to the check above
-            target_list = {
-                "mod": manifest.mods,
-                "resourcepack": manifest.resourcepacks,
-                "shaderpack": manifest.shaderpacks,
-            }.get(project_type, manifest.mods)
-
-            if slug not in target_list:
-                target_list.append(slug)
-                manifest_file.write_text(manifest.model_dump_json(indent=4))
-                console.print(f"Added [green]{slug}[/green] to {project_type}s")
-            else:
-                console.print(f"{slug} is already in the manifest.")
-
-    asyncio.run(perform_add())
+    asyncio.run(perform_add(api, name, manifest, project_type, console, manifest_file))
 
 
 @app.command()
 def resolve(pack_name: str = "testpack"):
-
     # 1. Load Registry and Manifest
     registry = json.loads(REGISTRY_PATH.read_text())
     if pack_name not in registry:
@@ -391,23 +277,8 @@ def build(pack_name: str = "testpack"):
 
     mods_dir.mkdir(exist_ok=True)
 
-    async def run():
-        async with aiohttp.ClientSession(
-            headers={"User-Agent": f"{__author__}/ModForge-CLI/{__version__}"},
-            raise_for_status=True,
-        ) as session:
-            downloader = ModDownloader(
-                api=api,
-                mc_version=manifest.minecraft,
-                loader=manifest.loader,
-                output_dir=mods_dir,
-                index_file=index_file,
-                session=session,
-            )
-            await downloader.download_all(manifest.mods)
-
     console.print(f"🛠  Building [bold cyan]{manifest.name}[/bold cyan]...")
-    asyncio.run(run())
+    asyncio.run(run(api, manifest, mods_dir, index_file))
     console.print("✨ Build complete. Mods downloaded and indexed.", style="green")
 
 
@@ -540,6 +411,7 @@ def list_projects():
         table.add_row(name, path)
     console.print(table)
 
+
 @app.command()
 def self_update_cmd():
     """

modforge_cli-0.1.7/src/modforge_cli/core/__init__.py

@@ -0,0 +1,23 @@
+from .policy import ModPolicy
+from .resolver import ModResolver
+from .downloader import ModDownloader
+from .models import Manifest, Hit, SearchResult, ProjectVersion, ProjectVersionList
+from .utils import ensure_config_file, install_fabric, run, get_api_session, get_manifest, self_update, perform_add
+
+__all__ = [
+    "ModPolicy",
+    "ModResolver",
+    "Manifest",
+    "Hit",
+    "SearchResult",
+    "ProjectVersion",
+    "ProjectVersionList",
+    "ModDownloader",
+    "ensure_config_file",
+    "install_fabric",
+    "run",
+    "get_api_session",
+    "get_manifest",
+    "self_update",
+    "perform_add"
+]

modforge_cli-0.1.7/src/modforge_cli/core/utils.py

@@ -0,0 +1,149 @@
+import sys
+import subprocess
+from pathlib import Path
+import urllib.request
+from typing import Optional
+from modforge_cli.core.models import Manifest, SearchResult
+from modforge_cli.api import ModrinthAPIConfig
+from modforge_cli.core import ModDownloader
+
+import typer
+import aiohttp
+from rich.console import Console
+
+try:
+    from modforge_cli.__version__ import __author__, __version__
+except ImportError:
+    __version__ = "unknown"
+    __author__ = "Frank1o3"
+
+
+def ensure_config_file(path: Path, url: str, label: str, console: Console):
+    if path.exists():
+        return
+
+    path.parent.mkdir(parents=True, exist_ok=True)
+
+    console.print(f"[yellow]Missing {label} config.[/yellow] Downloading default…")
+
+    try:
+        urllib.request.urlretrieve(url, path)
+        console.print(f"[green]✓ {label} config installed at {path}[/green]")
+    except Exception as e:
+        console.print(f"[red]Failed to download {label} config:[/red] {e}")
+        raise typer.Exit(1)
+
+# --- Async Helper ---
+async def get_api_session():
+    """Returns a session with the correct ModForge-CLI headers."""
+    return aiohttp.ClientSession(
+        headers={"User-Agent": f"{__author__}/ModForge-CLI/{__version__}"},
+        raise_for_status=True,
+    )
+
+
+def get_manifest(console: Console, path: Path = Path.cwd()) -> Optional[Manifest]:
+    p = path / "ModForge-CLI.json"
+    if not p.exists():
+        return None
+    try:
+        return Manifest.model_validate_json(p.read_text())
+    except Exception as e:
+        console.print(e)
+        return None
+
+def install_fabric(
+    installer: Path,
+    mc_version: str,
+    loader_version: str,
+    game_dir: Path,
+):
+    subprocess.run(
+        [
+            "java",
+            "-jar",
+            installer,
+            "client",
+            "-mcversion",
+            mc_version,
+            "-loader",
+            loader_version,
+            "-dir",
+            str(game_dir),
+            "-noprofile",
+        ],
+        check=True,
+    )
+
+
+def detect_install_method() -> str:
+    prefix = Path(sys.prefix)
+
+    if "pipx" in prefix.parts:
+        return "pipx"
+    return "pip"
+
+def self_update(console: Console):
+    method = detect_install_method()
+
+    if method == "pipx":
+        console.print("[cyan]Updating ModForge-CLI using pipx...[/cyan]")
+        subprocess.run(["pipx", "upgrade", "ModForge-CLI"], check=True)
+
+    else:
+        console.print("[cyan]Updating ModForge-CLI using pip...[/cyan]")
+        subprocess.run(
+            [sys.executable, "-m", "pip", "install", "--upgrade", "ModForge-CLI"],
+            check=True,
+        )
+
+    console.print("[green]ModForge-CLI updated successfully.[/green]")
+
+async def run(api:ModrinthAPIConfig, manifest:Manifest, mods_dir:Path, index_file:Path):
+        async with await get_api_session() as session:
+            downloader = ModDownloader(
+                api=api,
+                mc_version=manifest.minecraft,
+                loader=manifest.loader,
+                output_dir=mods_dir,
+                index_file=index_file,
+                session=session,
+            )
+            await downloader.download_all(manifest.mods)
+
+async def perform_add(api:ModrinthAPIConfig, name:str, manifest:Manifest, project_type:str, console: Console, manifest_file:Path):
+    async with await get_api_session() as session:
+        url = api.search(
+            name,
+            game_versions=[manifest.minecraft],
+            loaders=[manifest.loader],
+            project_type=project_type,
+        )
+
+        async with session.get(url) as response:
+            results = SearchResult.model_validate_json(await response.text())
+
+        if not results or not results.hits:
+            console.print(f"[red]No {project_type} found for '{name}'")
+            return
+
+        # Match slug
+        target_hit = next(
+            (h for h in results.hits if h.slug == name), results.hits[0]
+        )
+        slug = target_hit.slug
+
+        # 3. Modify the existing manifest object
+        # Only 'mod' will reach here currently due to the check above
+        target_list = {
+            "mod": manifest.mods,
+            "resourcepack": manifest.resourcepacks,
+            "shaderpack": manifest.shaderpacks,
+        }.get(project_type, manifest.mods)
+
+        if slug not in target_list:
+            target_list.append(slug)
+            manifest_file.write_text(manifest.model_dump_json(indent=4))
+            console.print(f"Added [green]{slug}[/green] to {project_type}s")
+        else:
+            console.print(f"{slug} is already in the manifest.")

modforge_cli-0.1.6/src/modforge_cli/core/__init__.py

@@ -1,6 +0,0 @@
-from .policy import ModPolicy
-from .resolver import ModResolver
-from .downloader import ModDownloader
-from .models import Manifest, Hit, SearchResult, ProjectVersion, ProjectVersionList
-
-__all__ = ["ModPolicy", "ModResolver", "Manifest", "Hit", "SearchResult", "ProjectVersion", "ProjectVersionList", "ModDownloader"]