cs2tracker 2.1.13__py3-none-any.whl → 2.1.14__py3-none-any.whl

cs2tracker/util/validated_config.py

@@ -1,9 +1,9 @@
 import json
 import re
-from configparser import ConfigParser
-from urllib.parse import quote
+from configparser import ConfigParser, ParsingError
+from urllib.parse import quote, unquote
 
-from cs2tracker.constants import CAPSULE_INFO, CONFIG_FILE, INVENTORY_IMPORT_FILE
+from cs2tracker.constants import CAPSULE_PAGES, CONFIG_FILE, INVENTORY_IMPORT_FILE
 from cs2tracker.util.padded_console import get_console
 
 STEAM_MARKET_LISTING_BASEURL_CS2 = "https://steamcommunity.com/market/listings/730/"
@@ -20,13 +20,26 @@ class ValidatedConfig(ConfigParser):
 
         self.valid = False
         self.last_error = None
-        self.load()
+        try:
+            self.load_from_file()
+        except (FileNotFoundError, ParsingError) as error:
+            console.error(f"Config error: {error}")
+            self.last_error = error
 
-    def load(self):
-        """Load the configuration file and validate it."""
+    def delete_display_sections(self):
+        """
+        Delete all sections that are displayed to the user from the config.
+
+        (This excludes the internal App Settings section)
+        """
+        use_proxy = self.getboolean("App Settings", "use_proxy", fallback=False)
+        discord_notifications = self.getboolean(
+            "App Settings", "discord_notifications", fallback=False
+        )
         self.clear()
-        self.read(CONFIG_FILE)
-        self._validate_config()
+        self.add_section("App Settings")
+        self.set("App Settings", "use_proxy", str(use_proxy))
+        self.set("App Settings", "discord_notifications", str(discord_notifications))
 
     def _validate_config_sections(self):
         """Validate that the configuration file has all required sections."""
@@ -38,7 +51,7 @@ class ValidatedConfig(ConfigParser):
             raise ValueError("Missing 'Custom Items' section in the configuration file.")
         if not self.has_section("Cases"):
             raise ValueError("Missing 'Cases' section in the configuration file.")
-        for capsule_section in CAPSULE_INFO:
+        for capsule_section in CAPSULE_PAGES:
             if not self.has_section(capsule_section):
                 raise ValueError(f"Missing '{capsule_section}' section in the configuration file.")
 
@@ -55,16 +68,21 @@ class ValidatedConfig(ConfigParser):
                     raise ValueError(
                         f"Invalid value in 'Custom Items' section: {custom_item_href} = {custom_item_owned}"
                     )
-            for case_name, case_owned in self.items("Cases"):
+            for case_href, case_owned in self.items("Cases"):
+                if not re.match(STEAM_MARKET_LISTING_REGEX, case_href):
+                    raise ValueError(
+                        f"Invalid Steam market listing URL in 'Cases' section: {case_href}"
+                    )
+
                 if int(case_owned) < 0:
                     raise ValueError(
-                        f"Invalid value in 'Cases' section: {case_name} = {case_owned}"
+                        f"Invalid value in 'Cases' section: {case_href} = {case_owned}"
                     )
-            for capsule_section in CAPSULE_INFO:
-                for capsule_name, capsule_owned in self.items(capsule_section):
+            for capsule_section in CAPSULE_PAGES:
+                for capsule_href, capsule_owned in self.items(capsule_section):
                     if int(capsule_owned) < 0:
                         raise ValueError(
-                            f"Invalid value in '{capsule_section}' section: {capsule_name} = {capsule_owned}"
+                            f"Invalid value in '{capsule_section}' section: {capsule_href} = {capsule_owned}"
                         )
         except ValueError as error:
             if "Invalid " in str(error):
@@ -88,6 +106,12 @@ class ValidatedConfig(ConfigParser):
             self.valid = False
             self.last_error = error
 
