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

cs2tracker/app/scraper_frame.py

@@ -4,7 +4,9 @@ from tkinter.filedialog import asksaveasfilename
 
 from tksheet import Sheet
 
-from cs2tracker.scraper.scraper import ParsingError
+from cs2tracker.scraper.parser import Parser
+from cs2tracker.scraper.scraper import ParsingError, SheetNotFoundError
+from cs2tracker.util.tkinter import centered
 
 
 class ScraperFrame(ttk.Frame):
@@ -51,10 +53,10 @@ class ScraperFrame(ttk.Frame):
         self.sheet.enable_bindings()
 
         source_titles = []
-        for price_source in self.scraper.parser.SOURCES:
+        for price_source in Parser.SOURCES:
             source_titles += [
-                f"{price_source.value.title()} (USD)",
-                f"{price_source.value.title()} Owned (USD)",
+                f"{price_source.name.title()} (USD)",
+                f"{price_source.name.title()} Owned (USD)",
             ]
         self.sheet.insert_row(
             [
@@ -65,14 +67,16 @@ class ScraperFrame(ttk.Frame):
         )
         self.sheet.align_rows([0], "c")
 
-        price_columns = list(range(2 * len(self.scraper.parser.SOURCES)))
+        price_columns = list(range(2 * len(Parser.SOURCES)))
         price_columns = [1] + [column_index + 2 for column_index in price_columns]
         self.sheet.align_columns(price_columns, "c")
         self.sheet.column_width(0, 220)
 
         required_window_width = 220 + 150 * len(price_columns)
         if int(self.sheet_width) < required_window_width:
-            self.parent.geometry(f"{required_window_width}x{self.sheet_height}")
+            self.parent.geometry(
+                centered(self.parent, f"{required_window_width}x{self.sheet_height}")
+            )
 
         self.sheet.popup_menu_add_command("Save Sheet", self._save_sheet)
         self.parent.bind("<Configure>", self._readjust_sheet_size_with_window_size)
@@ -104,7 +108,9 @@ class ScraperFrame(ttk.Frame):
 
         self.scraper.scrape_prices(update_sheet_callback)
 
-        if self.scraper.error_stack:
+        if self.scraper.error_stack and not isinstance(
+            self.scraper.error_stack[-1], SheetNotFoundError
+        ):
             last_error = self.scraper.error_stack[-1]
             if not isinstance(last_error, ParsingError):
                 messagebox.showerror("An Error Occurred", f"{last_error.message}", parent=self)

cs2tracker/{util/validated_config.py → config.py}

@@ -36,10 +36,13 @@ class ValidatedConfig(ConfigParser):
         discord_notifications = self.getboolean(
             "App Settings", "discord_notifications", fallback=False
         )
+        conversion_currency = self.get("App Settings", "conversion_currency", fallback="EUR")
+
         self.clear()
         self.add_section("App Settings")
         self.set("App Settings", "use_proxy", str(use_proxy))
         self.set("App Settings", "discord_notifications", str(discord_notifications))
+        self.set("App Settings", "conversion_currency", conversion_currency)
 
     def _validate_config_sections(self):
         """Validate that the configuration file has all required sections."""
@@ -47,47 +50,49 @@ class ValidatedConfig(ConfigParser):
             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("Custom Items"):
-            raise ValueError("Missing 'Custom Items' 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.")
 
     def _validate_config_values(self):
+        # pylint: disable=too-many-branches
         """Validate that the configuration file has valid values for all sections."""
         try:
-            for custom_item_href, custom_item_owned in self.items("Custom Items"):
-                if not re.match(STEAM_MARKET_LISTING_REGEX, custom_item_href):
-                    raise ValueError(
-                        f"Invalid Steam market listing URL in 'Custom Items' section: {custom_item_href}"
-                    )
-
-                if int(custom_item_owned) < 0:
-                    raise ValueError(
-                        f"Invalid value in 'Custom Items' section: {custom_item_href} = {custom_item_owned}"
-                    )
-            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_href} = {case_owned}"
-                    )
-            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_href} = {capsule_owned}"
-                        )
+            for section in self.sections():
+                if section == "App Settings":
+                    for option in ("use_proxy", "discord_notifications", "conversion_currency"):
+                        if not self.has_option(section, option):
+                            raise ValueError(f"Reason: Missing '{option}' in '{section}' section.")
+                        if option in ("use_proxy", "discord_notifications") and self.get(
+                            section, option, fallback=False
+                        ) not in ("True", "False"):
+                            raise ValueError(
+                                f"Reason: Invalid value for '{option}' in '{section}' section."
+                            )
+                elif section == "User Settings":
+                    for option in ("proxy_api_key", "discord_webhook_url"):
+                        if not self.has_option(section, option):
+                            raise ValueError(f"Reason: Missing '{option}' in '{section}' section.")
+                else:
+                    for item_href, item_owned in self.items(section):
+                        if not re.match(STEAM_MARKET_LISTING_REGEX, item_href):
+                            raise ValueError("Reason: Invalid Steam market listing URL.")
+                        if int(item_owned) < 0:
+                            raise ValueError("Reason: Negative values are not allowed.")
+                        if int(item_owned) > 1000000:
+                            raise ValueError("Reason: Value exceeds maximum limit of 1,000,000.")
         except ValueError as error:
