kattis-cli 0.1.15__py3-none-any.whl → 0.1.16__py3-none-any.whl

kattis_cli/download.py

@@ -34,6 +34,19 @@ def create_problem_folder(problemid: str) -> Path:
     return root_problem_folder
 
 
+def download_html(problemid: str) -> str:
+    """Get html content from Kattis problem page.
+
+    Args:
+        problemid (str): problemid
+    """
+    response = requests.get(settings.KATTIS_PROBLEM_URL + problemid, timeout=5)
+    if response.status_code == 200:
+        return response.text.strip()
+    else:
+        raise requests.exceptions.InvalidURL(f"Error: {response.status_code}")
+
+
 def load_problem_metadata(problemid: str = '') -> Dict[Any, Any]:
     """Load problem metadata from problem folder.
 
@@ -73,43 +86,31 @@ def load_problem_metadata(problemid: str = '') -> Dict[Any, Any]:
                 metadata['accepted'] = 0
                 config.update_problem_metadata(problemid, metadata)
     else:
-        metadata = _download_metadata(root_problem_folder, problemid)
+        html = download_html(problemid)
+        metadata = _parse_metadata(problemid, html)
+        save_metadata(problemid, metadata)
     return metadata
 
 
-def make_soup(problemid: str) -> BeautifulSoup:
-    """Scrape kattis page given problemid and return a BeautifulSoup object.
-
-    Args:
-        problemid (str): problemid
-
-    Returns:
-        BeautifulSoup: BeautifulSoup object of the problem page.
-    """
-    response = requests.get(settings.KATTIS_PROBLEM_URL + problemid, timeout=5)
-    if response.status_code == 200:
-        return BeautifulSoup(response.text.strip(), "html.parser")
-    else:
-        raise requests.exceptions.InvalidURL(f"Error: {response.status_code}")
-
-
-def _download_metadata(root_problem_folder: Path,
-                       problemid: str) -> Dict[str, Any]:
-    """Download problem metadata from Kattis and save them to problem folder.
-    This function should only be called if the metadata file does not exist.
+def _parse_metadata(problemid: str,
+                    html: str,
+                    ) -> Dict[str, Any]:
+    """Parse metadata from Kattis problm page.
+    This function should only be called if
+    the metadata file does not exist.
 
     Args:
+        root_problem_folder (Path): problem folder
         problemid (str): Kattis problemid
 
     Returns:
         Dict: problem metadata
     """
 
-    soup = make_soup(problemid)
-
+    soup = BeautifulSoup(html, "html.parser")
     meta_data = {'problemid': problemid, 'title': '',
                  'cpu_limit': 'None', 'mem_limit': 'None',
-                 'difficulty': 'None', 'source': 'None',
+                 'difficulty': 'None',
                  'submissions': 0, 'accepted': 0}
 
     # get the title of the problem
@@ -118,26 +119,41 @@ def _download_metadata(root_problem_folder: Path,
         meta_data["title"] = title.text
 
     # get the cpu time limit, memory limit, difficulty, and source
-    data = soup.find_all("div", {"class": "metadata_list-item"})
-    name_mapping = {'cpu_limit': 'cpu_limit',
-                    'mem_limit': 'mem_limit',
-                    'difficulty': 'difficulty',
-                    'source': 'source',
+    data = soup.find("div", {"class": "metadata-grid"})
+    name_mapping = {'metadata-cpu-card': 'cpu_limit',
+                    'metadata-memmory-card': 'mem_limit',
+                    'metadata-difficulty-card': 'difficulty',
                     }
-    for item in data:
+
+    for key, key1 in name_mapping.items():
         try:
-            data_name = item.attrs['data-name'].split('-')[1]
-            if data_name in name_mapping:
-                children = item.findChildren('span')
-                meta_data[name_mapping[data_name]] = children[-1].text.strip()
-        except BaseException:
+            value = ''
+            div = data.findChild('div', {'class': key})  # type: ignore
+            if key == 'metadata-difficulty-card':
+                span = div.findChild(  # type: ignore
+                    'span', {
+                        'class': 'difficulty_number'})
+                value += span.text.strip() + ' '  # type: ignore
+            span = div.findChild('span',  # type: ignore
+                                 {'class': 'text-blue-200'})
+            value += span.text.strip()  # type: ignore
+            meta_data[key1] = value
+        except AttributeError:
             pass
+    return meta_data
+
 
-    # save metadata to file
+def save_metadata(problemid: str, metadata: Dict[str, Any]) -> None:
+    """Save metadata to problem folder.
+
+    Args:
+        problemid (str): problemid
+        metadata (Dict[str, Any]): metadata
+    """
+    root_problem_folder = create_problem_folder(problemid)
     metadata_file = root_problem_folder.joinpath(f"{problemid}.yaml")
     with open(metadata_file, "w", encoding='utf-8') as f:
-        yaml.dump(meta_data, f, default_flow_style=False, allow_unicode=True)
-    return meta_data
+        yaml.dump(metadata, f, default_flow_style=False, allow_unicode=True)
 
 
 def download_sample_data(problemid: str) -> None:

kattis_cli/ui.py

@@ -53,26 +53,18 @@ def show_problem_metadata(problemid: str = '') -> Dict[Any, Any]:
             justify="center",
             style="cyan",
             no_wrap=False)
-        table.add_column(
-            "Source",
-            justify="center",
-            style="cyan",
-            no_wrap=False)
-        # [link=https://www.willmcgugan.com]blog[/link]
+
         p_id = metadata['problemid']
         problem_link = f"[link={settings.KATTIS_PROBLEM_URL}{p_id}]"
         problem_link += f"{p_id}[/link]"
-        source = metadata['source']
-        sources_link = f"[link={settings.KATTIS_SOURCE_URL}{source}]"
-        sources_link += f"{source}[/link]"
         # console.print(sources_link)
         table.add_row(problem_link,
                       metadata['difficulty'],
                       metadata['cpu_limit'],
                       metadata['mem_limit'],
                       str(metadata['submissions']),
-                      str(metadata['accepted']),
-                      sources_link)
+                      str(metadata['accepted'])
+                      )
 
         console.print(table)
     elif problemid:

