cs2tracker 2.1.8__tar.gz → 2.1.9__tar.gz

{cs2tracker-2.1.8 → cs2tracker-2.1.9}/.gitignore

@@ -8,3 +8,4 @@ venv-test
 cs2tracker.egg-info
 _version.py
 cs2tracker_scraper.bat
+config.ini.bak

{cs2tracker-2.1.8 → cs2tracker-2.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cs2tracker
-Version: 2.1.8
+Version: 2.1.9
 Summary: Tracking the steam market prices of CS2 items
 Home-page: https://github.com/ashiven/cs2tracker
 Author: Jannik Novak

{cs2tracker-2.1.8 → cs2tracker-2.1.9}/cs2tracker/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.1.8'
-__version_tuple__ = version_tuple = (2, 1, 8)
+__version__ = version = '2.1.9'
+__version_tuple__ = version_tuple = (2, 1, 9)

{cs2tracker-2.1.8 → cs2tracker-2.1.9}/cs2tracker/application.py

@@ -1,7 +1,9 @@
 import ctypes
 import tkinter as tk
+from shutil import copy
 from subprocess import Popen
 from threading import Thread
+from tkinter import messagebox
 from typing import cast
 
 import matplotlib.pyplot as plt
@@ -10,9 +12,11 @@ from matplotlib.dates import DateFormatter
 
 from cs2tracker.constants import (
     CONFIG_FILE,
+    CONFIG_FILE_BACKUP,
     ICON_FILE,
     OS,
     OUTPUT_FILE,
+    POWERSHELL_COLORIZE_OUTPUT,
     PYTHON_EXECUTABLE,
     RUNNING_IN_EXE,
     TEXT_EDITOR,
@@ -22,7 +26,7 @@ from cs2tracker.scraper import Scraper
 
 APPLICATION_NAME = "CS2Tracker"
 
-WINDOW_SIZE = "500x450"
+WINDOW_SIZE = "550x500"
 BACKGROUND_COLOR = "#1e1e1e"
 BUTTON_COLOR = "#3c3f41"
 BUTTON_HOVER_COLOR = "#505354"
@@ -104,6 +108,7 @@ class Application:
 
         self._add_button(frame, "Run!", self.scrape_prices)
         self._add_button(frame, "Edit Config", self._edit_config)
+        self._add_button(frame, "Reset Config", self._confirm_reset_config)
         self._add_button(frame, "Show History (Chart)", self._draw_plot)
         self._add_button(frame, "Show History (File)", self._edit_log_file)
 
@@ -158,7 +163,7 @@ class Application:
 
         if RUNNING_IN_EXE:
             # The python executable is set as the executable itself in PyInstaller
-            scraper_cmd = f"{PYTHON_EXECUTABLE} --only-scrape | Out-Host -Paging"
+            scraper_cmd = f"{PYTHON_EXECUTABLE} --only-scrape | {POWERSHELL_COLORIZE_OUTPUT}"
         else:
             scraper_cmd = f"{PYTHON_EXECUTABLE} -m cs2tracker --only-scrape"
 
@@ -202,6 +207,18 @@ class Application:
             callback=self.scraper.parse_config,
         )
 
+    def _confirm_reset_config(self):
+        confirm = messagebox.askokcancel(
+            "Reset Config", "Are you sure you want to reset the config file?"
+        )
+        if confirm:
+            self._reset_config()
+
+    def _reset_config(self):
+        """Reset the configuration file to its default state."""
+        copy(CONFIG_FILE_BACKUP, CONFIG_FILE)
+        self.scraper.parse_config()
+
     def _draw_plot(self):
         """Draw a plot of the scraped prices over time."""
         dates, dollars, euros = self.scraper.read_price_log()

{cs2tracker-2.1.8 → cs2tracker-2.1.9}/cs2tracker/constants.py

@@ -22,14 +22,6 @@ TEXT_EDITOR = "notepad" if OS == OSType.WINDOWS else "nano"
 PYTHON_EXECUTABLE = sys.executable
 
 
-MODULE_DIR = os.path.dirname(os.path.abspath(__file__))
-PROJECT_DIR = os.path.dirname(MODULE_DIR)
-ICON_FILE = os.path.join(PROJECT_DIR, "assets", "icon.png")
-OUTPUT_FILE = os.path.join(MODULE_DIR, "data", "output.csv")
-CONFIG_FILE = os.path.join(MODULE_DIR, "data", "config.ini")
-BATCH_FILE = os.path.join(MODULE_DIR, "data", "cs2tracker_scraper.bat")
-
-
 RUNNING_IN_EXE = getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS")
 
 if RUNNING_IN_EXE:
@@ -45,12 +37,31 @@ if RUNNING_IN_EXE:
     os.makedirs(DATA_DIR, exist_ok=True)
 
     CONFIG_FILE = os.path.join(DATA_DIR, "config.ini")
+    CONFIG_FILE_BACKUP = os.path.join(DATA_DIR, "config.ini.bak")
     OUTPUT_FILE = os.path.join(DATA_DIR, "output.csv")
     BATCH_FILE = os.path.join(DATA_DIR, "cs2tracker_scraper.bat")
-    if not os.path.exists(CONFIG_FILE):
-        copy(CONFIG_FILE_SOURCE, CONFIG_FILE)
+
+    # Always copy the source config into the user data directory as a backup
+    # and overwrite the existing backup if it exists
+    # (This is to ensure that no outdated config backup remains in the user data directory)
+    copy(CONFIG_FILE_SOURCE, CONFIG_FILE_BACKUP)
+
     if not os.path.exists(OUTPUT_FILE):
         copy(OUTPUT_FILE_SOURCE, OUTPUT_FILE)
+    if not os.path.exists(CONFIG_FILE):
+        copy(CONFIG_FILE_SOURCE, CONFIG_FILE)
+
+else:
+    MODULE_DIR = os.path.dirname(os.path.abspath(__file__))
+    PROJECT_DIR = os.path.dirname(MODULE_DIR)
+    ICON_FILE = os.path.join(PROJECT_DIR, "assets", "icon.png")
+    CONFIG_FILE = os.path.join(MODULE_DIR, "data", "config.ini")
+    CONFIG_FILE_BACKUP = os.path.join(MODULE_DIR, "data", "config.ini.bak")
+    OUTPUT_FILE = os.path.join(MODULE_DIR, "data", "output.csv")
+    BATCH_FILE = os.path.join(MODULE_DIR, "data", "cs2tracker_scraper.bat")
+
+    if not os.path.exists(CONFIG_FILE_BACKUP):
+        copy(CONFIG_FILE, CONFIG_FILE_BACKUP)
 
 
 BANNER = """
@@ -68,50 +79,17 @@ AUTHOR_STRING = (
 )
 
 
-CASE_PAGES = [
-    "https://steamcommunity.com/market/search?q=revolution+case",
-    "https://steamcommunity.com/market/search?q=recoil+case",
-    "https://steamcommunity.com/market/search?q=dreams+and+nightmares+case",
-    "https://steamcommunity.com/market/search?q=operation+riptide+case",
-    "https://steamcommunity.com/market/search?q=snakebite+case",
-    "https://steamcommunity.com/market/search?q=broken+fang+case",
-    "https://steamcommunity.com/market/search?q=fracture+case",
-    "https://steamcommunity.com/market/search?q=chroma+case",
-    "https://steamcommunity.com/market/search?q=chroma+case",
-    "https://steamcommunity.com/market/search?q=chroma+case",
-    "https://steamcommunity.com/market/search?q=clutch+case",
-    "https://steamcommunity.com/market/search?q=csgo+weapon+case",
-    "https://steamcommunity.com/market/search?q=csgo+weapon+case",
-    "https://steamcommunity.com/market/search?q=csgo+weapon+case",
-    "https://steamcommunity.com/market/search?q=cs20+case",
-    "https://steamcommunity.com/market/search?q=danger+zone+case",
-    "https://steamcommunity.com/market/search?q=esports+case",
-    "https://steamcommunity.com/market/search?q=esports+case",
-    "https://steamcommunity.com/market/search?q=esports+case",
-    "https://steamcommunity.com/market/search?q=falchion+case",
-    "https://steamcommunity.com/market/search?q=gamma+case",
-    "https://steamcommunity.com/market/search?q=gamma+case",
-    "https://steamcommunity.com/market/search?q=glove+case",
-    "https://steamcommunity.com/market/search?q=horizon+case",
-    "https://steamcommunity.com/market/search?q=huntsman+weapon+case",
-    "https://steamcommunity.com/market/search?q=operation+bravo+case",
-    "https://steamcommunity.com/market/search?q=operation+breakout+case",
-    "https://steamcommunity.com/market/search?q=operation+hydra+case",
-    "https://steamcommunity.com/market/search?q=operation+phoenix+case",
-    "https://steamcommunity.com/market/search?q=operation+vanguard+case",
-    "https://steamcommunity.com/market/search?q=operation+wildfire+case",
-    "https://steamcommunity.com/market/search?q=prisma+case",
-    "https://steamcommunity.com/market/search?q=prisma+case",
-    "https://steamcommunity.com/market/search?q=revolver+case",
-    "https://steamcommunity.com/market/search?q=shadow+case",
-    "https://steamcommunity.com/market/search?q=shattered+web+case",
-    "https://steamcommunity.com/market/search?q=spectrum+case",
-    "https://steamcommunity.com/market/search?q=spectrum+case",
-    "https://steamcommunity.com/market/search?q=winter+offensive+case",
-    "https://steamcommunity.com/market/search?q=kilowatt+case",
-    "https://steamcommunity.com/market/search?q=gallery+case",
-    "https://steamcommunity.com/market/search?q=fever+case",
-]
+POWERSHELL_COLORIZE_OUTPUT = (
+    "%{ "
+    "if($_ -match 'Version|\\\\|_') { Write-Host $_ -ForegroundColor yellow } "
+    "elseif($_ -match 'USD|EUR|^[-|\\s]+$') { Write-Host $_ -ForegroundColor green } "
+    "elseif($_ -match 'Case|Capsule|-[A-Za-z0-9]') { Write-Host $_ -ForegroundColor magenta } "
+    "elseif($_ -match '\\[!\\]') { Write-Host $_ -ForegroundColor red } "
+    "elseif($_ -match 'Legends|Challengers|Contenders|Champions|Finalists') { Write-Host $_ -ForegroundColor blue } "
+    "else { Write-Host $_ } "
+    "}"
+)
+
 
 CASE_HREFS = [
     "https://steamcommunity.com/market/listings/730/Revolution%20Case",

{cs2tracker-2.1.8 → cs2tracker-2.1.9}/cs2tracker/scraper.py

@@ -4,7 +4,6 @@ import time
 from configparser import ConfigParser
 from datetime import datetime
 from subprocess import DEVNULL, call
-from urllib.parse import unquote
 
 from bs4 import BeautifulSoup
 from bs4.element import Tag
@@ -19,7 +18,6 @@ from cs2tracker.constants import (
     BATCH_FILE,
     CAPSULE_INFO,
     CASE_HREFS,
-    CASE_PAGES,
     CONFIG_FILE,
     OS,
     OUTPUT_FILE,
@@ -59,10 +57,75 @@ class Scraper:
         self.usd_total = 0
         self.eur_total = 0
 
+    def _validate_config_sections(self):
+        """Validate that the configuration file has all required sections."""
+        if not self.config.has_section("User Settings"):
+            raise ValueError("Missing 'User Settings' section in the configuration file.")
+        if not self.config.has_section("App Settings"):
+            raise ValueError("Missing 'App Settings' section in the configuration file.")
+        if not self.config.has_section("Custom Items"):
+            raise ValueError("Missing 'Custom Items' section in the configuration file.")
+        if not self.config.has_section("Cases"):
+            raise ValueError("Missing 'Cases' section in the configuration file.")
+        for capsule_section in CAPSULE_INFO:
+            if not self.config.has_section(capsule_section):
+                raise ValueError(f"Missing '{capsule_section}' section in the configuration file.")
+
+    def _validate_config_values(self):
+        """Validate that the configuration file has valid values for all sections."""
+        try:
+            for custom_item_name, custom_item_owned in self.config.items("Custom Items"):
+                if " " not in custom_item_owned:
+                    raise ValueError(
+                        f"Invalid custom item format (<item_name> = <owned_count> <item_url>): {custom_item_name} = {custom_item_owned}"
+                    )
+                owned, _ = custom_item_owned.split(" ", 1)
+                if int(owned) < 0:
+                    raise ValueError(
+                        f"Invalid value in 'Custom Items' section: {custom_item_name} = {custom_item_owned}"
+                    )
+            for case_name, case_owned in self.config.items("Cases"):
+                if int(case_owned) < 0:
+                    raise ValueError(
+                        f"Invalid value in 'Cases' section: {case_name} = {case_owned}"
+                    )
+            for capsule_section in CAPSULE_INFO:
+                for capsule_name, capsule_owned in self.config.items(capsule_section):
+                    if int(capsule_owned) < 0:
+                        raise ValueError(
+                            f"Invalid value in '{capsule_section}' section: {capsule_name} = {capsule_owned}"
+                        )
+        except ValueError as error:
+            if "Invalid " in str(error):
+                raise
+            raise ValueError("Invalid value type. All values must be integers.") from error
+
+    def _validate_config(self):
+        """
+        Validate the configuration file to ensure all required sections exist with the
+        right values.
+
+        :raises ValueError: If any required section is missing or if any value is
+            invalid.
+        """
+        self._validate_config_sections()
+        self._validate_config_values()
+
     def parse_config(self):
-        """Parse the configuration file to read settings and user-owned items."""
+        """
+        Parse the configuration file to read settings and user-owned items.
+
+        Sets self.valid_config to True if the configuration is valid, and False if it is
+        not.
+        """
         self.config = ConfigParser(interpolation=None)
         self.config.read(CONFIG_FILE)
+        try:
+            self._validate_config()
+            self.valid_config = True
+        except ValueError as error:
+            self.console.print(f"[bold red][!] Configuration error: {error}")
+            self.valid_config = False
 
     def _start_session(self):
         """Start a requests session with custom headers and retry logic."""
@@ -80,29 +143,15 @@ class Scraper:
         """Scrape prices for capsules and cases, calculate totals in USD and EUR, and
         print/save the results.
         """
-        capsule_usd_total = 0
-        try:
-            capsule_usd_total = self.scrape_capsule_section_prices()
-        except (RequestException, AttributeError, RetryError, ValueError):
+        if not self.valid_config:
             self.console.print(
-                "[bold red][!] Failed to scrape capsule prices. (Consider using proxies to prevent rate limiting)\n"
+                "[bold red][!] Invalid configuration. Please fix the config file before running."
             )
+            return
 
-        case_usd_total = 0
-        try:
-            case_usd_total = self._scrape_case_prices()
-        except (RequestException, AttributeError, RetryError, ValueError):
-            self.console.print(
-                "[bold red][!] Failed to scrape case prices. (Consider using proxies to prevent rate limiting)\n"
-            )
-
-        custom_item_usd_total = 0
-        try:
-            custom_item_usd_total = self._scrape_custom_item_prices()
-        except (RequestException, AttributeError, RetryError, ValueError):
-            self.console.print(
-                "[bold red][!] Failed to scrape custom item prices. (Consider using proxies to prevent rate limiting)\n"
-            )
+        capsule_usd_total = self._scrape_capsule_section_prices()
+        case_usd_total = self._scrape_case_prices()
+        custom_item_usd_total = self._scrape_custom_item_prices()
 
         self.usd_total += capsule_usd_total
         self.usd_total += case_usd_total
@@ -283,6 +332,7 @@ class Scraper:
         use_proxy = self.config.getboolean("App Settings", "use_proxy", fallback=False)
         api_key = self.config.get("User Settings", "api_key", fallback=None)
         api_key = None if api_key in ("None", "") else api_key
+
         if use_proxy and api_key:
             page = self.session.get(
                 url=url,
@@ -296,8 +346,9 @@ class Scraper:
             page = self.session.get(url)
 
         if not page.ok or not page.content:
-            status = page.status_code
-            self.console.print(f"[bold red][!] Failed to load page ({status}). Retrying...\n")
+            self.console.print(
+                f"[bold red][!] Failed to load page ({page.status_code}). Retrying...\n"
+            )
             raise RequestException(f"Failed to load page: {url}")
 
         return page
@@ -343,23 +394,32 @@ class Scraper:
         self.console.print(f"[bold magenta]{capsule_title}\n")
 
         capsule_usd_total = 0
-        capsule_page = self._get_page(capsule_info["page"])
-        for capsule_name, capsule_href in zip(capsule_info["names"], capsule_info["items"]):
-            config_capsule_name = capsule_name.replace(" ", "_")
-            owned = self.config.getint(capsule_section, config_capsule_name, fallback=0)
-            if owned == 0:
-                continue
-
-            price_usd = self._parse_item_price(capsule_page, capsule_href)
-            price_usd_owned = round(float(owned * price_usd), 2)
-
-            self.console.print(f"[bold deep_sky_blue4]{capsule_name}")
-            self.console.print(PRICE_INFO.format(owned, price_usd, price_usd_owned))
-            capsule_usd_total += price_usd_owned
+        try:
+            capsule_page = self._get_page(capsule_info["page"])
+            for capsule_name, capsule_href in zip(capsule_info["names"], capsule_info["items"]):
+                config_capsule_name = capsule_name.replace(" ", "_")
+                owned = self.config.getint(capsule_section, config_capsule_name, fallback=0)
+                if owned == 0:
+                    continue
+
+                price_usd = self._parse_item_price(capsule_page, capsule_href)
+                price_usd_owned = round(float(owned * price_usd), 2)
+
+                self.console.print(f"[bold deep_sky_blue4]{capsule_name}")
+                self.console.print(PRICE_INFO.format(owned, price_usd, price_usd_owned))
+                capsule_usd_total += price_usd_owned
+        except (RetryError, ValueError):
+            self.console.print(
+                "[bold red][!] Failed to scrape capsule prices. (Consider using proxies to prevent rate limiting)\n"
+            )
+        except Exception as error:
+            self.console.print(
+                f"[bold red][!] An unexpected error occurred while scraping capsule prices: {error}\n"
+            )
 
         return capsule_usd_total
 
-    def scrape_capsule_section_prices(self):
+    def _scrape_capsule_section_prices(self):
         """Scrape prices for all capsule sections defined in the configuration."""
         capsule_usd_total = 0
         for capsule_section, capsule_info in CAPSULE_INFO.items():
@@ -369,6 +429,19 @@ class Scraper:
 
         return capsule_usd_total
 
+    def _market_page_from_href(self, item_href):
+        """
+        Convert an href of a Steam Community Market item to a market page URL.
+
+        :param item_href: The href of the item listing, typically ending with the item's
+            name.
+        :return: A URL string for the Steam Community Market page of the item.
+        """
+        url_encoded_name = item_href.split("/")[-1]
+        page_url = f"https://steamcommunity.com/market/search?q={url_encoded_name}"
+
+        return page_url
+
     def _scrape_case_prices(self):
         """
         Scrape prices for all cases defined in the configuration.
@@ -385,34 +458,28 @@ class Scraper:
             case_title = case_name.center(MAX_LINE_LEN, SEPARATOR)
             self.console.print(f"[bold magenta]{case_title}\n")
 
-            case_page = self._get_page(CASE_PAGES[case_index])
-            price_usd = self._parse_item_price(case_page, CASE_HREFS[case_index])
-            price_usd_owned = round(float(int(owned) * price_usd), 2)
+            try:
+                case_page_url = self._market_page_from_href(CASE_HREFS[case_index])
+                case_page = self._get_page(case_page_url)
+                price_usd = self._parse_item_price(case_page, CASE_HREFS[case_index])
+                price_usd_owned = round(float(int(owned) * price_usd), 2)
 
-            self.console.print(PRICE_INFO.format(owned, price_usd, price_usd_owned))
-            case_usd_total += price_usd_owned
+                self.console.print(PRICE_INFO.format(owned, price_usd, price_usd_owned))
+                case_usd_total += price_usd_owned
 
-            if not self.config.getboolean("App Settings", "use_proxy", fallback=False):
-                time.sleep(1)
+                if not self.config.getboolean("App Settings", "use_proxy", fallback=False):
+                    time.sleep(1)
+            except (RetryError, ValueError):
+                self.console.print(
+                    "[bold red][!] Failed to scrape case prices. (Consider using proxies to prevent rate limiting)\n"
+                )
+            except Exception as error:
+                self.console.print(
+                    f"[bold red][!] An unexpected error occurred while scraping case prices: {error}\n"
+                )
 
         return case_usd_total
 
-    def _market_page_from_href(self, item_href):
-        """
-        Convert an href of a Steam Community Market item to a market page URL. This is
-        done by decoding the URL-encoded item name and formatting it into a search URL.
-
-        :param item_href: The href of the item listing, typically ending with the item's
-            name.
-        :return: A URL string for the Steam Community Market page of the item.
-        """
-        url_encoded_name = item_href.split("/")[-1]
-        decoded_name = unquote(url_encoded_name)
-        decoded_name_query = decoded_name.lower().replace(" ", "+")
-        page_url = f"https://steamcommunity.com/market/search?q={decoded_name_query}"
-
-        return page_url
-
     def _scrape_custom_item_prices(self):
         """
         Scrape prices for custom items defined in the configuration.
@@ -422,12 +489,6 @@ class Scraper:
         """
         custom_item_usd_total = 0
         for config_custom_item_name, owned_and_href in self.config.items("Custom Items"):
-            if " " not in owned_and_href:
-                self.console.print(
-                    "[bold red][!] Invalid custom item format (<item_name> = <owned_count> <item_url>)\n"
-                )
-                continue
-
             owned, custom_item_href = owned_and_href.split(" ", 1)
             if int(owned) == 0:
                 continue
@@ -436,16 +497,25 @@ class Scraper:
             custom_item_title = custom_item_name.center(MAX_LINE_LEN, SEPARATOR)
             self.console.print(f"[bold magenta]{custom_item_title}\n")
 
-            custom_item_page_url = self._market_page_from_href(custom_item_href)
-            custom_item_page = self._get_page(custom_item_page_url)
-            price_usd = self._parse_item_price(custom_item_page, custom_item_href)
-            price_usd_owned = round(float(int(owned) * price_usd), 2)
+            try:
+                custom_item_page_url = self._market_page_from_href(custom_item_href)
+                custom_item_page = self._get_page(custom_item_page_url)
+                price_usd = self._parse_item_price(custom_item_page, custom_item_href)
+                price_usd_owned = round(float(int(owned) * price_usd), 2)
 
-            self.console.print(PRICE_INFO.format(owned, price_usd, price_usd_owned))
-            custom_item_usd_total += price_usd_owned
+                self.console.print(PRICE_INFO.format(owned, price_usd, price_usd_owned))
+                custom_item_usd_total += price_usd_owned
 
-            if not self.config.getboolean("App Settings", "use_proxy", fallback=False):
-                time.sleep(1)
+                if not self.config.getboolean("App Settings", "use_proxy", fallback=False):
+                    time.sleep(1)
+            except (RetryError, ValueError):
+                self.console.print(
+                    "[bold red][!] Failed to scrape custom item prices. (Consider using proxies to prevent rate limiting)\n"
+                )
+            except Exception as error:
+                self.console.print(
+                    f"[bold red][!] An unexpected error occurred while scraping custom item prices: {error}\n"
+                )
 
         return custom_item_usd_total
 

{cs2tracker-2.1.8 → cs2tracker-2.1.9}/cs2tracker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cs2tracker
-Version: 2.1.8
+Version: 2.1.9
 Summary: Tracking the steam market prices of CS2 items
 Home-page: https://github.com/ashiven/cs2tracker
 Author: Jannik Novak