-            if "Invalid " in str(error):
+            # Re-raise the error if it contains "Reason: " to maintain the original message
+            # and raise a ValueError if the conversion of a value to an integer fails.
+            if "Reason: " in str(error):
                 raise
-            raise ValueError("Invalid value type. All values must be integers.") from error
+            raise ValueError("Reason: Invalid value type. All values must be integers.") from error
 
     def _validate_config(self):
         """
@@ -131,20 +136,23 @@ 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()
+                sorted_inventory_data = dict(sorted(inventory_data.items()))
 
-                for item_name, item_owned in inventory_data.items():
-                    option_name_href = self.name_to_option(item_name, href=True)
+                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_name_href in self.options(section):
-                            self.set(section, option_name_href, str(item_owned))
+                        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 inventory_data.items():
+                for item_name, item_owned in sorted_inventory_data.items():
                     if item_name not in added_to_config:
-                        url_encoded_item_name = quote(item_name)
-                        listing_url = f"{STEAM_MARKET_LISTING_BASEURL_CS2}{url_encoded_item_name}"
-                        self.set("Custom Items", listing_url, str(item_owned))
+                        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))
 
             self.write_to_file()
         except (FileNotFoundError, json.JSONDecodeError) as error:
@@ -161,6 +169,9 @@ class ValidatedConfig(ConfigParser):
         :return: The reader-friendly name.
         """
         if href:
+            if not re.match(STEAM_MARKET_LISTING_REGEX, option):
+                raise ValueError(f"Invalid Steam market listing URL: {option}")
+
             converted_option = unquote(option.split("/")[-1])
         else:
             converted_option = option.replace("_", " ").title()
@@ -182,32 +193,66 @@ class ValidatedConfig(ConfigParser):
 
         return converted_name
 
-    def toggle_use_proxy(self, enabled: bool):
+    def toggle_app_option(self, option, enabled):
         """
         Toggle the use of proxies for requests. This will update the configuration file.
 
         :param enabled: If True, proxies will be used; if False, they will not be used.
         """
-        self.set("App Settings", "use_proxy", str(enabled))
+        self.set("App Settings", option, str(enabled))
         self.write_to_file()
 
-        console.print(
-            f"[bold green]{'[+] Enabled' if enabled else '[-] Disabled'} proxy usage for requests."
-        )
+        console.info(f"{'Enabled' if enabled else 'Disabled'} option: {option}.")
 
-    def toggle_discord_webhook(self, enabled: bool):
+    def set_app_option(self, option, value):
         """
-        Toggle the use of a Discord webhook to notify users of price calculations.
+        Set an option in the App Settings to a specific value.
 
-        :param enabled: If True, the webhook will be used; if False, it will not be
-            used.
+        :param option: The option to set.
+        :param value: The value to set the option to.
         """
-        self.set("App Settings", "discord_notifications", str(enabled))
+        self.set("App Settings", option, str(value))
         self.write_to_file()
 
