cs2tracker 2.1.17__py3-none-any.whl → 2.1.19__py3-none-any.whl

cs2tracker/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.1.17'
-__version_tuple__ = version_tuple = (2, 1, 17)
+__version__ = version = '2.1.19'
+__version_tuple__ = version_tuple = (2, 1, 19)

cs2tracker/app/editor_frame.py

@@ -8,7 +8,7 @@ from tkinter import messagebox, ttk
 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,
@@ -18,7 +18,7 @@ from cs2tracker.constants import (
 )
 from cs2tracker.util.tkinter import centered, size_info
 
-ADD_CUSTOM_ITEM_TITLE = "Add Custom Item"
+ADD_CUSTOM_ITEM_TITLE = "Add Item"
 ADD_CUSTOM_ITEM_SIZE = "500x230"
 
 IMPORT_INVENTORY_TITLE = "Import Steam Inventory"
@@ -131,7 +131,7 @@ class ConfigEditorFrame(ttk.Frame):
         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,24 @@ class ConfigEditorFrame(ttk.Frame):
                 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"):
+
+            # Major Sticker Capsules should remain sorted by year
+            if section != "Major Sticker Capsules":
                 section_items = sorted(section_items)
 
             for config_option, value in 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 +260,25 @@ class ConfigEditorButtonFrame(ttk.Frame):
         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,6 +409,36 @@ class CustomItemFrame(ttk.Frame):
                 break
         return insert_index
 
