rbx.cp 0.5.6__tar.gz → 0.5.9__tar.gz

{rbx_cp-0.5.6 → rbx_cp-0.5.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rbx.cp
-Version: 0.5.6
+Version: 0.5.9
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9,<4.0

{rbx_cp-0.5.6 → rbx_cp-0.5.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.5.6"
+version = "0.5.9"
 description = ""
 packages = [
   {include = "rbx"}

{rbx_cp-0.5.6 → rbx_cp-0.5.9}/rbx/box/contest/main.py

@@ -3,6 +3,7 @@ import shutil
 import subprocess
 from typing import Annotated, Optional
 
+import rich.prompt
 import typer
 
 from rbx import annotations, console, utils
@@ -38,7 +39,7 @@ app.add_typer(
 
 @app.command('create, c', help='Create a new contest package.')
 def create(
-    name: str,
+    path: str,
     preset: Annotated[
         str,
         typer.Option(
@@ -54,7 +55,7 @@ def create(
         help='Whether to inline the installed preset within the contest folder.',
     ),
 ):
-    console.console.print(f'Creating new contest [item]{name}[/item]...')
+    console.console.print(f'Creating new contest at [item]{path}[/item]...')
 
     fetch_info = get_preset_fetch_info(preset)
     if fetch_info is None:
@@ -85,17 +86,24 @@ def create(
         )
         raise typer.Exit(1)
 
-    dest_path = pathlib.Path(name)
+    dest_path = pathlib.Path(path)
 
     if dest_path.exists():
-        console.console.print(
-            f'[error]Directory [item]{dest_path}[/item] already exists.[/error]'
-        )
-        raise typer.Exit(1)
-
-    shutil.copytree(str(contest_path), str(dest_path))
+        if not rich.prompt.Confirm.ask(
+            f'Directory [item]{dest_path}[/item] already exists. Create contest in it? This might be destructive.',
+            show_default=False,
+            console=console.console,
+        ):
+            console.console.print(
+                f'[error]Directory [item]{dest_path}[/item] already exists.[/error]'
+            )
+            raise typer.Exit(1)
+
+    dest_path.mkdir(parents=True, exist_ok=True)
+    shutil.copytree(str(contest_path), str(dest_path), dirs_exist_ok=True)
     shutil.rmtree(str(dest_path / 'build'), ignore_errors=True)
     shutil.rmtree(str(dest_path / '.box'), ignore_errors=True)
+    shutil.rmtree(str(dest_path / '.local.rbx'), ignore_errors=True)
     # TODO: consider clearing build and .box recursively for nested problem directories
     for lock in dest_path.rglob('.preset-lock.yml'):
         lock.unlink(missing_ok=True)
@@ -120,7 +128,8 @@ def edit():
 
 @app.command('add, a', help='Add new problem to contest.')
 @within_contest
-def add(name: str, short_name: str, preset: Optional[str] = None):
+def add(path: str, short_name: str, preset: Optional[str] = None):
+    name = pathlib.Path(path).stem
     utils.validate_field(ContestProblem, 'short_name', short_name)
     utils.validate_field(Package, 'name', name)
 
@@ -133,21 +142,21 @@ def add(name: str, short_name: str, preset: Optional[str] = None):
     preset_lock = presets.get_preset_lock()
     if preset is None and preset_lock is not None:
         preset = preset_lock.preset_name
-    creation.create(name, preset=preset, path=pathlib.Path(name))
+    creation.create(name, preset=preset, path=pathlib.Path(path))
 
     contest = find_contest_package_or_die()
     # Reassign mutable object before saving.
     contest.problems = sorted(
         [
             *contest.problems,
-            ContestProblem(short_name=short_name, path=pathlib.Path(name)),
+            ContestProblem(short_name=short_name, path=pathlib.Path(path)),
         ],
         key=lambda p: p.short_name,
     )
 
     save_contest(contest)
     console.console.print(
-        f'Problem [item]{name} ({short_name})[/item] added to contest.'
+        f'Problem [item]{name} ({short_name})[/item] added to contest at [item]{path}[/item].'
     )
 
 

{rbx_cp-0.5.6 → rbx_cp-0.5.9}/rbx/box/creation.py

@@ -61,6 +61,7 @@ def create(
         )
         raise typer.Exit(1)
 
+    dest_path.mkdir(parents=True, exist_ok=True)
     shutil.copytree(str(problem_path), str(dest_path))
 
     # Remove a few left overs.

{rbx_cp-0.5.6 → rbx_cp-0.5.9}/rbx/box/presets/__init__.py

@@ -334,6 +334,8 @@ def _install(root: pathlib.Path = pathlib.Path(), force: bool = False):
     shutil.copytree(str(root), str(installation_path))
     shutil.rmtree(str(installation_path / 'build'), ignore_errors=True)
     shutil.rmtree(str(installation_path / '.box'), ignore_errors=True)
+    shutil.rmtree(str(installation_path / '.local.rbx'), ignore_errors=True)
+    shutil.rmtree(str(installation_path / '.git'), ignore_errors=True)
 
 
 def install_from_remote(fetch_info: PresetFetchInfo, force: bool = False) -> str: