kattis-cli 1.2.3__tar.gz → 1.2.5__tar.gz

{kattis_cli-1.2.3 → kattis_cli-1.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kattis-cli
-Version: 1.2.3
+Version: 1.2.5
 Summary: A command-line tool for Kattis
 License-File: LICENSE
 Author: Ram Basnet

{kattis_cli-1.2.3 → kattis_cli-1.2.5}/pyproject.toml

@@ -2,7 +2,7 @@
 # PEP 621 metadata table for tools that expect [project].
 [project]
 name = "kattis-cli"
-version = "1.2.3"
+version = "1.2.5"
 description = "A command-line tool for Kattis"
 readme = "README.md"
 authors = [
@@ -47,3 +47,8 @@ trogon = "^0.6.0"
 
 [tool.poetry.scripts]
 kattis = 'kattis_cli.main:main'
+
+[tool.pytest.ini_options]
+pythonpath = ["src"]
+testpaths = ["tests"]
+python_files = ["test_*.py"]

{kattis_cli-1.2.3 → kattis_cli-1.2.5}/src/kattis_cli/client.py

@@ -188,7 +188,7 @@ Please download a new .kattisrc file''')
         Submission ID. This builds the full submissions URL from config
         and returns the specific submission URL.
         """
-
+        # Mainclass name containing non-valid characters.
         m = re.search(r'Submission ID: (\d+)', submit_response)
         if m:
             submissions_url = self.get_url(
@@ -395,6 +395,15 @@ Please download a new .kattisrc file''')
             sys.exit(1)
 
         files = sorted(list(set(files)))
+        for f in files:
+            if not os.path.isfile(f):
+                self.console.print(f'File not found:{f}', style='bold red')
+                sys.exit(1)
+            if os.path.basename(f)[0].isdigit():
+                self.console.print(
+                    f'File should not start with a digit: {f}',
+                    style='bold red')
+                sys.exit(1)
 
         submit_url = self.get_url(cfg, 'submissionurl', 'submit')
 
@@ -427,7 +436,7 @@ Please download a new .kattisrc file''')
             sys.exit(1)
 
         plain_result = result.content.decode('utf-8').replace('<br />', '\n')
-        self.console.print(f'[bold blue]{plain_result}[/]')
+        # self.console.print(f'[bold blue]{plain_result}[/]')
 
         submission_url = None
         try:

{kattis_cli-1.2.3 → kattis_cli-1.2.5}/src/kattis_cli/main.py

@@ -2,7 +2,7 @@
 
 Change the __version__ to match in pyproject.toml
 """
-__version__ = '1.2.3'
+__version__ = '1.2.5'
 
 from math import inf
 import os
@@ -42,20 +42,19 @@ def get(problemid: str) -> None:
         download.load_problem_metadata(problemid)
     except requests.exceptions.InvalidURL:
         console.print(
-            f"Problem ID: [bold red]{problemid}[/bold red] not found.")
+            f"❌ Problem ID: [bold red]{problemid}[/bold red] not found.")
     else:
+        console.print("✅ Metadata downloaded successfully.")
         console.print(
             f"Downloading samples: [bold blue]{problemid}[/bold blue]")
         try:
             download.download_sample_data(problemid)
         except requests.exceptions.InvalidURL:
             console.print(
-                f"Problem ID: [bold red]{problemid}[/bold red] metadata \
-                    not found.")
+                f"❌ Samples not found for Problem ID: [bold red]\
+{problemid}[/bold red].")
         else:
-            console.print(
-                f"Downloaded samples and metadata: \
-    [bold blue]{problemid}[/bold blue]")
+            console.print("✅ Samples downloaded successfully.")
 
 
 @main.command(help='Show problem metadata.')
@@ -81,8 +80,9 @@ def test(
         files: Tuple[str]) -> None:
     """Test solution with sample files.
     """
-    problemid, loc_language, mainclass, _files, root_folder, lang_config = \
-        languages.update_args(problemid, language, mainclass, list(files))
+    problemid, loc_language, mainclass, _files, root_folder, lang_config =\
+        languages.update_args(
+            problemid, language, mainclass, list(files))
     # print('After - ', f'{problemid=} {language=} {mainclass=} {_files=}')
     # lang_config = config.parse_config(language)
     if not mainclass:
@@ -118,8 +118,7 @@ def submit(problemid: str, language: str,
     """Submit a solution to Kattis.
     """
     problemid, language, mainclass, _files, _, lang_config = \
-        languages.update_args(
-            problemid, language, mainclass, list(files))
+        languages.update_args(problemid, language, mainclass, list(files))
     # Finally, submit the solution
     if not mainclass:
         mainclass = languages.guess_mainfile(