+    def _identify_custom_section(self, item_name):
+        # pylint: disable=too-many-return-statements,too-many-branches
+        """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 "Music Kit |" in item_name:
+            return "Music Kits"
+        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 "Pins Capsule" in item_name:
+            return "Pins Capsules"
+        elif "Capsule" in item_name:
+            return "Sticker Capsules"
+        elif "Pin" in item_name:
+            return "Collectible Pins"
+        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:
@@ -404,7 +446,7 @@ class CustomItemFrame(ttk.Frame):
                 "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 +458,11 @@ class CustomItemFrame(ttk.Frame):
             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,
@@ -500,7 +541,7 @@ class InventoryImportFrame(ttk.Frame):
         self.import_sticker_capsules_value = tk.BooleanVar(value=True)
         self.import_sticker_capsules_checkbox = ttk.Checkbutton(
             self.checkbox_frame,
-            text="Import Sticker Capsules",
+            text="Import Major Sticker Capsules",
             variable=self.import_sticker_capsules_value,
             style="Switch.TCheckbutton",
         )

cs2tracker/config.py

@@ -3,12 +3,33 @@ import re
 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",
+    "Sticker Capsules",
+    "Others",
+    "Collectible Pins",
+    "Pins Capsules",
+    "Music Kits",
+]
+
+PRECONFIGURED_SECTIONS = ["Cases", "Major Sticker Capsules", "App Settings", "User Settings"]
+
 console = get_console()
 
 
@@ -46,19 +67,12 @@ class ValidatedConfig(ConfigParser):
 
     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 PRECONFIGURED_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 +150,22 @@ class ValidatedConfig(ConfigParser):
         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

@@ -41,9 +41,9 @@ PYTHON_EXECUTABLE = sys.executable
 RUNNING_IN_EXE = getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS")
 
 if RUNNING_IN_EXE:
-    MEIPASS_DIR = sys._MEIPASS  # type: ignore  pylint: disable=protected-access
-    MODULE_DIR = MEIPASS_DIR
-    PROJECT_DIR = MEIPASS_DIR
+    EXECUTABLE_DIR = sys._MEIPASS  # type: ignore pylint: disable=protected-access
+    MODULE_DIR = EXECUTABLE_DIR
+    PROJECT_DIR = EXECUTABLE_DIR
 
     if OS == OSType.WINDOWS:
         APP_DATA_DIR = os.path.join(os.path.expanduser("~"), "AppData", "Local")
@@ -187,6 +187,7 @@ AUTHOR_STRING = (
     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

@@ -4,13 +4,33 @@ discord_notifications ~ False
 conversion_currency ~ EUR
 
 [User Settings]
-proxy_api_key ~
 discord_webhook_url ~
+proxy_api_key ~
 
 [Skins]
 
+[Special Items]
+
+[Agents]
+
+[Charms]
+
+[Patches]
+
+[Patch Packs]
+
 [Stickers]
 
+[Souvenirs]
+
+[Sticker Capsules]
+
+[Collectible Pins]
+
+[Pins Capsules]
+
+[Music Kits]
+
 [Cases]
 https://steamcommunity.com/market/listings/730/CS%3AGO%20Weapon%20Case ~ 0
 https://steamcommunity.com/market/listings/730/CS%3AGO%20Weapon%20Case%202 ~ 0
@@ -55,56 +75,36 @@ https://steamcommunity.com/market/listings/730/eSports%202013%20Case ~ 0
 https://steamcommunity.com/market/listings/730/eSports%202013%20Winter%20Case ~ 0
 https://steamcommunity.com/market/listings/730/eSports%202014%20Summer%20Case ~ 0
 
-[Katowice 2014 Sticker Capsule]
+[Major Sticker Capsules]
 https://steamcommunity.com/market/listings/730/EMS%20Katowice%202014%20Legends ~ 0
 https://steamcommunity.com/market/listings/730/EMS%20Katowice%202014%20Challengers ~ 0
-
-[Cologne 2014 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/ESL%20One%20Cologne%202014%20Legends ~ 0
 https://steamcommunity.com/market/listings/730/ESL%20One%20Cologne%202014%20Challengers ~ 0
-
-[DreamHack 2014 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/DreamHack%202014%20Legends%20%28Holo-Foil%29 ~ 0
-
-[Katowice 2015 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/ESL%20One%20Katowice%202015%20Legends%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/ESL%20One%20Katowice%202015%20Challengers%20%28Holo-Foil%29 ~ 0
-
-[Cologne 2015 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/ESL%20One%20Cologne%202015%20Legends%20%28Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/ESL%20One%20Cologne%202015%20Challengers%20%28Foil%29 ~ 0
-
-[Cluj-Napoca 2015 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/DreamHack%20Cluj-Napoca%202015%20Legends%20%28Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/DreamHack%20Cluj-Napoca%202015%20Challengers%20%28Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/Autograph%20Capsule%20%7C%20Legends%20%28Foil%29%20%7C%20Cluj-Napoca%202015 ~ 0
 https://steamcommunity.com/market/listings/730/Autograph%20Capsule%20%7C%20Challengers%20%28Foil%29%20%7C%20Cluj-Napoca%202015 ~ 0
-
-[Columbus 2016 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/MLG%20Columbus%202016%20Legends%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/MLG%20Columbus%202016%20Challengers%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/Autograph%20Capsule%20%7C%20Legends%20%28Foil%29%20%7C%20MLG%20Columbus%202016 ~ 0
 https://steamcommunity.com/market/listings/730/Autograph%20Capsule%20%7C%20Challengers%20%28Foil%29%20%7C%20MLG%20Columbus%202016 ~ 0
-
-[Cologne 2016 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/Cologne%202016%20Legends%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/Cologne%202016%20Challengers%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/Autograph%20Capsule%20%7C%20Legends%20%28Foil%29%20%7C%20Cologne%202016 ~ 0
 https://steamcommunity.com/market/listings/730/Autograph%20Capsule%20%7C%20Challengers%20%28Foil%29%20%7C%20Cologne%202016 ~ 0
-
-[Atlanta 2017 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/Atlanta%202017%20Legends%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/Atlanta%202017%20Challengers%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/Autograph%20Capsule%20%7C%20Legends%20%28Foil%29%20%7C%20Atlanta%202017 ~ 0
 https://steamcommunity.com/market/listings/730/Autograph%20Capsule%20%7C%20Challengers%20%28Foil%29%20%7C%20Atlanta%202017 ~ 0
-
-[Krakow 2017 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/Krakow%202017%20Legends%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/Krakow%202017%20Challengers%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/Krakow%202017%20Legends%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Krakow%202017%20Challengers%20Autograph%20Capsule ~ 0
-
-[Boston 2018 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/Boston%202018%20Legends%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/Boston%202018%20Minor%20Challengers%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/Boston%202018%20Returning%20Challengers%20%28Holo-Foil%29 ~ 0
@@ -115,44 +115,32 @@ https://steamcommunity.com/market/listings/730/Boston%202018%20Minor%20Challenge
 https://steamcommunity.com/market/listings/730/Boston%202018%20Returning%20Challengers%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Boston%202018%20Attending%20Legends%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Boston%202018%20Minor%20Challengers%20with%20Flash%20Gaming%20Autograph%20Capsule ~ 0
-
-[London 2018 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/London%202018%20Legends%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/London%202018%20Minor%20Challengers%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/London%202018%20Returning%20Challengers%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/London%202018%20Legends%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/London%202018%20Minor%20Challengers%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/London%202018%20Returning%20Challengers%20Autograph%20Capsule ~ 0
-
-[Katowice 2019 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/Katowice%202019%20Legends%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/Katowice%202019%20Minor%20Challengers%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/Katowice%202019%20Returning%20Challengers%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/Katowice%202019%20Legends%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Katowice%202019%20Minor%20Challengers%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Katowice%202019%20Returning%20Challengers%20Autograph%20Capsule ~ 0
-
-[Berlin 2019 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/Berlin%202019%20Legends%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/Berlin%202019%20Minor%20Challengers%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/Berlin%202019%20Returning%20Challengers%20%28Holo-Foil%29 ~ 0
 https://steamcommunity.com/market/listings/730/Berlin%202019%20Legends%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Berlin%202019%20Minor%20Challengers%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Berlin%202019%20Returning%20Challengers%20Autograph%20Capsule ~ 0
-
-[2020 RMR Sticker Capsule]
 https://steamcommunity.com/market/listings/730/2020%20RMR%20Legends ~ 0
 https://steamcommunity.com/market/listings/730/2020%20RMR%20Challengers ~ 0
 https://steamcommunity.com/market/listings/730/2020%20RMR%20Contenders ~ 0
-
-[Stockholm 2021 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/Stockholm%202021%20Legends%20Sticker%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Stockholm%202021%20Challengers%20Sticker%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Stockholm%202021%20Contenders%20Sticker%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Stockholm%202021%20Champions%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Stockholm%202021%20Finalists%20Autograph%20Capsule ~ 0
-
-[Antwerp 2022 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/Antwerp%202022%20Legends%20Sticker%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Antwerp%202022%20Challengers%20Sticker%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Antwerp%202022%20Contenders%20Sticker%20Capsule ~ 0
@@ -160,8 +148,6 @@ https://steamcommunity.com/market/listings/730/Antwerp%202022%20Champions%20Auto
 https://steamcommunity.com/market/listings/730/Antwerp%202022%20Challengers%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Antwerp%202022%20Legends%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Antwerp%202022%20Contenders%20Autograph%20Capsule ~ 0
-
-[Rio 2022 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/Rio%202022%20Legends%20Sticker%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Rio%202022%20Challengers%20Sticker%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Rio%202022%20Contenders%20Sticker%20Capsule ~ 0
@@ -169,8 +155,6 @@ https://steamcommunity.com/market/listings/730/Rio%202022%20Champions%20Autograp
 https://steamcommunity.com/market/listings/730/Rio%202022%20Challengers%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Rio%202022%20Legends%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Rio%202022%20Contenders%20Autograph%20Capsule ~ 0
-
-[Paris 2023 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/Paris%202023%20Legends%20Sticker%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Paris%202023%20Challengers%20Sticker%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Paris%202023%20Contenders%20Sticker%20Capsule ~ 0
@@ -178,8 +162,6 @@ https://steamcommunity.com/market/listings/730/Paris%202023%20Champions%20Autogr
 https://steamcommunity.com/market/listings/730/Paris%202023%20Challengers%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Paris%202023%20Legends%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Paris%202023%20Contenders%20Autograph%20Capsule ~ 0
-
-[Copenhagen 2024 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/Copenhagen%202024%20Legends%20Sticker%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Copenhagen%202024%20Challengers%20Sticker%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Copenhagen%202024%20Contenders%20Sticker%20Capsule ~ 0
@@ -187,8 +169,6 @@ https://steamcommunity.com/market/listings/730/Copenhagen%202024%20Champions%20A
 https://steamcommunity.com/market/listings/730/Copenhagen%202024%20Challengers%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Copenhagen%202024%20Legends%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Copenhagen%202024%20Contenders%20Autograph%20Capsule ~ 0
-
-[Shanghai 2024 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/Shanghai%202024%20Legends%20Sticker%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Shanghai%202024%20Challengers%20Sticker%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Shanghai%202024%20Contenders%20Sticker%20Capsule ~ 0
@@ -196,8 +176,6 @@ https://steamcommunity.com/market/listings/730/Shanghai%202024%20Champions%20Aut
 https://steamcommunity.com/market/listings/730/Shanghai%202024%20Challengers%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Shanghai%202024%20Legends%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Shanghai%202024%20Contenders%20Autograph%20Capsule ~ 0
-
-[Austin 2025 Sticker Capsule]
 https://steamcommunity.com/market/listings/730/Austin%202025%20Legends%20Sticker%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Austin%202025%20Challengers%20Sticker%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Austin%202025%20Contenders%20Sticker%20Capsule ~ 0
@@ -205,3 +183,5 @@ https://steamcommunity.com/market/listings/730/Austin%202025%20Champions%20Autog
 https://steamcommunity.com/market/listings/730/Austin%202025%20Challengers%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Austin%202025%20Legends%20Autograph%20Capsule ~ 0
 https://steamcommunity.com/market/listings/730/Austin%202025%20Contenders%20Autograph%20Capsule ~ 0
+
+[Others]

cs2tracker/data/convert_inventory.js

@@ -11,6 +11,9 @@ const itemsGameLink =
 const translationsCacheFile = path.join(__dirname, "translations.json");
 const itemsCacheFile = path.join(__dirname, "items.json");
 
+const translationRegex = /"(.+?)"\s+"(.+?)"/;
+const souvenirRegex = /^csgo_crate_[a-z0-9]+_promo.*/;
+
 class ItemNameConverter {
   constructor() {
     this.translations = {};
@@ -38,7 +41,7 @@ class ItemNameConverter {
     const res = await axios.get(translationsLink);
     const lines = res.data.split(/\n/);
     for (const line of lines) {
-      const match = line.match(/"(.+?)"\s+"(.+?)"/);
+      const match = line.match(translationRegex);
       if (match) {
         this.translations[match[1].toLowerCase()] = match[2];
       }
@@ -174,26 +177,72 @@ class ItemNameConverter {
 
   getItemType(item) {
     const def = this.items[item.def_index];
-    if (def === undefined) return "unknown";
+    if (def === undefined) return "Unknown";
 
     if (def.item_name !== undefined) {
       let translatedName =
         def.item_name.replace("#", "").toLowerCase() || def.item_name;
       if (
-        translatedName.startsWith("csgo_crate_sticker_pack") ||
+        (translatedName.startsWith("csgo_crate_sticker_pack") &&
+          (translatedName.includes("2014") ||
+            translatedName.includes("2015") ||
+            translatedName.includes("contenders") ||
+            translatedName.includes("challengers") ||
+            translatedName.includes("legends"))) ||
         translatedName.startsWith("csgo_crate_signature_pack")
       ) {
-        return "sticker capsule";
-      } else if (translatedName.startsWith("csgo_crate_community")) {
-        return "case";
+        return "Major Sticker Capsules";
+      } else if (translatedName.startsWith("csgo_crate_sticker_pack")) {
+        return "Sticker Capsules";
+      } else if (translatedName.startsWith("csgo_crate_patch_pack")) {
+        return "Patch Packs";
+      } else if (translatedName.match(souvenirRegex)) {
+        return "Souvenirs";
+      } else if (
+        translatedName.startsWith("csgo_crate_community") ||
+        translatedName.startsWith("csgo_crate_gamma") ||
+        translatedName.startsWith("csgo_crate_valve") ||
+        translatedName.startsWith("csgo_crate_esports") ||
+        translatedName.startsWith("csgo_crate_operation")
+      ) {
+        return "Cases";
       } else if (translatedName.startsWith("csgo_tool_spray")) {
-        return "graffiti kit";
+        return "Graffitis";
       } else if (translatedName.startsWith("csgo_tool_sticker")) {
-        return "sticker";
+        return "Stickers";
+      } else if (translatedName.startsWith("csgo_tool_patch")) {
+        return "Patches";
+      } else if (translatedName.startsWith("csgo_tool_keychain")) {
+        return "Charms";
+      } else if (translatedName.startsWith("csgo_customplayer")) {
+        return "Agents";
+      } else if (translatedName.startsWith("csgo_collectible_pin")) {
+        return "Collectible Pins";
+      } else if (translatedName.startsWith("coupon_pins")) {
+        return "Pins Capsules";
       }
     }
 
-    return "other";
+    if (item.quality === 3) {
+      return "Special Items";
+    }
+
+    if (def.prefab !== undefined) {
+      let prefab = this.prefabs[def.prefab];
+      if (
+        prefab !== undefined &&
+        prefab.image_inventory !== undefined &&
+        prefab.image_inventory.startsWith("econ/weapons/base_weapons")
+      ) {
+        return "Skins";
+      }
+    }
+
+    if (this.getItemName(item).startsWith("Music Kit |")) {
+      return "Music Kits";
+    }
+
+    return "Others";
   }
 
   getItemTradable(item) {
@@ -204,11 +253,13 @@ class ItemNameConverter {
       let translatedName =
         def.item_name.replace("#", "").toLowerCase() || def.item_name;
       if (
-        translatedName.startsWith("csgo_collectible") ||
+        (translatedName.startsWith("csgo_collectible") &&
+          !translatedName.startsWith("csgo_collectible_pin")) ||
         translatedName.startsWith("csgo_tournamentpass") ||
         translatedName.startsWith("csgo_tournamentjournal") ||
         translatedName.startsWith("csgo_ticket") ||
-        translatedName.startsWith("csgo_tool_casket_tag")
+        translatedName.startsWith("csgo_tool_casket_tag") ||
+        translatedName.startsWith("sfui_wpnhud_c4")
       ) {
         return false;
       }
@@ -221,14 +272,6 @@ class ItemNameConverter {
       return false;
     }
 
-    // Base weapons with stickers/name tags
-    if (
-      def.image_inventory !== undefined &&
-      def.image_inventory.startsWith("econ/weapons/base_weapons")
-    ) {
-      return false;
-    }
-
     // Base weapons with stickers/name tags
     if (
       item.paint_index === undefined &&
@@ -239,7 +282,10 @@ class ItemNameConverter {
       if (
         prefab !== undefined &&
         prefab.image_inventory !== undefined &&
-        prefab.image_inventory.startsWith("econ/weapons/base_weapons")
+        prefab.image_inventory.startsWith("econ/weapons/base_weapons") &&
+        !prefab.image_inventory.startsWith(
+          "econ/weapons/base_weapons/weapon_knife",
+        )
       ) {
         return false;
       }

cs2tracker/data/get_inventory.js

@@ -91,16 +91,12 @@ console.error = (...args) => {
 
     if (importInventory) {
       const inventoryItemCounts = await processInventory();
-      for (const [itemName, count] of Object.entries(inventoryItemCounts)) {
-        finalItemCounts[itemName] = (finalItemCounts[itemName] || 0) + count;
-      }
+      mergeItemCounts(finalItemCounts, inventoryItemCounts);
     }
 
     if (importStorageUnits) {
       const storageUnitItemCounts = await processStorageUnits();
-      for (const [itemName, count] of Object.entries(storageUnitItemCounts)) {
-        finalItemCounts[itemName] = (finalItemCounts[itemName] || 0) + count;
-      }
+      mergeItemCounts(finalItemCounts, storageUnitItemCounts);
     }
 
     paddedLog("Saving config...");
@@ -127,7 +123,7 @@ console.error = (...args) => {
       const convertedItems =
         nameConverter.convertInventory(prefilteredInventory);
       const filteredItems = filterItems(convertedItems);
-      const itemCounts = countItems(filteredItems);
+      const itemCounts = groupAndCountItems(filteredItems);
       paddedLog(`${filteredItems.length} items found in inventory`);
       console.log(itemCounts);
       return itemCounts;
@@ -145,10 +141,8 @@ console.error = (...args) => {
         const items = await getCasketContentsAsync(cs2, unitId);
         const convertedItems = nameConverter.convertInventory(items);
         const filteredItems = filterItems(convertedItems);
-        const itemCounts = countItems(filteredItems);
-        for (const [itemName, count] of Object.entries(itemCounts)) {
-          finalItemCounts[itemName] = (finalItemCounts[itemName] || 0) + count;
-        }
+        const itemCounts = groupAndCountItems(filteredItems);
+        mergeItemCounts(finalItemCounts, itemCounts);
         paddedLog(
           `${filteredItems.length} items found in storage unit: ${unitIndex + 1}/${storageUnitIds.length}`,
         );
@@ -181,16 +175,32 @@ console.error = (...args) => {
   }
 
   function filterItems(items) {
+    const otherItemTypes = [
+      "Skins",
+      "Special Items",
+      "Agents",
+      "Charms",
+      "Patches",
+      "Patch Packs",
+      "Souvenirs",
+      "Others",
+      "Sticker Capsules",
+      "Collectible Pins",
+      "Pins Capsules",
+      "Music Kits",
+    ];
     let filteredItems = [];
+
     items.forEach((item) => {
       if (!item.item_tradable) {
         return;
       }
       if (
-        (item.item_type === "case" && importCases) ||
-        (item.item_type === "sticker capsule" && importStickerCapsules) ||
-        (item.item_type === "sticker" && importStickers) ||
-        (item.item_type === "other" && importOthers)
+        (item.item_type === "Cases" && importCases) ||
+        (item.item_type === "Major Sticker Capsules" &&
+          importStickerCapsules) ||
+        (item.item_type === "Stickers" && importStickers) ||
+        (otherItemTypes.includes(item.item_type) && importOthers)
       ) {
         filteredItems.push(item);
       }
@@ -198,15 +208,39 @@ console.error = (...args) => {
     return filteredItems;
   }
 
-  function countItems(items) {
-    let itemCounts = {};
-    items.forEach((item) => {
-      if (itemCounts[item.item_name]) {
-        itemCounts[item.item_name]++;
-      } else {
-        itemCounts[item.item_name] = 1;
+  function groupAndCountItems(items) {
+    let groupedItems = items.reduce((acc, item) => {
+      const { item_name, item_type } = item;
+
+      if (!acc[item_type]) {
+        acc[item_type] = {};
       }
-    });
-    return itemCounts;
+
+      if (!acc[item_type][item_name]) {
+        acc[item_type][item_name] = 0;
+      }
+
+      acc[item_type][item_name]++;
+      return acc;
+    }, {});
+
+    return groupedItems;
+  }
+
+  function mergeItemCounts(finalItemCounts, currentItemCounts) {
+    for (const item_type in currentItemCounts) {
+      if (!finalItemCounts[item_type]) {
+        finalItemCounts[item_type] = {};
+      }
+
+      for (const item_name in currentItemCounts[item_type]) {
+        if (!finalItemCounts[item_type][item_name]) {
+          finalItemCounts[item_type][item_name] = 0;
+        }
+
+        finalItemCounts[item_type][item_name] +=
+          currentItemCounts[item_type][item_name];
+      }
+    }
   }
 })();

{cs2tracker-2.1.17.dist-info → cs2tracker-2.1.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cs2tracker
-Version: 2.1.17
+Version: 2.1.19
 Summary: Tracking the steam market prices of CS2 items
 Home-page: https://github.com/ashiven/cs2tracker
 Author: Jannik Novak
@@ -76,7 +76,7 @@ Dynamic: license-file
 
 Simply download the program and run it:
 
-- [Windows](https://github.com/ashiven/cs2tracker/releases/latest/download/cs2tracker-windows.zip)
+- [Windows](https://github.com/ashiven/cs2tracker/releases/latest/download/cs2tracker-setup.exe)
 - [Linux](https://github.com/ashiven/cs2tracker/releases/latest/download/cs2tracker-linux.zip)
 
 #### Method 2: Install via Pip
@@ -120,29 +120,30 @@ This will open the config editor where you can change any setting by double clic
 
 - Enable **Daily Background Calculations** to automatically run a daily calculation of your investment in the background.
 - Use **Receive Discord Notifications** to receive a notification on your Discord server whenever the program has finished calculating your investment.
-- You need to set up a [webhook](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks) in your Discord server and enter the webhook url into the `discord_webhook_url` field in the config `User Settings`.
+- You need to set up a [webhook](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks) in your Discord server and enter the webhook URL into the `discord_webhook_url` field in the config `User Settings`.
 - Enable **Proxy Requests** to prevent your requests from being rate limited by the steamcommunity server.
 - You need to register for a free API key on [Crawlbase](crawlbase.com) and enter it into the `proxy_api_key` field in the config `User Settings`.
 
 ## FAQ
 
-**Q: Is it safe to login with my Steam account?**
+- **Q: Is it safe to login with my Steam account?**
+- **A:** Yes, the program uses the [SteamUser](https://github.com/DoctorMcKay/node-steam-user?tab=readme-ov-file#methods-) and [Globaloffensive](https://github.com/DoctorMcKay/node-globaloffensive) libraries to sign in and import your Storage Units (the same method is used by [casemove](https://github.com/nombersDev/casemove)) and all of the login-related code is transparently available in [this file](cs2tracker/data/get_inventory.js).
 
-**A:** Yes, the program uses the [SteamUser](https://github.com/DoctorMcKay/node-steam-user?tab=readme-ov-file#methods-) and [Globaloffensive](https://github.com/DoctorMcKay/node-globaloffensive) libraries to sign in and import your Storage Units (the same method is used by [casemove](https://github.com/nombersDev/casemove)) and all of the login-related code is transparently available in [this file](cs2tracker/data/get_inventory.js).
 
+- **Q: Do I have to login with my Steam account?**
+- **A:** No, you can also manually specify the number of items you own in the config editor.
 
-**Q: Do I have to login with my Steam account?**
 
-**A:** No, you can also manually specify the number of items you own in the config editor.
+- **Q: Can I get VAC-banned for using this program?**
+- **A:** No, this program does not interact with the game in any way and only reads your Storage Units.
 
 
-**Q: Can I get VAC-banned for using this program?**
-
-**A:** No, this program does not interact with the game in any way and only reads your Storage Units.
+- **Q: Why does Windows Defender flag this program as potentially harmful?**
+- **A:** This is because the program is not signed with a [Code Signing Certificate](https://www.globalsign.com/en/code-signing-certificate/what-is-code-signing-certificate), which Windows uses to verify the identity of publishers. These certificates are very expensive and not something I am willing to invest in for a free and open source project like this.
 
 ## Contributing
 
-Please feel free to submit a pull request or open an issue. See [issues](https://github.com/ashiven/cs2tracker/issues) and [pull requests](https://github.com/ashiven/cs2tracker/pulls) for current work.
+Please feel free to submit a [pull request](https://github.com/ashiven/cs2tracker/pulls) or open an [issue](https://github.com/ashiven/cs2tracker/issues).
 
 1. Fork the repository
 2. Create a new branch: `git checkout -b feature-name`.

{cs2tracker-2.1.17.dist-info → cs2tracker-2.1.19.dist-info}/RECORD

@@ -1,18 +1,18 @@
 cs2tracker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs2tracker/__main__.py,sha256=Ub--oSMv48YzfWF1CZqYlkn1-HvZ7Bhxoc7urn1oY6o,249
-cs2tracker/_version.py,sha256=6B1QsV14vku3b3mzQ60TgvM-e03ET7xDx-6ZZcUvbqI,513
-cs2tracker/config.py,sha256=iab4WqKLl8-rfV7_MAd-96lfp_edMe6QQHW_m76FvD8,11011
-cs2tracker/constants.py,sha256=zN_8Zbn9P8m5WnRJsTD-etNyqTMCQmVqfrpDf3cx9xg,9468
+cs2tracker/_version.py,sha256=H0zgjQHhg7kQrNE7IoxjBFCFnEnqqBnOnQe-ScWOyb4,513
+cs2tracker/config.py,sha256=X-oPB4f_loD1KZAySdVWSQS6rwbah6OJTqI5nN1QYQs,10840
+cs2tracker/constants.py,sha256=bdtX1pkaO2z8LZkNPqjMJDWIAxAIiw8UIUlxSt7ySgg,9478
 cs2tracker/logs.py,sha256=K6uLoGjhHTlb6HLKIj6C5mz6R6bnZgltA6xwNVJ7Z8Y,6004
 cs2tracker/main.py,sha256=9Jjn8-Hv9AzQLYjCjA6pwAmThE4HH1u3akF_c7atyl4,1046
 cs2tracker/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs2tracker/app/app.py,sha256=yKe7CUgvDfiicE-4w-omMEwHvxqCQerQSFa_FtRtYWM,12012
-cs2tracker/app/editor_frame.py,sha256=tKJnV3QwdRgEQoW9IJUuBjBoHbVp9tuR3USmgXfDqFI,27147
+cs2tracker/app/editor_frame.py,sha256=w-P6TEMLy5Kef1fr9u583TN0B9ad2iWRYwaBImUV-vo,28837
 cs2tracker/app/history_frame.py,sha256=_QJdomghK10k0q0q4hyNm_RtzrbWa5jw3Rbq72smGT0,2001
 cs2tracker/app/scraper_frame.py,sha256=GDRytrNe1gUMXA_ZcbTEcOVx2N81pQJGGYI-Fv-ww6o,4233
-cs2tracker/data/config.ini,sha256=qTmBG8Qo6BYEBA9qEb_D8c_TW8Lf_0MuusmGjdP6S1Q,15093
-cs2tracker/data/convert_inventory.js,sha256=CbMXnw52cOxhN2Ee2-kP3qX6pgwxrv4pi6_I1Acci88,7772
-cs2tracker/data/get_inventory.js,sha256=OMntZhDE_x4qsqCWqcU7SqDFuMWz_VK_umxt_4i2znQ,6304
+cs2tracker/data/config.ini,sha256=KWpFngdNqXNGYCjbjvAxr7rDvAJTpUu8aUZNfgSoIqs,14551
+cs2tracker/data/convert_inventory.js,sha256=jouylRzNWUBwoezIUEy7D38c-ATzrx8VJqt_VbVjcHA,9634
+cs2tracker/data/get_inventory.js,sha256=zMOkwxYpgnFt8IBTiZEa3WBAYk1ZGSjwNzbfktDO6io,6947
 cs2tracker/data/output.csv,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs2tracker/scraper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs2tracker/scraper/background_task.py,sha256=4m1mr9veS3PUErTJhJVQNuBvmK1B8G9rPyVF_d8Cb9Q,6443
@@ -23,9 +23,9 @@ cs2tracker/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cs2tracker/util/currency_conversion.py,sha256=h_VdipCFPzcgybWZ2VYknOd1VjHiqsFbEVed95FOe7U,2199
 cs2tracker/util/padded_console.py,sha256=ZEbU5MxDA7Xbd-_SXIyezwGvb349OgAtjNPjFT_wrZw,1774
 cs2tracker/util/tkinter.py,sha256=yR6rog4P7t_rDgH6ctssfQeJYFbqFXboiRv1V9c1vk4,1518
-cs2tracker-2.1.17.dist-info/licenses/LICENSE,sha256=doPNswWMPXbkhplb9cnZLwJoqqS72pJPhkSib8kIF08,19122
-cs2tracker-2.1.17.dist-info/METADATA,sha256=Y10or3XP5W8w8CdMjdOxON0GY7zmmCpEeGx_jskuW-k,6515
-cs2tracker-2.1.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cs2tracker-2.1.17.dist-info/entry_points.txt,sha256=K8IwDIkg8QztSB9g9c89B9jR_2pG4QyJGrNs4z5RcZw,63
-cs2tracker-2.1.17.dist-info/top_level.txt,sha256=2HB4xDDOxaU5BDc_yvdi9UlYLgL768n8aR-hRhFM6VQ,11
-cs2tracker-2.1.17.dist-info/RECORD,,
+cs2tracker-2.1.19.dist-info/licenses/LICENSE,sha256=doPNswWMPXbkhplb9cnZLwJoqqS72pJPhkSib8kIF08,19122
+cs2tracker-2.1.19.dist-info/METADATA,sha256=MpXvoZVeGZdjL7PlV_5VuCvZ98nHiC4Ck7gDCcK8Z1w,6914
+cs2tracker-2.1.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cs2tracker-2.1.19.dist-info/entry_points.txt,sha256=K8IwDIkg8QztSB9g9c89B9jR_2pG4QyJGrNs4z5RcZw,63
+cs2tracker-2.1.19.dist-info/top_level.txt,sha256=2HB4xDDOxaU5BDc_yvdi9UlYLgL768n8aR-hRhFM6VQ,11
+cs2tracker-2.1.19.dist-info/RECORD,,