-        console.print(
-            f"[bold green]{'[+] Enabled' if enabled else '[-] Disabled'} Discord webhook notifications."
-        )
+        console.info(f"Set {option} to {value}.")
+
+    def option_exists(self, option, exclude_sections=()):
+        """
+        Check if an option exists in any section of the configuration.
+
+        :param option: The option to check.
+        :param exclude_sections: Sections to exclude from the check.
+        :return: True if the option exists, False otherwise.
+        """
+        for section in [section for section in self.sections() if section not in exclude_sections]:
+            if option in self.options(section):
+                return True
+        return False
+
+    @property
+    def use_proxy(self):
+        """Check if the application should use proxies for requests."""
+        return self.getboolean("App Settings", "use_proxy", fallback=False)
+
+    @property
+    def discord_notifications(self):
+        """Check if the application should send Discord notifications."""
+        return self.getboolean("App Settings", "discord_notifications", fallback=False)
+
+    @property
+    def conversion_currency(self):
+        """Get the conversion currency for price calculations."""
+        return self.get("App Settings", "conversion_currency", fallback="EUR")
+
+    @property
+    def proxy_api_key(self):
+        """Get the API key for the proxy service."""
+        return self.get("User Settings", "proxy_api_key", fallback="")
+
+    @property
+    def discord_webhook_url(self):
+        """Get the Discord webhook URL for notifications."""
+        return self.get("User Settings", "discord_webhook_url", fallback="")
 
 
 config = ValidatedConfig()

cs2tracker/constants.py

@@ -18,19 +18,36 @@ except ImportError:
 class OSType(enum.Enum):
     WINDOWS = "Windows"
     LINUX = "Linux"
+    MACOS = "MacOS"
 
 
-OS = OSType.WINDOWS if sys.platform.startswith("win") else OSType.LINUX
-PYTHON_EXECUTABLE = sys.executable
+if sys.platform.startswith("win"):
+    OS = OSType.WINDOWS
+elif sys.platform.startswith("linux"):
+    OS = OSType.LINUX
+elif sys.platform.startswith("darwin"):
+    OS = OSType.MACOS
+else:
+    raise NotImplementedError(f"Unsupported OS: {sys.platform}")
 
 
+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
-    APP_DATA_DIR = os.path.join(os.path.expanduser("~"), "AppData", "Local")
+
+    if OS == OSType.WINDOWS:
+        APP_DATA_DIR = os.path.join(os.path.expanduser("~"), "AppData", "Local")
+    elif OS == OSType.LINUX:
+        APP_DATA_DIR = os.environ.get(
+            "XDG_DATA_HOME", os.path.join(os.path.expanduser("~"), ".local", "share")
+        )
+    else:
+        raise NotImplementedError(f"Unsupported OS: {OS}")
+
     DATA_DIR = os.path.join(APP_DATA_DIR, "cs2tracker", "data")
     os.makedirs(DATA_DIR, exist_ok=True)
 

cs2tracker/data/config.ini

@@ -1,56 +1,59 @@
 [App Settings]
 use_proxy ~ False
 discord_notifications ~ False
+conversion_currency ~ EUR
 
 [User Settings]
 proxy_api_key ~
 discord_webhook_url ~
 
-[Custom Items]
+[Skins]
+
+[Stickers]
 
 [Cases]
-https://steamcommunity.com/market/listings/730/Revolution%20Case ~ 0
-https://steamcommunity.com/market/listings/730/Recoil%20Case ~ 0
-https://steamcommunity.com/market/listings/730/Dreams%20%26%20Nightmares%20Case ~ 0
-https://steamcommunity.com/market/listings/730/Operation%20Riptide%20Case ~ 0
-https://steamcommunity.com/market/listings/730/Snakebite%20Case ~ 0
-https://steamcommunity.com/market/listings/730/Operation%20Broken%20Fang%20Case ~ 0
-https://steamcommunity.com/market/listings/730/Fracture%20Case ~ 0
-https://steamcommunity.com/market/listings/730/Chroma%20Case ~ 0
-https://steamcommunity.com/market/listings/730/Chroma%202%20Case ~ 0
-https://steamcommunity.com/market/listings/730/Chroma%203%20Case ~ 0
-https://steamcommunity.com/market/listings/730/Clutch%20Case ~ 0
 https://steamcommunity.com/market/listings/730/CS%3AGO%20Weapon%20Case ~ 0
 https://steamcommunity.com/market/listings/730/CS%3AGO%20Weapon%20Case%202 ~ 0
 https://steamcommunity.com/market/listings/730/CS%3AGO%20Weapon%20Case%203 ~ 0
 https://steamcommunity.com/market/listings/730/CS20%20Case ~ 0
