Merge pull request #81 from ashiven/classification

Classification

Author: ashiven

.gitignore

@@ -14,8 +14,10 @@ cs2tracker.egg-info
 # Auto generated version file on build
 _version.py
 
-# PyInstaller output
+# PyInstaller files
 output
+cs2tracker.spec
+build.ps1
 
 # Files generated by the program
 cs2tracker_scraper.bat

cs2tracker/app/editor_frame.py

@@ -8,7 +8,7 @@
 from nodejs import node
 from ttk_text import ThemedText
 
-from cs2tracker.config import get_config
+from cs2tracker.config import CUSTOM_SECTIONS, get_config
 from cs2tracker.constants import (
     CONFIG_FILE,
     CONFIG_FILE_BACKUP,
@@ -131,7 +131,7 @@ def _delete_selection_value(self, _):
         if selected:
             item = selected[0]
             section_name = self.tree.parent(item)
-            if section_name in ("Stickers", "Skins"):
+            if section_name in CUSTOM_SECTIONS:
                 next_option = self.tree.next(item)
                 self.tree.delete(item)
                 self.save_config()
@@ -169,31 +169,19 @@ def _load_config_into_tree(self):
                 continue
 
             section_level = self.tree.insert("", "end", iid=section, text=section)
-
-            # Items in the Stickers, Cases, and Skins sections should be displayed alphabetically sorted
-            section_items = config.items(section)
-            if section in ("Stickers", "Cases", "Skins"):
-                section_items = sorted(section_items)
-
-            for config_option, value in section_items:
+            sorted_section_items = sorted(config.items(section))
+            for config_option, value in sorted_section_items:
                 if section not in ("User Settings", "App Settings"):
                     option_name = config.option_to_name(config_option, href=True)
-                    self.tree.insert(
-                        section_level,
-                        "end",
-                        iid=f"{section}-{option_name}",
-                        text=option_name,
-                        values=[value],
-                    )
                 else:
                     option_name = config.option_to_name(config_option)
-                    self.tree.insert(
-                        section_level,
-                        "end",
-                        iid=f"{section}-{option_name}",
-                        text=option_name,
-                        values=[value],
-                    )
+                self.tree.insert(
+                    section_level,
+                    "end",
+                    iid=f"{section}-{option_name}",
+                    text=option_name,
+                    values=[value],
+                )
 
         self.tree.focus("User Settings")
         self.tree.selection_set("User Settings")
@@ -267,6 +255,25 @@ def _add_widgets(self):
         custom_item_button = ttk.Button(self, text="Add Item", command=self._add_custom_item)
         custom_item_button.pack(side="left", expand=True, padx=5)
 
+        def open_custom_enter(_):
+            selected = self.editor_frame.tree.selection()
+            if selected and not self.editor_frame.tree.parent(selected[0]):
+                selected_section = self.editor_frame.tree.item(selected[0], "text")
+                if selected_section in CUSTOM_SECTIONS and not self.editor_frame.tree.get_children(
+                    selected_section
+                ):
+                    custom_item_button.invoke()
+
+        def open_custom_click(event):
+            selected_section = self.editor_frame.tree.identify_row(event.y)
+            if selected_section in CUSTOM_SECTIONS and not self.editor_frame.tree.get_children(
+                selected_section
+            ):
+                custom_item_button.invoke()
+
+        self.editor_frame.tree.bind("<Return>", open_custom_enter, add="+")
+        self.editor_frame.tree.bind("<Double-1>", open_custom_click, add="+")
+
         import_inventory_button = ttk.Button(
             self, text="Import Steam Inventory", command=self._import_steam_inventory
         )
@@ -397,14 +404,38 @@ def _get_insert_index(self, item_name, section):
                 break
         return insert_index
 
+    def _identify_custom_section(self, item_name):
+        # pylint: disable=too-many-return-statements
+        """Given an item name, identify the custom section it belongs to."""
+        if "Patch Pack" in item_name or "Patch Collection" in item_name:
+            return "Patch Packs"
+        elif "Patch |" in item_name:
+            return "Patches"
+        elif "Sticker |" in item_name:
+            return "Stickers"
+        elif "Charm |" in item_name:
+            return "Charms"
+        elif "Souvenir" in item_name and "|" not in item_name:
+            return "Souvenirs"
+        elif "★ " in item_name:
+            return "Special Items"
+        elif " | " in item_name and "(" in item_name and ")" in item_name:
+            return "Skins"
+        elif "Music Kit |" in item_name:
+            return "Others"
+        elif " | " in item_name:
+            return "Agents"
+        else:
+            return "Others"
+
     def _add_custom_item(self, item_href, item_owned):
         """Add a custom item to the configuration."""
         if not item_href or not item_owned:
             messagebox.showerror(
                 "Input Error", "All fields must be filled out.", parent=self.window
             )
             return
-        if config.option_exists(item_href, exclude_sections=("Stickers", "Skins")):
+        if config.option_exists(item_href, exclude_sections=CUSTOM_SECTIONS):
             messagebox.showerror(
                 "Item Exists", "This item already exists in another section.", parent=self.window
             )
@@ -416,12 +447,11 @@ def _add_custom_item(self, item_href, item_owned):
             messagebox.showerror("Invalid URL", str(error), parent=self.window)
             return
 
-        if self._update_existing("Stickers", item_name, item_owned):
-            return
-        if self._update_existing("Skins", item_name, item_owned):
-            return
+        for section in CUSTOM_SECTIONS:
+            if self._update_existing(section, item_name, item_owned):
+                return
 
-        section = "Stickers" if item_name.startswith("Sticker") else "Skins"
+        section = self._identify_custom_section(item_name)
         insert_index = self._get_insert_index(item_name, section)
         self.editor_frame.tree.insert(
             section,

cs2tracker/config.py

@@ -3,12 +3,53 @@
 from configparser import ConfigParser, ParsingError
 from urllib.parse import quote, unquote
 
-from cs2tracker.constants import CAPSULE_PAGES, CONFIG_FILE, INVENTORY_IMPORT_FILE
+from cs2tracker.constants import (
+    CONFIG_FILE,
+    INVENTORY_IMPORT_FILE,
+)
 from cs2tracker.util.padded_console import get_console
 
 STEAM_MARKET_LISTING_BASEURL_CS2 = "https://steamcommunity.com/market/listings/730/"
 STEAM_MARKET_LISTING_REGEX = r"^https://steamcommunity.com/market/listings/\d+/.+$"
 
+CUSTOM_SECTIONS = [
+    "Skins",
+    "Special Items",
+    "Agents",
+    "Charms",
+    "Patches",
+    "Patch Packs",
+    "Stickers",
+    "Souvenirs",
+    "Others",
+]
+
+PREEXISTING_SECTIONS = [
+    "Cases",
+    "Katowice 2014 Sticker Capsule",
+    "Cologne 2014 Sticker Capsule",
+    "DreamHack 2014 Sticker Capsule",
+    "Katowice 2015 Sticker Capsule",
+    "Cologne 2015 Sticker Capsule",
+    "Cluj-Napoca 2015 Sticker Capsule",
+    "Columbus 2016 Sticker Capsule",
+    "Cologne 2016 Sticker Capsule",
+    "Atlanta 2017 Sticker Capsule",
+    "Krakow 2017 Sticker Capsule",
+    "Boston 2018 Sticker Capsule",
+    "London 2018 Sticker Capsule",
+    "Katowice 2019 Sticker Capsule",
+    "Berlin 2019 Sticker Capsule",
+    "2020 RMR Sticker Capsule",
+    "Stockholm 2021 Sticker Capsule",
+    "Antwerp 2022 Sticker Capsule",
+    "Rio 2022 Sticker Capsule",
+    "Paris 2023 Sticker Capsule",
+    "Copenhagen 2024 Sticker Capsule",
+    "Shanghai 2024 Sticker Capsule",
+    "Austin 2025 Sticker Capsule",
+]
+
 console = get_console()
 
 
@@ -46,19 +87,12 @@ def delete_display_sections(self):
 
     def _validate_config_sections(self):
         """Validate that the configuration file has all required sections."""
-        if not self.has_section("User Settings"):
-            raise ValueError("Missing 'User Settings' section in the configuration file.")
-        if not self.has_section("App Settings"):
-            raise ValueError("Missing 'App Settings' section in the configuration file.")
-        if not self.has_section("Stickers"):
-            raise ValueError("Missing 'Stickers' section in the configuration file.")
-        if not self.has_section("Cases"):
-            raise ValueError("Missing 'Cases' section in the configuration file.")
-        if not self.has_section("Skins"):
-            raise ValueError("Missing 'Skins' section in the configuration file.")
-        for capsule_section in CAPSULE_PAGES:
-            if not self.has_section(capsule_section):
-                raise ValueError(f"Missing '{capsule_section}' section in the configuration file.")
+        for section in CUSTOM_SECTIONS:
+            if not self.has_section(section):
+                raise ValueError(f"Missing '{section}' section in the configuration file.")
+        for section in PREEXISTING_SECTIONS:
+            if not self.has_section(section):
+                raise ValueError(f"Missing '{section}' section in the configuration file.")
 
     def _validate_config_values(self):
         # pylint: disable=too-many-branches
@@ -136,23 +170,22 @@ def read_from_inventory_file(self):
         try:
             with open(INVENTORY_IMPORT_FILE, "r", encoding="utf-8") as inventory_file:
                 inventory_data = json.load(inventory_file)
-                sorted_inventory_data = dict(sorted(inventory_data.items()))
 
                 added_to_config = set()
-                for item_name, item_owned in sorted_inventory_data.items():
-                    option = self.name_to_option(item_name, href=True)
-                    for section in self.sections():
-                        if option in self.options(section):
-                            self.set(section, option, str(item_owned))
-                            added_to_config.add(item_name)
-
-                for item_name, item_owned in sorted_inventory_data.items():
-                    if item_name not in added_to_config:
+                for _, item_infos in inventory_data.items():
+                    for item_name, item_owned in item_infos.items():
                         option = self.name_to_option(item_name, href=True)
-                        if item_name.startswith("Sticker"):
-                            self.set("Stickers", option, str(item_owned))
-                        else:
-                            self.set("Skins", option, str(item_owned))
+                        for section in self.sections():
+                            if option in self.options(section):
+                                self.set(section, option, str(item_owned))
+                                added_to_config.add(item_name)
+
+                for section, item_infos in inventory_data.items():
+                    sorted_item_infos = dict(sorted(item_infos.items()))
+                    for item_name, item_owned in sorted_item_infos.items():
+                        if item_name not in added_to_config:
+                            option = self.name_to_option(item_name, href=True)
+                            self.set(section, option, str(item_owned))
 
             self.write_to_file()
         except (FileNotFoundError, json.JSONDecodeError) as error:

cs2tracker/constants.py

@@ -187,6 +187,7 @@ def copy_initial_files_with_popup():
     f"Version: {VERSION} - {datetime.today().strftime('%Y/%m/%d')} - Jannik Novak @ashiven\n"
 )
 
+
 CAPSULE_PAGES = {
     "Katowice 2014 Sticker Capsule": "https://steamcommunity.com/market/search?q=katowice+2014+legends+challengers",
     "Cologne 2014 Sticker Capsule": "https://steamcommunity.com/market/search?q=cologne+2014+legends+challengers",

cs2tracker/data/config.ini

@@ -9,8 +9,22 @@ discord_webhook_url ~
 
 [Skins]
 
+[Special Items]
+
+[Agents]
+
+[Charms]
+
+[Patches]
+
+[Patch Packs]
+
 [Stickers]
 
+[Souvenirs]
+
+[Others]
+
 [Cases]
 https://steamcommunity.com/market/listings/730/CS%3AGO%20Weapon%20Case ~ 0
 https://steamcommunity.com/market/listings/730/CS%3AGO%20Weapon%20Case%202 ~ 0