code-battles-cli 1.2.0__py3-none-any.whl → 1.2.2__py3-none-any.whl

code_battles_cli/api.py

@@ -28,6 +28,18 @@ SIMULATION_FINISHED_MARK = b"--- SIMULATION FINISHED ---"
 SIMULATION_STEP_MARK = b"__CODE_BATTLES_ADVANCE_STEP"
 
 
+def normalize(url: str):
+    if url.startswith("https"):
+        url = url[5:]
+
+    try:
+        url = url[: url.index(".web.app")]
+    except ValueError:
+        pass
+
+    return url
+
+
 class SimulationException(Exception):
     def __init__(self, stderr: bytes, exit_code: int):
         self.stderr = stderr
@@ -213,11 +225,7 @@ class Client:
 
     def _possibly_download(self, force_download=False):
         directory_name = "".join(
-            [
-                c
-                for c in self.url.removeprefix("https").removesuffix(".web.app")
-                if c.isalnum() or c == "-"
-            ]
+            [c for c in normalize(self.url) if c.isalnum() or c == "-"]
         )
         code_directory = os.path.expanduser(f"~/.cache/code-battles/{directory_name}")
 
@@ -242,6 +250,9 @@ class Client:
         on_step: Optional[Callable[[], None]] = None,
     ) -> Union[SimulationResults, str]:
         while True:
+            if p.poll() is not None and p.returncode != 0:
+                raise SimulationException(p.stderr.read(), p.returncode)
+
             line: bytes = p.stdout.readline()
             line = line.strip()
             if line == SIMULATION_FINISHED_MARK:
@@ -310,7 +321,11 @@ class Client:
                 os.path.join(code_directory, "packed.py"),
                 "simulate",
                 str(seed),
-                str(os.path.abspath(output_file)),
+                str(
+                    os.path.abspath(output_file)
+                    if output_file is not None
+                    else output_file
+                ),
                 json.dumps(parameters),
                 "-".join(bot_names),
             ]

code_battles_cli/commands/upload.py

@@ -45,4 +45,5 @@ def upload(
 
     client = Client(url, username, password, dump_credentials)
     client.set_bots({bot_name: bot_code})
-    log.info(f"{bot_code.count('\n') + 1} lines of code were uploaded as '{bot_name}'.")
+    line_count = bot_code.count("\n") + 1
+    log.info(f"{line_count} lines of code were uploaded as '{bot_name}'.")

{code_battles_cli-1.2.0.dist-info → code_battles_cli-1.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: code-battles-cli
-Version: 1.2.0
+Version: 1.2.2
 Summary: A CLI for competitors in any Code Battles event!
 Requires-Python: >=3.8
 Requires-Dist: click>=8.1.7

{code_battles_cli-1.2.0.dist-info → code_battles_cli-1.2.2.dist-info}/RECORD

@@ -1,14 +1,14 @@
 code_battles_cli/__init__.py,sha256=BST1iXWs0ner82h-LTYTgVNjLtOpVZnvBMiCEiBkOXE,38
 code_battles_cli/__main__.py,sha256=HguVXadDv5QVywZWoB-BETvX1WV4VPYxclfnKhvOrZc,67
-code_battles_cli/api.py,sha256=_2Ldfd6IM-q5IbMYeiffb09KsZfWjSspizDjlv3VTHA,11713
+code_battles_cli/api.py,sha256=iv7peRbTsjL29lU5XjrjfFo9cZ3QUubA5Q4kziz2SAo,12056
 code_battles_cli/cli.py,sha256=yfUAlU85FBykU_pHB6HHQCc7_ZN0KiPbc8ssB4TOgIc,515
 code_battles_cli/log.py,sha256=Ume7UPFdKNqu-DI2hpc6cefyMZQeFavc_cWizKooq98,860
 code_battles_cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 code_battles_cli/commands/download.py,sha256=ZLwbHdcqak6uuXEMb1Mp4fXW7QxkdbIlpKxSUR-WQDA,1600
 code_battles_cli/commands/run.py,sha256=J3IFVVoUAJWLa7ZtDvDhrFYt7Yx3aQYbVo9Z2SomeWQ,3872
-code_battles_cli/commands/upload.py,sha256=Un3QxCK4v3xhiBPXYc-6JYw3KdZn9K2j476gShIKEOo,1361
-code_battles_cli-1.2.0.dist-info/METADATA,sha256=6VF_JS4-I4FmIbXtkR9NOFyIUfPZcxMj63gWlWrta3g,2523
-code_battles_cli-1.2.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-code_battles_cli-1.2.0.dist-info/entry_points.txt,sha256=U_iQUEDK-9L09jXd_sJg0IgKLWeN3rccCyNVUeJuQxw,55
-code_battles_cli-1.2.0.dist-info/licenses/LICENSE.md,sha256=eYDByTiNbk3_TPH_i-FU-bHnfNb6VidN57zMO2dfaUM,1087
-code_battles_cli-1.2.0.dist-info/RECORD,,
+code_battles_cli/commands/upload.py,sha256=8Y6kKS4ynnmsmfM0IqtljF6gT7PUcrcJz9ilzrKUuTk,1389
+code_battles_cli-1.2.2.dist-info/METADATA,sha256=S5v0En-U7awBMja-F0AbF8p7HfWsBjRZNb4NDWRL8vE,2523
+code_battles_cli-1.2.2.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+code_battles_cli-1.2.2.dist-info/entry_points.txt,sha256=U_iQUEDK-9L09jXd_sJg0IgKLWeN3rccCyNVUeJuQxw,55
+code_battles_cli-1.2.2.dist-info/licenses/LICENSE.md,sha256=eYDByTiNbk3_TPH_i-FU-bHnfNb6VidN57zMO2dfaUM,1087
+code_battles_cli-1.2.2.dist-info/RECORD,,