+https://steamcommunity.com/market/listings/730/Chroma%202%20Case ~ 0
+https://steamcommunity.com/market/listings/730/Chroma%203%20Case ~ 0
+https://steamcommunity.com/market/listings/730/Chroma%20Case ~ 0
+https://steamcommunity.com/market/listings/730/Clutch%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Danger%20Zone%20Case ~ 0
-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
+https://steamcommunity.com/market/listings/730/Dreams%20%26%20Nightmares%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Falchion%20Case ~ 0
-https://steamcommunity.com/market/listings/730/Gamma%20Case ~ 0
+https://steamcommunity.com/market/listings/730/Fever%20Case ~ 0
+https://steamcommunity.com/market/listings/730/Fracture%20Case ~ 0
+https://steamcommunity.com/market/listings/730/Gallery%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Gamma%202%20Case ~ 0
+https://steamcommunity.com/market/listings/730/Gamma%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Glove%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Horizon%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Huntsman%20Weapon%20Case ~ 0
+https://steamcommunity.com/market/listings/730/Kilowatt%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Operation%20Bravo%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Operation%20Breakout%20Weapon%20Case ~ 0
+https://steamcommunity.com/market/listings/730/Operation%20Broken%20Fang%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Operation%20Hydra%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Operation%20Phoenix%20Weapon%20Case ~ 0
+https://steamcommunity.com/market/listings/730/Operation%20Riptide%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Operation%20Vanguard%20Weapon%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Operation%20Wildfire%20Case ~ 0
-https://steamcommunity.com/market/listings/730/Prisma%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Prisma%202%20Case ~ 0
+https://steamcommunity.com/market/listings/730/Prisma%20Case ~ 0
+https://steamcommunity.com/market/listings/730/Recoil%20Case ~ 0
+https://steamcommunity.com/market/listings/730/Revolution%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Revolver%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Shadow%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Shattered%20Web%20Case ~ 0
-https://steamcommunity.com/market/listings/730/Spectrum%20Case ~ 0
+https://steamcommunity.com/market/listings/730/Snakebite%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Spectrum%202%20Case ~ 0
+https://steamcommunity.com/market/listings/730/Spectrum%20Case ~ 0
 https://steamcommunity.com/market/listings/730/Winter%20Offensive%20Weapon%20Case ~ 0
-https://steamcommunity.com/market/listings/730/Kilowatt%20Case ~ 0
-https://steamcommunity.com/market/listings/730/Gallery%20Case ~ 0
-https://steamcommunity.com/market/listings/730/Fever%20Case ~ 0
+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]
 https://steamcommunity.com/market/listings/730/EMS%20Katowice%202014%20Legends ~ 0

cs2tracker/data/convert_inventory.js