{kattis_cli-0.1.15.dist-info → kattis_cli-0.1.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kattis-cli
-Version: 0.1.15
+Version: 0.1.16
 Summary: A command-line tool for Kattis
 Home-page: https://github.com/rambasnet/kattis-cli
 Author: Ram Basnet
@@ -38,6 +38,7 @@ Based on Official Kattis CLI: [https://github.com/Kattis/kattis-cli](https://git
 
 - Use Command Line or PowerShell
 - Make sure python is in your PATH
+    - Install Python from Windows Store
 - if you get codec error while running kattis-cli, run the following command in Command Prompt:
 
 ```bash
@@ -71,6 +72,9 @@ pip install kattis-cli
 python -m pip install kattis-cli
 ```
 
+- on Windows add the path shown in the output of the above command to your PATH environment variable
+
+
 ## Update Kattis-CLI
 
 - remove or rename **.kattis-cli.toml** file in your home directory

{kattis_cli-0.1.15.dist-info → kattis_cli-0.1.16.dist-info}/RECORD

@@ -1,18 +1,18 @@
 kattis_cli/.kattis-cli.toml,sha256=kGh0gmpFAnivyUC9hR8Y1ZqYJeTBWNyBQ9zOg4AInZ0,898
 kattis_cli/__init__.py,sha256=afN92pog2fGyicY6KNBofYbCBYbYj4Fpi_INUSpsc-E,402
-kattis_cli/download.py,sha256=PNOSJmvXaAAwXGtMGb6d2DPq4YCfkWn5BMYa9qzbGtc,5367
+kattis_cli/download.py,sha256=aa0hBg_6Ou8SGrufgkNUjfWEHdmiu7U-W4d-yWHZNOA,5877
 kattis_cli/kattis.py,sha256=H8Nn1oofjJYAFQ9snpnU4ibKyJUSrsuDGePBx0Gzuvk,13745
 kattis_cli/kattis_setup.py,sha256=87Ha0MTFbQKwz4SlPCE50FR1tvwtvDtKfboCJEmCDeM,3449
 kattis_cli/main.py,sha256=PpizTV_9JDr-vgplpuwlgjJrxT62dMVLEC0zPm2R9Zo,3952
 kattis_cli/settings.py,sha256=d5q4dYj9VqDSqPalleh2oZWtND-1bPB0T2IwdajFrBg,591
 kattis_cli/test_solution.py,sha256=zzSIM4uKOq5M3igGbr3ELyvrWBr9Uh8lS-t8F4wWLo4,5665
-kattis_cli/ui.py,sha256=Q8VjAbQUmrGgtD9aj9wQafv2W1W9oRXThDB5aSiHMuk,3030
+kattis_cli/ui.py,sha256=dI06yncjm8sdLQkupPxGRODvQ6Gbawwuqn-67FrWg6I,2682
 kattis_cli/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kattis_cli/utils/config.py,sha256=cr5ssEVWolDbqP8krts0YSK5vSLatKTveeHBRNsLRC8,2277
 kattis_cli/utils/run_program.py,sha256=NWQ6vtTeWgkaW75r91FIHGXR5cAbeu8yMb5hwzpYFsg,2613
 kattis_cli/utils/utility.py,sha256=uVgfameMWW4Tp78p8ihaUxnAfjnyA024-Nqkgsp_FSY,11458
-kattis_cli-0.1.15.dist-info/LICENSE,sha256=JmBa4SEKBCDWEgiOZcISU4tUCpli6xSpVlSYgkBXSNQ,1067
-kattis_cli-0.1.15.dist-info/METADATA,sha256=umkW3NeUmPKiJqNtHbKZrVr5bhjMVd6IxvnB3H7lLxk,5161
-kattis_cli-0.1.15.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-kattis_cli-0.1.15.dist-info/entry_points.txt,sha256=kyzGN20VqUPR_H0J_jJUKT-10-cAMFLVegQ6C7tbHss,47
-kattis_cli-0.1.15.dist-info/RECORD,,
+kattis_cli-0.1.16.dist-info/LICENSE,sha256=JmBa4SEKBCDWEgiOZcISU4tUCpli6xSpVlSYgkBXSNQ,1067
+kattis_cli-0.1.16.dist-info/METADATA,sha256=gorC4bRZVfDdUBWYCDHAgRjIUaJGmdqfFbfjEBPZy4Q,5304
+kattis_cli-0.1.16.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+kattis_cli-0.1.16.dist-info/entry_points.txt,sha256=kyzGN20VqUPR_H0J_jJUKT-10-cAMFLVegQ6C7tbHss,47
+kattis_cli-0.1.16.dist-info/RECORD,,