+    def load_from_file(self):
+        """Load the configuration file and validate it."""
+        self.clear()
+        self.read(CONFIG_FILE)
+        self._validate_config()
+
     def write_to_file(self):
         """Validate the current configuration and write it to the configuration file if
         it is valid.
@@ -107,13 +131,13 @@ class ValidatedConfig(ConfigParser):
         try:
             with open(INVENTORY_IMPORT_FILE, "r", encoding="utf-8") as inventory_file:
                 inventory_data = json.load(inventory_file)
-
                 added_to_config = set()
+
                 for item_name, item_owned in inventory_data.items():
-                    config_item_name = item_name.replace(" ", "_").lower()
+                    option_name_href = self.name_to_option(item_name, href=True)
                     for section in self.sections():
-                        if config_item_name in self.options(section):
-                            self.set(section, config_item_name, str(item_owned))
+                        if option_name_href in self.options(section):
+                            self.set(section, option_name_href, str(item_owned))
                             added_to_config.add(item_name)
 
                 for item_name, item_owned in inventory_data.items():
@@ -128,6 +152,36 @@ class ValidatedConfig(ConfigParser):
             self.last_error = error
             self.valid = False
 
+    def option_to_name(self, option, href=False):
+        """
+        Convert an internal option representation to a reader-friendly name.
+
+        :param option: The internal option representation to convert.
+        :param custom: If True, the option is for a custom item.
+        :return: The reader-friendly name.
+        """
+        if href:
+            converted_option = unquote(option.split("/")[-1])
+        else:
+            converted_option = option.replace("_", " ").title()
+
+        return converted_option
+
+    def name_to_option(self, name, href=False):
+        """
+        Convert a reader-friendly name to an internal option representation.
+
+        :param name: The reader-friendly name to convert.
+        :param custom: If True, the name is for a custom item.
+        :return: The internal option representation.
+        """
+        if href:
+            converted_name = STEAM_MARKET_LISTING_BASEURL_CS2 + quote(name)
+        else:
+            converted_name = name.replace(" ", "_").lower()
+
+        return converted_name
+
     def toggle_use_proxy(self, enabled: bool):
         """
         Toggle the use of proxies for requests. This will update the configuration file.