@@ -18,6 +18,7 @@ class ItemNameConverter {
     this.prefabs = {};
     this.paintKits = {};
     this.stickerKits = {};
+    this.musicKits = {};
   }
 
   async initialize() {
@@ -58,6 +59,7 @@ class ItemNameConverter {
       this.prefabs = require(itemsCacheFile).prefabs;
       this.paintKits = require(itemsCacheFile).paint_kits;
       this.stickerKits = require(itemsCacheFile).sticker_kits;
+      this.musicKits = require(itemsCacheFile).music_definitions;
       return;
     }
 
@@ -67,6 +69,7 @@ class ItemNameConverter {
     this.prefabs = parsed.prefabs;
     this.paintKits = parsed.paint_kits;
     this.stickerKits = parsed.sticker_kits;
+    this.musicKits = parsed.music_definitions;
 
     fs.writeFileSync(itemsCacheFile, JSON.stringify(parsed, null, 2));
   }
@@ -78,24 +81,34 @@ class ItemNameConverter {
 
   getItemName(item) {
     const def = this.items[item.def_index];
-    if (!def) return "";
+    if (def === undefined) return "";
 
     let baseName = "";
-    if (def.item_name) {
+    if (def.item_name !== undefined) {
       baseName = this.translate(def.item_name);
-    } else if (def.prefab && this.prefabs[def.prefab]) {
+    } else if (
+      def.prefab !== undefined &&
+      this.prefabs[def.prefab] !== undefined
+    ) {
       baseName = this.translate(this.prefabs[def.prefab].item_name);
     }
 
     let stickerName = "";
-    if (baseName === "Sticker" && item.stickers && item.stickers.length === 1) {
+    if (
+      baseName === "Sticker" &&
+      item.stickers !== undefined &&
+      item.stickers.length === 1
+    ) {
       stickerName = this.translate(
-        this.stickerKits[String(item.stickers[0].sticker_id)].item_name,
+        this.stickerKits[item.stickers[0].sticker_id].item_name,
       );
     }
 
     let skinName = "";
-    if (item.paint_index && this.paintKits[item.paint_index]) {
+    if (
+      item.paint_index !== undefined &&
+      this.paintKits[item.paint_index] !== undefined
+    ) {
       skinName = this.translate(
         this.paintKits[item.paint_index].description_tag,
       );
@@ -106,13 +119,8 @@ class ItemNameConverter {
       wear = this.getWearName(item.paint_wear);
     }
 
-    // It is a knife / glove
-    if (item.quality === 3) {
-      baseName = "★ " + baseName;
-    }
-
-    // It is a stattrak or souvenir item
-    if (item.attribute && item.attribute.length > 0) {
+    // Item is stattrak/souvenir/music kit
+    if (item.attribute !== undefined && item.attribute.length > 0) {
       for (let [_attributeName, attributeValue] of Object.entries(
         item.attribute,
       )) {
@@ -127,14 +135,27 @@ class ItemNameConverter {
               ? baseName
               : "Souvenir " + baseName;
             break;
+          case 166:
+            if (baseName === "Music Kit") {
+              let music_index = attributeValue.value_bytes.readUInt32LE(0);
+              let musicKitName = this.translate(
+                this.musicKits[music_index].loc_name,
+              );
+              baseName = baseName + ` | ${musicKitName}`;
+            }
         }
       }
     }
 
-    if (baseName && skinName) {
-      return `${baseName} | ${skinName}${wear ? ` (${wear})` : ""}`;
-    } else if (baseName && stickerName) {
+    // Item is a knife / glove
+    if (item.quality === 3) {
+      baseName = "★ " + baseName;
+    }
+
+    if (baseName && stickerName) {
       return `${baseName} | ${stickerName}`;
+    } else if (baseName && skinName) {
+      return `${baseName} | ${skinName}${wear ? ` (${wear})` : ""}`;
     }
 
     return baseName;
@@ -153,21 +174,21 @@ class ItemNameConverter {
 
   getItemType(item) {
     const def = this.items[item.def_index];
-    if (!def) return "unknown";
+    if (def === undefined) return "unknown";
 
-    if (def.item_name) {
+    if (def.item_name !== undefined) {
       let translatedName =
         def.item_name.replace("#", "").toLowerCase() || def.item_name;
       if (
-        translatedName.includes("crate_sticker_pack") ||
-        translatedName.includes("crate_signature_pack")
+        translatedName.startsWith("csgo_crate_sticker_pack") ||
+        translatedName.startsWith("csgo_crate_signature_pack")
       ) {
         return "sticker capsule";
-      } else if (translatedName.includes("crate_community")) {
+      } else if (translatedName.startsWith("csgo_crate_community")) {
         return "case";
-      } else if (translatedName.includes("csgo_tool_spray")) {
+      } else if (translatedName.startsWith("csgo_tool_spray")) {
         return "graffiti kit";
-      } else if (translatedName.includes("csgo_tool_sticker")) {
+      } else if (translatedName.startsWith("csgo_tool_sticker")) {
         return "sticker";
       }
     }
@@ -175,12 +196,71 @@ class ItemNameConverter {
     return "other";
   }
 
+  getItemTradable(item) {
+    const def = this.items[item.def_index];
+    if (def === undefined) return false;
+
+    if (def.item_name !== undefined) {
+      let translatedName =
+        def.item_name.replace("#", "").toLowerCase() || def.item_name;
+      if (
+        translatedName.startsWith("csgo_collectible") ||
+        translatedName.startsWith("csgo_tournamentpass") ||
+        translatedName.startsWith("csgo_tournamentjournal") ||
+        translatedName.startsWith("csgo_ticket") ||
+        translatedName.startsWith("csgo_tool_casket_tag")
+      ) {
+        return false;
+      }
+    }
+
+    if (
+      def.prefab !== undefined &&
+      def.prefab.includes("collectible_untradable")
+    ) {
+      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 &&
+      def.image_inventory === undefined &&
+      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 false;
+      }
+    }
+
+    return true;
+  }
+
   convertInventory(inventoryList) {
-    return inventoryList.map((item) => ({
-      ...item,
-      item_name: this.getItemName(item),
-      item_type: this.getItemType(item),
-    }));
+    // Some untradable items were too difficult to filter out via their properties,
+    // so we filter them out by their item name here.
+    let excludeItems = ["P250 | X-Ray", "Music Kit | Valve, CS:GO"];
+
+    return inventoryList
+      .map((item) => ({
+        ...item,
+        item_name: this.getItemName(item),
+        item_type: this.getItemType(item),
+        item_tradable: this.getItemTradable(item),
+      }))
+      .filter((item) => !excludeItems.includes(item.item_name));
   }
 }