{cs2tracker-2.1.13.dist-info → cs2tracker-2.1.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cs2tracker
-Version: 2.1.13
+Version: 2.1.14
 Summary: Tracking the steam market prices of CS2 items
 Home-page: https://github.com/ashiven/cs2tracker
 Author: Jannik Novak
@@ -23,6 +23,7 @@ Requires-Dist: sv_ttk==2.6.1
 Requires-Dist: tksheet==7.5.12
 Requires-Dist: nodejs-bin==18.4.0a4
 Requires-Dist: ttk-text==0.2.0
+Requires-Dist: requests-cache==1.2.1
 Dynamic: license-file
 
 <p align="center">
@@ -106,7 +107,7 @@ Dynamic: license-file
 ## Configuration
 
 You can configure the app settings via the **Edit Config** option.
-This will open the config editor where you can change any setting by simply double clicking on it. On top of that, the config editor allows you to:
+This will open the config editor where you can change any setting by double clicking on it or navigating to it with the arrow keys and hitting enter. On top of that, the config editor allows you to:
 
 - Automatically import items from your Storage Units
 - Manually Specify the number of items you own

cs2tracker-2.1.14.dist-info/RECORD

@@ -0,0 +1,28 @@
+cs2tracker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cs2tracker/__main__.py,sha256=Ub--oSMv48YzfWF1CZqYlkn1-HvZ7Bhxoc7urn1oY6o,249
+cs2tracker/_version.py,sha256=80wtCyj9QUrrEVvuEW7o-ILwCKz10sXaQFnSq4DOKBE,513
+cs2tracker/constants.py,sha256=9E1CPVEohDmV_F2PLLrPRmtYAHHVDimbUFfohhjci1c,6742
+cs2tracker/main.py,sha256=_Y8be0bVDaoO4SE-TZjJ0wpXjvXDYF3VPKC4f32nZc0,1019
+cs2tracker/app/__init__.py,sha256=uqAxdDzoR2-2IrDc1riIU3Pi9vLEDwr68eg93-0RFmM,105
+cs2tracker/app/application.py,sha256=wjUFt5RzRZ8gRqprtPaCTtHW_cEWS3DzmcdRz48vmFg,9135
+cs2tracker/app/editor_frame.py,sha256=zbNaZOBhFCWjJrl-kCgdbBPafeRgEcYG31tDgMaZ3_s,21313
+cs2tracker/app/scraper_frame.py,sha256=9m5tQFhPGCqWWtkgSG_XuH9ELj-km83lU93tSBqndNA,4007
+cs2tracker/data/config.ini,sha256=oLm6Ggfqjr8coDZE4NAMVomZZDJqMia0VxNO3wCzHsQ,15059
+cs2tracker/data/convert_inventory.js,sha256=5bEDfe9Rf2wYC4dIlmvjhbslfnuKuBBNjuTk67jEV9Q,5370
+cs2tracker/data/get_inventory.js,sha256=YL0RJV1j2K0J20mRZVXSakwU8fpRtjyMLrAYFl0-rsM,5793
+cs2tracker/data/output.csv,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cs2tracker/scraper/__init__.py,sha256=kfUB9yfshSche92ZvTqQQYBkVqujRez46djPoa9u0YU,335
+cs2tracker/scraper/background_task.py,sha256=1_lKnFWn9wuABpru58JdQbfDHjL0Up-7h6Nlcc4TsZ4,3671
+cs2tracker/scraper/discord_notifier.py,sha256=-PdTRAtzMHTjDH17zguI0LKB7INITEohx0da0fWRdKI,2962
+cs2tracker/scraper/parsers.py,sha256=BcCRU39RXtkpXOZouh2LLTDlCOJAFAJmyaQVVwK1i4A,6897
+cs2tracker/scraper/scraper.py,sha256=sotDjZMrMxkM_bCOhPm9S-Pq82-pJp-8RPNcxtY9cPs,10462
+cs2tracker/util/__init__.py,sha256=Pgltyrkotd5ijU-srmY5vaFP7gzz9itSAl2LfS-D7-E,322
+cs2tracker/util/padded_console.py,sha256=u8SNbjvR_YyePhpiqREt4Kh4NiDI5NAPCPL5toqh8dg,1622
+cs2tracker/util/price_logs.py,sha256=JuZ2ptDtxA-NzKjpG_4q0eeOr1IaUvVah-Qth6GrDDU,4165
+cs2tracker/util/validated_config.py,sha256=ZsUTaahs08HBEoCM2XUzAHqjKeaeU3XzBNhGxr1kEfg,8740
+cs2tracker-2.1.14.dist-info/licenses/LICENSE,sha256=doPNswWMPXbkhplb9cnZLwJoqqS72pJPhkSib8kIF08,19122
+cs2tracker-2.1.14.dist-info/METADATA,sha256=hehgmIANx4SmR2lJOlurlsV54ERx9TVg3fi80No46kM,5782
+cs2tracker-2.1.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cs2tracker-2.1.14.dist-info/entry_points.txt,sha256=K8IwDIkg8QztSB9g9c89B9jR_2pG4QyJGrNs4z5RcZw,63
+cs2tracker-2.1.14.dist-info/top_level.txt,sha256=2HB4xDDOxaU5BDc_yvdi9UlYLgL768n8aR-hRhFM6VQ,11
+cs2tracker-2.1.14.dist-info/RECORD,,

cs2tracker-2.1.13.dist-info/RECORD

@@ -1,27 +0,0 @@
-cs2tracker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs2tracker/__main__.py,sha256=Ub--oSMv48YzfWF1CZqYlkn1-HvZ7Bhxoc7urn1oY6o,249
-cs2tracker/_version.py,sha256=MzsJ263HZYR6SmK-vVyZsM4dSlCzgRW6jJZBsjDPWV8,513
-cs2tracker/constants.py,sha256=65tLl30rCbR78xoNJSV0ubWc0ZWbytztj0S_uwgNrvU,22879
-cs2tracker/main.py,sha256=Ahsu1gk0RuMS9FdVsv7exnnWENd8-vj_dcCEWjZP1DM,1552
-cs2tracker/app/__init__.py,sha256=uqAxdDzoR2-2IrDc1riIU3Pi9vLEDwr68eg93-0RFmM,105
-cs2tracker/app/application.py,sha256=TEoGvqxyCTJKdfC1Su7bh9fzTr71jiVqlTC_K4Wdu2Q,9395
-cs2tracker/app/editor_frame.py,sha256=V_8SRWgterkEYiADrZww9prpKfX-3ccjd2OWVrx7-2g,18074
-cs2tracker/app/scraper_frame.py,sha256=yrtnWtaNQqd8Ho6hVUxLP3A5oCBmtvEHJa3p8STEJtA,3399
-cs2tracker/data/config.ini,sha256=anKg7t3JB7kQcvcMKHls4oxTEGwWnGkM9obn-_l0gEE,6806
-cs2tracker/data/convert_inventory.js,sha256=5bEDfe9Rf2wYC4dIlmvjhbslfnuKuBBNjuTk67jEV9Q,5370
-cs2tracker/data/get_inventory.js,sha256=O9w7w-diI7tD5NMgGMDyvrNfrv5ObE46m5rMK8PlpBE,4108
-cs2tracker/data/output.csv,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs2tracker/scraper/__init__.py,sha256=kfUB9yfshSche92ZvTqQQYBkVqujRez46djPoa9u0YU,335
-cs2tracker/scraper/background_task.py,sha256=1_lKnFWn9wuABpru58JdQbfDHjL0Up-7h6Nlcc4TsZ4,3671
-cs2tracker/scraper/discord_notifier.py,sha256=-PdTRAtzMHTjDH17zguI0LKB7INITEohx0da0fWRdKI,2962
-cs2tracker/scraper/scraper.py,sha256=Zj-8EZZNAjifiOywfvJrOQ8KtJK-SeaZerwx8plvLI8,15358
-cs2tracker/util/__init__.py,sha256=Pgltyrkotd5ijU-srmY5vaFP7gzz9itSAl2LfS-D7-E,322
-cs2tracker/util/padded_console.py,sha256=LXgPDqccgrIowwjV6CLsxn5zxuoiPA-9pomURPSLllU,936
-cs2tracker/util/price_logs.py,sha256=JuZ2ptDtxA-NzKjpG_4q0eeOr1IaUvVah-Qth6GrDDU,4165
-cs2tracker/util/validated_config.py,sha256=bQDIuu42hK0ZbFY1fYGTeYTip7tUNmxJLou88F3r4q8,6638
-cs2tracker-2.1.13.dist-info/licenses/LICENSE,sha256=doPNswWMPXbkhplb9cnZLwJoqqS72pJPhkSib8kIF08,19122
-cs2tracker-2.1.13.dist-info/METADATA,sha256=Os14jGDiniACP9PCaaaGL9SK2otVtIBkYt3mD-MtSIk,5694
-cs2tracker-2.1.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cs2tracker-2.1.13.dist-info/entry_points.txt,sha256=K8IwDIkg8QztSB9g9c89B9jR_2pG4QyJGrNs4z5RcZw,63
-cs2tracker-2.1.13.dist-info/top_level.txt,sha256=2HB4xDDOxaU5BDc_yvdi9UlYLgL768n8aR-hRhFM6VQ,11
-cs2tracker-2.1.13.dist-info/RECORD,,