cs2tracker 2.1.6__py3-none-any.whl → 2.1.8__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.6'
-__version_tuple__ = version_tuple = (2, 1, 6)
+__version__ = version = '2.1.8'
+__version_tuple__ = version_tuple = (2, 1, 8)

cs2tracker/application.py

@@ -1,3 +1,4 @@
+import ctypes
 import tkinter as tk
 from subprocess import Popen
 from threading import Thread
@@ -9,6 +10,7 @@ from matplotlib.dates import DateFormatter
 
 from cs2tracker.constants import (
     CONFIG_FILE,
+    ICON_FILE,
     OS,
     OUTPUT_FILE,
     PYTHON_EXECUTABLE,
@@ -18,8 +20,9 @@ from cs2tracker.constants import (
 )
 from cs2tracker.scraper import Scraper
 
-WINDOW_TITLE = "CS2Tracker"
-WINDOW_SIZE = "450x380"
+APPLICATION_NAME = "CS2Tracker"
+
+WINDOW_SIZE = "500x450"
 BACKGROUND_COLOR = "#1e1e1e"
 BUTTON_COLOR = "#3c3f41"
 BUTTON_HOVER_COLOR = "#505354"
@@ -27,9 +30,8 @@ BUTTON_ACTIVE_COLOR = "#5c5f61"
 FONT_STYLE = "Segoe UI"
 FONT_COLOR = "white"
 
-SCRAPER_WINDOW_TITLE = "CS2Tracker"
 SCRAPER_WINDOW_HEIGHT = 40
-SCRAPER_WINDOW_WIDTH = 100
+SCRAPER_WINDOW_WIDTH = 120
 SCRAPER_WINDOW_BACKGROUND_COLOR = "Black"
 
 
@@ -58,21 +60,42 @@ class Application:
         button.bind("<Leave>", lambda _: button.config(bg=BUTTON_COLOR))
         return button
 
+    def _add_checkbox(self, frame, text, variable, command):
+        checkbox = tk.Checkbutton(
+            frame,
+            text=text,
+            variable=variable,
+            command=command,
+            bg=BACKGROUND_COLOR,
+            fg=FONT_COLOR,
+            selectcolor=BUTTON_COLOR,
+            activebackground=BACKGROUND_COLOR,
+            font=(FONT_STYLE, 10),
+            anchor="w",
+            padx=20,
+        )
+        checkbox.pack(fill="x", anchor="w", pady=2)
+
     def _configure_window(self):
         """Configure the main application window UI and add buttons for the main
         functionalities.
         """
         window = tk.Tk()
-        window.title(WINDOW_TITLE)
+        window.title(APPLICATION_NAME)
         window.geometry(WINDOW_SIZE)
         window.configure(bg=BACKGROUND_COLOR)
+        if OS == OSType.WINDOWS:
+            app_id = "cs2tracker.unique.id"
+            ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(app_id)
+        icon = tk.PhotoImage(file=ICON_FILE)
+        window.wm_iconphoto(False, icon)
 
         frame = tk.Frame(window, bg=BACKGROUND_COLOR, padx=30, pady=30)
         frame.pack(expand=True, fill="both")
 
         label = tk.Label(
             frame,
-            text=f"Welcome to {WINDOW_TITLE}!",
+            text=f"Welcome to {APPLICATION_NAME}!",
             font=(FONT_STYLE, 16, "bold"),
             fg=FONT_COLOR,
             bg=BACKGROUND_COLOR,
@@ -84,30 +107,46 @@ class Application:
         self._add_button(frame, "Show History (Chart)", self._draw_plot)
         self._add_button(frame, "Show History (File)", self._edit_log_file)
 
+        checkbox_frame = tk.Frame(frame, bg=BACKGROUND_COLOR)
+        checkbox_frame.pack(pady=(20, 0), fill="x")
+
         background_checkbox_value = tk.BooleanVar(value=self.scraper.identify_background_task())
-        background_checkbox = tk.Checkbutton(
-            frame,
-            text="Daily Background Calculation",
-            variable=background_checkbox_value,
-            command=lambda: self._toggle_background_task(background_checkbox_value.get()),
-            bg=BACKGROUND_COLOR,
-            fg=FONT_COLOR,
-            selectcolor=BUTTON_COLOR,
-            activebackground=BACKGROUND_COLOR,
-            font=(FONT_STYLE, 10),
+        self._add_checkbox(
+            checkbox_frame,
+            "Daily Background Calculations",
+            background_checkbox_value,
+            lambda: self._toggle_background_task(background_checkbox_value.get()),
+        )
+
+        discord_webhook_checkbox_value = tk.BooleanVar(
+            value=self.scraper.config.getboolean(
+                "App Settings", "discord_notifications", fallback=False
+            )
+        )
+        self._add_checkbox(
+            checkbox_frame,
+            "Receive Discord Notifications",
+            discord_webhook_checkbox_value,
+            lambda: self._toggle_discord_webhook(discord_webhook_checkbox_value.get()),
+        )
+
+        use_proxy_checkbox_value = tk.BooleanVar(
+            value=self.scraper.config.getboolean("App Settings", "use_proxy", fallback=False)
+        )
+        self._add_checkbox(
+            checkbox_frame,
+            "Proxy Requests",
+            use_proxy_checkbox_value,
+            lambda: self._toggle_use_proxy(use_proxy_checkbox_value.get()),
         )
-        background_checkbox.pack(pady=20)
 
         return window
 
     def _construct_scraper_command_windows(self):
         """Construct the command to run the scraper in a new window for Windows."""
-        set_utf8_encoding = (
-            "[Console]::InputEncoding = [Console]::OutputEncoding = [System.Text.Encoding]::UTF8;"
-        )
         get_size = "$size = $Host.UI.RawUI.WindowSize;"
         set_size = "$Host.UI.RawUI.WindowSize = $size;"
-        set_window_title = f"$Host.UI.RawUI.WindowTitle = '{SCRAPER_WINDOW_TITLE}';"
+        set_window_title = f"$Host.UI.RawUI.WindowTitle = '{APPLICATION_NAME}';"
         set_window_width = (
             f"$size.Width = [Math]::Min({SCRAPER_WINDOW_WIDTH}, $Host.UI.RawUI.BufferSize.Width);"
         )
@@ -125,7 +164,6 @@ class Application:
 
         cmd = (
             'start powershell -NoExit -Command "& {'
-            + set_utf8_encoding
             + set_window_title
             + get_size
             + set_window_width
@@ -189,6 +227,14 @@ class Application:
         """Toggle whether a daily price calculation should run in the background."""
         self.scraper.toggle_background_task(enabled)
 
+    def _toggle_use_proxy(self, enabled: bool):
+        """Toggle whether the scraper should use proxy servers for requests."""
+        self.scraper.toggle_use_proxy(enabled)
+
+    def _toggle_discord_webhook(self, enabled: bool):
+        """Toggle whether the scraper should send notifications to a Discord webhook."""
+        self.scraper.toggle_discord_webhook(enabled)
+
 
 def _popen_and_call(popen_args, callback):
     """

cs2tracker/constants.py

@@ -6,8 +6,10 @@ from shutil import copy
 
 try:
     from cs2tracker._version import version  # pylint: disable=E0611
+
+    VERSION = f"v{version}"
 except ImportError:
-    version = "0.0.0"
+    VERSION = "latest"
 
 
 class OSType(enum.Enum):
@@ -22,6 +24,7 @@ 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")
@@ -33,6 +36,7 @@ if RUNNING_IN_EXE:
     MEIPASS_DIR = sys._MEIPASS  # type: ignore  pylint: disable=protected-access
     MODULE_DIR = MEIPASS_DIR
     PROJECT_DIR = MEIPASS_DIR
+    ICON_FILE = os.path.join(PROJECT_DIR, "assets", "icon.png")
     CONFIG_FILE_SOURCE = os.path.join(MODULE_DIR, "data", "config.ini")
     OUTPUT_FILE_SOURCE = os.path.join(MODULE_DIR, "data", "output.csv")
 
@@ -60,7 +64,7 @@ BANNER = """
 
 """
 AUTHOR_STRING = (
-    f"Version: v{version} - {datetime.today().strftime('%Y/%m/%d')} - Jannik Novak @ashiven\n"
+    f"Version: {VERSION} - {datetime.today().strftime('%Y/%m/%d')} - Jannik Novak @ashiven\n"
 )
 
 

cs2tracker/data/config.ini

@@ -1,198 +1,205 @@
-[Settings]
-Use_Proxy = False
-API_Key = None
+[User Settings]
+api_key = None
+discord_webhook_url = None
+
+[App Settings]
+use_proxy = False
+discord_notifications = False
+
+[Custom Items]
+copenhagen_flames_gold_2022 = 0 https://steamcommunity.com/market/listings/730/Sticker%20%7C%20Copenhagen%20Flames%20%28Gold%29%20%7C%20Antwerp%202022
 
 [Cases]
-Revolution_Case = 0
-Recoil_Case = 0
-Dreams_And_Nightmares_Case = 0
-Operation_Riptide_Case = 0
-Snakebite_Case = 0
-Operation_Broken_Fang_Case = 0
-Fracture_Case = 0
-Chroma_Case = 0
-Chroma_2_Case = 0
-Chroma_3_Case = 0
-Clutch_Case = 0
-CSGO_Weapon_Case = 0
-CSGO_Weapon_Case_2 = 0
-CSGO_Weapon_Case_3 = 0
-CS20_Case = 0
-Danger_Zone_Case = 0
-eSports_2013_Case = 0
-eSports_2013_Winter_Case = 0
-eSports_2014_Summer_Case = 0
-Falchion_Case = 0
-Gamma_Case = 0
-Gamma_2_Case = 0
-Glove_Case = 0
-Horizon_Case = 0
-Huntsman_Case = 0
-Operation_Bravo_Case = 0
-Operation_Breakout_Case = 0
-Operation_Hydra_Case = 0
-Operation_Phoenix_Case = 0
-Operation_Vanguard_Case = 0
-Operation_Wildfire_Case = 0
-Prisma_Case = 0
-Prisma_2_Case = 0
-Revolver_Case = 0
-Shadow_Case = 0
-Shattered_Web_Case = 0
-Spectrum_Case = 0
-Spectrum_2_Case = 0
-Winter_Offensive_Case = 0
-Kilowatt_Case = 0
-Gallery_Case = 0
-Fever_Case = 0
+revolution_case = 0
+recoil_case = 0
+dreams_and_nightmares_case = 0
+operation_riptide_case = 0
+snakebite_case = 0
+operation_broken_fang_case = 0
+fracture_case = 0
+chroma_case = 0
+chroma_2_case = 0
+chroma_3_case = 0
+clutch_case = 0
+csgo_weapon_case = 0
+csgo_weapon_case_2 = 0
+csgo_weapon_case_3 = 0
+cs20_case = 0
+danger_zone_case = 0
+esports_2013_case = 0
+esports_2013_winter_case = 0
+esports_2014_summer_case = 0
+falchion_case = 0
+gamma_case = 0
+gamma_2_case = 0
+glove_case = 0
+horizon_case = 0
+huntsman_case = 0
+operation_bravo_case = 0
+operation_breakout_case = 0
+operation_hydra_case = 0
+operation_phoenix_case = 0
+operation_vanguard_case = 0
+operation_wildfire_case = 0
+prisma_case = 0
+prisma_2_case = 0
+revolver_case = 0
+shadow_case = 0
+shattered_web_case = 0
+spectrum_case = 0
+spectrum_2_case = 0
+winter_offensive_case = 0
+kilowatt_case = 0
+gallery_case = 0
+fever_case = 0
 
 [Katowice 2014 Sticker Capsule]
-Katowice_Legends = 0
-Katowice_Challengers = 0
+katowice_legends = 0
+katowice_challengers = 0
 
 [Cologne 2014 Sticker Capsule]
-Cologne_Legends = 0
-Cologne_Challengers = 0
+cologne_legends = 0
+cologne_challengers = 0
 
 [DreamHack 2014 Sticker Capsule]
-DreamHack_Legends = 0
+dreamhack_legends = 0
 
 [Katowice 2015 Sticker Capsule]
-Katowice_Legends = 0
-Katowice_Challengers = 0
+katowice_legends = 0
+katowice_challengers = 0
 
 [Cologne 2015 Sticker Capsule]
-Cologne_Legends = 0
-Cologne_Challengers = 0
+cologne_legends = 0
+cologne_challengers = 0
 
 [Cluj-Napoca 2015 Sticker Capsule]
-Cluj_Napoca_Legends = 0
-Cluj_Napoca_Challengers = 0
-Cluj_Napoca_Legends_Autographs = 0
-Cluj_Napoca_Challengers_Autographs = 0
+cluj_napoca_legends = 0
+cluj_napoca_challengers = 0
+cluj_napoca_legends_autographs = 0
+cluj_napoca_challengers_autographs = 0
 
 [Columbus 2016 Sticker Capsule]
-Columbus_Legends = 0
-Columbus_Challengers = 0
-Columbus_Legends_Autographs = 0
-Columbus_Challengers_Autographs = 0
+columbus_legends = 0
+columbus_challengers = 0
+columbus_legends_autographs = 0
+columbus_challengers_autographs = 0
 
 [Cologne 2016 Sticker Capsule]
-Cologne_Legends = 0
-Cologne_Challengers = 0
-Cologne_Legends_Autographs = 0
-Cologne_Challengers_Autographs = 0
+cologne_legends = 0
+cologne_challengers = 0
+cologne_legends_autographs = 0
+cologne_challengers_autographs = 0
 
 [Atlanta 2017 Sticker Capsule]
-Atlanta_Legends = 0
-Atlanta_Challengers = 0
-Atlanta_Legends_Autographs = 0
-Atlanta_Challengers_Autographs = 0
+atlanta_legends = 0
+atlanta_challengers = 0
+atlanta_legends_autographs = 0
+atlanta_challengers_autographs = 0
 
 [Krakow 2017 Sticker Capsule]
-Krakow_Legends = 0
-Krakow_Challengers = 0
-Krakow_Legends_Autographs = 0
-Krakow_Challengers_Autographs = 0
+krakow_legends = 0
+krakow_challengers = 0
+krakow_legends_autographs = 0
+krakow_challengers_autographs = 0
 
 [Boston 2018 Sticker Capsule]
-Boston_Legends = 0
-Boston_Minor_Challengers = 0
-Boston_Returning_Challengers = 0
-Boston_Attending_Legends = 0
-Boston_Minor_Challengers_with_Flash_Gaming = 0
-Boston_Legends_Autographs = 0
-Boston_Minor_Challengers_Autographs = 0
-Boston_Returning_Challengers_Autographs = 0
-Boston_Attending_Legends_Autographs = 0
-Boston_Minor_Challengers_with_Flash_Gaming_Autographs = 0
+boston_legends = 0
+boston_minor_challengers = 0
+boston_returning_challengers = 0
+boston_attending_legends = 0
+boston_minor_challengers_with_flash_gaming = 0
+boston_legends_autographs = 0
+boston_minor_challengers_autographs = 0
+boston_returning_challengers_autographs = 0
+boston_attending_legends_autographs = 0
+boston_minor_challengers_with_flash_gaming_autographs = 0
 
 [London 2018 Sticker Capsule]
-London_Legends = 0
-London_Minor_Challengers = 0
-London_Returning_Challengers = 0
-London_Legends_Autographs = 0
-London_Minor_Challengers_Autographs = 0
-London_Returning_Challengers_Autographs = 0
+london_legends = 0
+london_minor_challengers = 0
+london_returning_challengers = 0
+london_legends_autographs = 0
+london_minor_challengers_autographs = 0
+london_returning_challengers_autographs = 0
 
 [Katowice 2019 Sticker Capsule]
-Katowice_Legends = 0
-Katowice_Minor_Challengers = 0
-Katowice_Returning_Challengers = 0
-Katowice_Legends_Autographs = 0
-Katowice_Minor_Challengers_Autographs = 0
-Katowice_Returning_Challengers_Autographs = 0
+katowice_legends = 0
+katowice_minor_challengers = 0
+katowice_returning_challengers = 0
+katowice_legends_autographs = 0
+katowice_minor_challengers_autographs = 0
+katowice_returning_challengers_autographs = 0
 
 [Berlin 2019 Sticker Capsule]
-Berlin_Legends = 0
-Berlin_Minor_Challengers = 0
-Berlin_Returning_Challengers = 0
-Berlin_Legends_Autographs = 0
-Berlin_Minor_Challengers_Autographs = 0
-Berlin_Returning_Challengers_Autographs = 0
+berlin_legends = 0
+berlin_minor_challengers = 0
+berlin_returning_challengers = 0
+berlin_legends_autographs = 0
+berlin_minor_challengers_autographs = 0
+berlin_returning_challengers_autographs = 0
 
 [2020 RMR Sticker Capsule]
-RMR_Legends = 0
-RMR_Challengers = 0
-RMR_Contenders = 0
+rmr_legends = 0
+rmr_challengers = 0
+rmr_contenders = 0
 
 [Stockholm 2021 Sticker Capsule]
-Stockholm_Legends = 0
-Stockholm_Challengers = 0
-Stockholm_Contenders = 0
-Stockholm_Champions_Autographs = 0
-Stockholm_Finalists_Autographs = 0
+stockholm_legends = 0
+stockholm_challengers = 0
+stockholm_contenders = 0
+stockholm_champions_autographs = 0
+stockholm_finalists_autographs = 0
 
 [Antwerp 2022 Sticker Capsule]
-Antwerp_Legends = 0
-Antwerp_Challengers = 0
-Antwerp_Contenders = 0
-Antwerp_Champions_Autographs = 0
-Antwerp_Challengers_Autographs = 0
-Antwerp_Legends_Autographs = 0
-Antwerp_Contenders_Autographs = 0
+antwerp_legends = 0
+antwerp_challengers = 0
+antwerp_contenders = 0
+antwerp_champions_autographs = 0
+antwerp_challengers_autographs = 0
+antwerp_legends_autographs = 0
+antwerp_contenders_autographs = 0
 
 [Rio 2022 Sticker Capsule]
-Rio_Legends = 0
-Rio_Challengers = 0
-Rio_Contenders = 0
-Rio_Champions_Autographs = 0
-Rio_Challengers_Autographs = 0
-Rio_Legends_Autographs = 0
-Rio_Contenders_Autographs = 0
+rio_legends = 0
+rio_challengers = 0
+rio_contenders = 0
+rio_champions_autographs = 0
+rio_challengers_autographs = 0
+rio_legends_autographs = 0
+rio_contenders_autographs = 0
 
 [Paris 2023 Sticker Capsule]
-Paris_Legends = 0
-Paris_Challengers = 0
-Paris_Contenders = 0
-Paris_Champions_Autographs = 0
-Paris_Challengers_Autographs = 0
-Paris_Legends_Autographs = 0
-Paris_Contenders_Autographs = 0
+paris_legends = 0
+paris_challengers = 0
+paris_contenders = 0
+paris_champions_autographs = 0
+paris_challengers_autographs = 0
+paris_legends_autographs = 0
+paris_contenders_autographs = 0
 
 [Copenhagen 2024 Sticker Capsule]
-Copenhagen_Legends = 0
-Copenhagen_Challengers = 0
-Copenhagen_Contenders = 0
-Copenhagen_Champions_Autographs = 0
-Copenhagen_Challengers_Autographs = 0
-Copenhagen_Legends_Autographs = 0
-Copenhagen_Contenders_Autographs = 0
+copenhagen_legends = 0
+copenhagen_challengers = 0
+copenhagen_contenders = 0
+copenhagen_champions_autographs = 0
+copenhagen_challengers_autographs = 0
+copenhagen_legends_autographs = 0
+copenhagen_contenders_autographs = 0
 
 [Shanghai 2024 Sticker Capsule]
-Shanghai_Legends = 0
-Shanghai_Challengers = 0
-Shanghai_Contenders = 0
-Shanghai_Champions_Autographs = 0
-Shanghai_Challengers_Autographs = 0
-Shanghai_Legends_Autographs = 0
-Shanghai_Contenders_Autographs = 0
+shanghai_legends = 0
+shanghai_challengers = 0
+shanghai_contenders = 0
+shanghai_champions_autographs = 0
+shanghai_challengers_autographs = 0
+shanghai_legends_autographs = 0
+shanghai_contenders_autographs = 0
 
 [Austin 2025 Sticker Capsule]
-Austin_Legends = 0
-Austin_Challengers = 0
-Austin_Contenders = 0
-Austin_Champions_Autographs = 0
-Austin_Challengers_Autographs = 0
-Austin_Legends_Autographs = 0
-Austin_Contenders_Autographs = 0
+austin_legends = 0
+austin_challengers = 0
+austin_contenders = 0
+austin_champions_autographs = 0
+austin_challengers_autographs = 0
+austin_legends_autographs = 0
+austin_contenders_autographs = 0

cs2tracker/main.py

@@ -3,7 +3,7 @@ import sys
 import urllib3
 
 from cs2tracker.application import Application
-from cs2tracker.constants import AUTHOR_STRING, BANNER
+from cs2tracker.constants import AUTHOR_STRING, BANNER, OS, OSType
 from cs2tracker.padded_console import PaddedConsole
 from cs2tracker.scraper import Scraper
 
@@ -19,6 +19,10 @@ def main():
     # Disable warnings for proxy requests
     urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
+    # Set output encoding to UTF-8 with BOM for Windows compatibility
+    if OS == OSType.WINDOWS and sys.stdout is not None:
+        sys.stdout.reconfigure(encoding="utf-8-sig")  # type: ignore
+
     console = PaddedConsole()
     console.print(f"[bold yellow]{BANNER}\n{AUTHOR_STRING}\n")
 

cs2tracker/scraper.py

@@ -4,6 +4,7 @@ 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
@@ -36,6 +37,10 @@ PRICE_INFO = "Owned: {:<10}  Steam market price: ${:<10}  Total: ${:<10}\n"
 HTTP_PROXY_URL = "http://{}:@smartproxy.crawlbase.com:8012"
 HTTPS_PROXY_URL = "http://{}:@smartproxy.crawlbase.com:8012"
 
+DC_WEBHOOK_USERNAME = "CS2Tracker"
+DC_WEBHOOK_AVATAR_URL = "https://img.icons8.com/?size=100&id=uWQJp2tLXUH6&format=png&color=000000"
+DC_RECENT_HISTORY_LIMIT = 5
+
 WIN_BACKGROUND_TASK_NAME = "CS2Tracker Daily Calculation"
 WIN_BACKGROUND_TASK_SCHEDULE = "DAILY"
 WIN_BACKGROUND_TASK_TIME = "12:00"
@@ -56,7 +61,7 @@ class Scraper:
 
     def parse_config(self):
         """Parse the configuration file to read settings and user-owned items."""
-        self.config = ConfigParser()
+        self.config = ConfigParser(interpolation=None)
         self.config.read(CONFIG_FILE)
 
     def _start_session(self):
@@ -91,12 +96,22 @@ class Scraper:
                 "[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"
+            )
+
         self.usd_total += capsule_usd_total
         self.usd_total += case_usd_total
+        self.usd_total += custom_item_usd_total
         self.eur_total = CurrencyConverter().convert(self.usd_total, "USD", "EUR")
 
         self._print_total()
         self._save_price_log()
+        self._send_discord_notification()
 
         # Reset totals for next run
         self.usd_total, self.eur_total = 0, 0
@@ -122,6 +137,9 @@ class Scraper:
 
         This will append a new entry to the output file if no entry has been made for
         today.
+
+        :raises FileNotFoundError: If the output file does not exist.
+        :raises IOError: If there is an error writing to the output file.
         """
         with open(OUTPUT_FILE, "r", encoding="utf-8") as price_logs:
             price_logs_reader = csv.reader(price_logs)
@@ -157,6 +175,8 @@ class Scraper:
         data is used for drawing the plot of past prices.
 
         :return: A tuple containing three lists: dates, dollar prices, and euro prices.
+        :raises FileNotFoundError: If the output file does not exist.
+        :raises IOError: If there is an error reading the output file.
         """
         dates, dollars, euros = [], [], []
         with open(OUTPUT_FILE, "r", encoding="utf-8") as price_logs:
@@ -173,6 +193,82 @@ class Scraper:
 
         return dates, dollars, euros
 
+    def _construct_recent_calculations_embeds(self):
+        """
+        Construct the embeds for the Discord message that will be sent after a price
+        calculation has been made.
+
+        :return: A list of embeds for the Discord message.
+        """
+        dates, usd_logs, eur_logs = self.read_price_log()
+        dates, usd_logs, eur_logs = reversed(dates), reversed(usd_logs), reversed(eur_logs)
+
+        date_history, usd_history, eur_history = [], [], []
+        for date, usd_log, eur_log in zip(dates, usd_logs, eur_logs):
+            if len(date_history) >= DC_RECENT_HISTORY_LIMIT:
+                break
+            date_history.append(date.strftime("%Y-%m-%d"))
+            usd_history.append(f"${usd_log:.2f}")
+            eur_history.append(f"€{eur_log:.2f}")
+
+        date_history = "\n".join(date_history)
+        usd_history = "\n".join(usd_history)
+        eur_history = "\n".join(eur_history)
+
+        embeds = [
+            {
+                "title": "📊 Recent Price History",
+                "color": 5814783,
+                "fields": [
+                    {
+                        "name": "Date",
+                        "value": date_history,
+                        "inline": True,
+                    },
+                    {
+                        "name": "USD Total",
+                        "value": usd_history,
+                        "inline": True,
+                    },
+                    {
+                        "name": "EUR Total",
+                        "value": eur_history,
+                        "inline": True,
+                    },
+                ],
+            }
+        ]
+
+        return embeds
+
+    def _send_discord_notification(self):
+        """Send a message to a Discord webhook if notifications are enabled in the
+        config file and a webhook URL is provided.
+        """
+        discord_notifications = self.config.getboolean(
+            "App Settings", "discord_notifications", fallback=False
+        )
+        webhook_url = self.config.get("User Settings", "discord_webhook_url", fallback=None)
+        webhook_url = None if webhook_url in ("None", "") else webhook_url
+
+        if discord_notifications and webhook_url:
+            embeds = self._construct_recent_calculations_embeds()
+            try:
+                response = self.session.post(
+                    url=webhook_url,
+                    json={
+                        "embeds": embeds,
+                        "username": DC_WEBHOOK_USERNAME,
+                        "avatar_url": DC_WEBHOOK_AVATAR_URL,
+                    },
+                )
+                response.raise_for_status()
+                self.console.print("[bold steel_blue3][+] Discord notification sent.\n")
+            except RequestException as error:
+                self.console.print(f"[bold red][!] Failed to send Discord notification: {error}\n")
+            except Exception as error:
+                self.console.print(f"[bold red][!] An unexpected error occurred: {error}\n")
+
     @retry(stop=stop_after_attempt(10))
     def _get_page(self, url):
         """
@@ -184,8 +280,8 @@ class Scraper:
         :raises RequestException: If the request fails.
         :raises RetryError: If the retry limit is reached.
         """
-        use_proxy = self.config.getboolean("Settings", "Use_Proxy", fallback=False)
-        api_key = self.config.get("Settings", "API_Key", fallback=None)
+        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(
@@ -206,26 +302,26 @@ class Scraper:
 
         return page
 
-    def _parse_capsule_price(self, capsule_page, capsule_href):
+    def _parse_item_price(self, item_page, item_href):
         """
-        Parse the price of a capsule from the given page and href.
+        Parse the price of an item from the given steamcommunity market page and item
+        href.
 
-        :param capsule_page: The HTTP response object containing the capsule page
-            content.
-        :param capsule_href: The href of the capsule listing to find the price for.
-        :return: The price of the capsule as a float.
-        :raises ValueError: If the capsule listing or price span cannot be found.
+        :param item_page: The HTTP response object containing the item page content.
+        :param item_href: The href of the item listing to find the price for.
+        :return: The price of the item as a float.
+        :raises ValueError: If the item listing or price span cannot be found.
         """
-        capsule_soup = BeautifulSoup(capsule_page.content, "html.parser")
-        capsule_listing = capsule_soup.find("a", attrs={"href": f"{capsule_href}"})
-        if not isinstance(capsule_listing, Tag):
-            raise ValueError(f"Failed to find capsule listing: {capsule_href}")
+        item_soup = BeautifulSoup(item_page.content, "html.parser")
+        item_listing = item_soup.find("a", attrs={"href": f"{item_href}"})
+        if not isinstance(item_listing, Tag):
+            raise ValueError(f"Failed to find item listing: {item_href}")
 
-        price_span = capsule_listing.find("span", attrs={"class": "normal_price"})
-        if not isinstance(price_span, Tag):
-            raise ValueError(f"Failed to find price span in capsule listing: {capsule_href}")
+        item_price_span = item_listing.find("span", attrs={"class": "normal_price"})
+        if not isinstance(item_price_span, Tag):
+            raise ValueError(f"Failed to find price span in item listing: {item_href}")
 
-        price_str = price_span.text.split()[2]
+        price_str = item_price_span.text.split()[2]
         price = float(price_str.replace("$", ""))
 
         return price
@@ -244,7 +340,7 @@ class Scraper:
             hrefs, and names.
         """
         capsule_title = capsule_section.center(MAX_LINE_LEN, SEPARATOR)
-        self.console.print(f"[bold magenta]{capsule_title}")
+        self.console.print(f"[bold magenta]{capsule_title}\n")
 
         capsule_usd_total = 0
         capsule_page = self._get_page(capsule_info["page"])
@@ -254,7 +350,7 @@ class Scraper:
             if owned == 0:
                 continue
 
-            price_usd = self._parse_capsule_price(capsule_page, capsule_href)
+            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}")
@@ -273,29 +369,6 @@ class Scraper:
 
         return capsule_usd_total
 
-    def _parse_case_price(self, case_page, case_href):
-        """
-        Parse the price of a case from the given page and href.
-
-        :param case_page: The HTTP response object containing the case page content.
-        :param case_href: The href of the case listing to find the price for.
-        :return: The price of the case as a float.
-        :raises ValueError: If the case listing or price span cannot be found.
-        """
-        case_soup = BeautifulSoup(case_page.content, "html.parser")
-        case_listing = case_soup.find("a", attrs={"href": case_href})
-        if not isinstance(case_listing, Tag):
-            raise ValueError(f"Failed to find case listing: {case_href}")
-
-        price_class = case_listing.find("span", attrs={"class": "normal_price"})
-        if not isinstance(price_class, Tag):
-            raise ValueError(f"Failed to find price class in case listing: {case_href}")
-
-        price_str = price_class.text.split()[2]
-        price = float(price_str.replace("$", ""))
-
-        return price
-
     def _scrape_case_prices(self):
         """
         Scrape prices for all cases defined in the configuration.
@@ -310,20 +383,72 @@ class Scraper:
 
             case_name = config_case_name.replace("_", " ").title()
             case_title = case_name.center(MAX_LINE_LEN, SEPARATOR)
-            self.console.print(f"[bold magenta]{case_title}")
+            self.console.print(f"[bold magenta]{case_title}\n")
 
             case_page = self._get_page(CASE_PAGES[case_index])
-            price_usd = self._parse_case_price(case_page, CASE_HREFS[case_index])
+            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
 
-            if not self.config.getboolean("Settings", "Use_Proxy", fallback=False):
+            if not self.config.getboolean("App Settings", "use_proxy", fallback=False):
                 time.sleep(1)
 
         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.
+
+        For each custom item, it prints the item name, owned count, price per item, and
+        total price for owned items.
+        """
+        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
+
+            custom_item_name = config_custom_item_name.replace("_", " ").title()
+            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)
+
+            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)
+
+        return custom_item_usd_total
+
     def identify_background_task(self):
         """
         Search the OS for a daily background task that runs the scraper.
@@ -406,6 +531,35 @@ class Scraper:
             # TODO: implement toggle for cron jobs
             pass
 
+    def toggle_use_proxy(self, enabled: bool):
+        """
+        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.config.set("App Settings", "use_proxy", str(enabled))
+        with open(CONFIG_FILE, "w", encoding="utf-8") as config_file:
+            self.config.write(config_file)
+
+        self.console.print(
+            f"[bold green]{'[+] Enabled' if enabled else '[-] Disabled'} proxy usage for requests."
+        )
+
+    def toggle_discord_webhook(self, enabled: bool):
+        """
+        Toggle the use of a Discord webhook to notify users of price calculations.
+
+        :param enabled: If True, the webhook will be used; if False, it will not be
+            used.
+        """
+        self.config.set("App Settings", "discord_notifications", str(enabled))
+        with open(CONFIG_FILE, "w", encoding="utf-8") as config_file:
+            self.config.write(config_file)
+
+        self.console.print(
+            f"[bold green]{'[+] Enabled' if enabled else '[-] Disabled'} Discord webhook notifications."
+        )
+
 
 if __name__ == "__main__":
     scraper = Scraper()

{cs2tracker-2.1.6.dist-info → cs2tracker-2.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cs2tracker
-Version: 2.1.6
+Version: 2.1.8
 Summary: Tracking the steam market prices of CS2 items
 Home-page: https://github.com/ashiven/cs2tracker
 Author: Jannik Novak
@@ -40,12 +40,13 @@ Dynamic: license-file
 
 ### Prerequisites
 
-- Download and install the latest versions of [Python](https://www.python.org/downloads/) and [Pip](https://pypi.org/project/pip/). (Required for Linux)
+- Download and install the latest versions of [Python](https://www.python.org/downloads/) and [Pip](https://pypi.org/project/pip/). (Required on Linux)
 - Register for the [Crawlbase Smart Proxy API](https://crawlbase.com/) and retrieve your API key. (Optional)
+- Create a [Discord Webhook](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks) to be notified about recent price updates. (Optional)
 
 ### Setup
 
-#### Windows Executable *(no color support)*
+#### Windows Executable _(no color support)_
 
 - Simply [download the latest executable](https://github.com/ashiven/cs2tracker/releases/latest/download/cs2tracker-windows.zip) and run it.
 
@@ -58,6 +59,7 @@ Dynamic: license-file
    ```
 
 2. Run it:
+
    ```bash
    cs2tracker
    ```
@@ -65,10 +67,11 @@ Dynamic: license-file
 ### Options
 
 - `Run!` to gather the current market prices of your items and calculate the total amount in USD and EUR.
-- `Edit Config` to change the specific numbers of each item you own and then save the config file.
+- `Edit Config` to specify the numbers of items owned in the config file. You can also add items other than cases and sticker capsules following the format in the `Custom Items` section. (item_name = item_owned item_page)
 - `Show History` to see a price chart consisting of past calculations. A new data point is generated once a day upon running the program.
-- `Daily Background Calculation` to automatically run a daily calculation of your investment in the background and save the results such that they can later be viewed via `Show History`.
-- If you want to prevent your requests from being rate limited by the steamcommunity server, register for an API key on [Crawlbase](crawlbase.com) and enter it into the `API_Key` field in the config file. This will route every request through a different proxy server.
+- `Daily Background Calculations` to automatically run a daily calculation of your investment in the background and save the results such that they can later be viewed via `Show History`.
+- `Receive Discord Notifications` to receive a notification on your Discord server when 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 file.
+- `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 `api_key` field in the config file.
 
 ---
 

cs2tracker-2.1.8.dist-info/RECORD

@@ -0,0 +1,16 @@
+cs2tracker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cs2tracker/__main__.py,sha256=Ub--oSMv48YzfWF1CZqYlkn1-HvZ7Bhxoc7urn1oY6o,249
+cs2tracker/_version.py,sha256=JNwYT7L17W6XA8Q9TFeLnVI0FvK7eOV1TLduK2unwJc,511
+cs2tracker/application.py,sha256=NpufwEEpe1lXG0KxvfxI2b6vvNQta_uSyN3m7deaTxQ,9018
+cs2tracker/constants.py,sha256=swkxVJQSwvavTorL3t_pBOHLtcgP3SaU9SU98XXuj48,29199
+cs2tracker/main.py,sha256=jXEgZIpM_cDENXOaXCVTg2n50Xso7btI5FImg9BBeXQ,1041
+cs2tracker/padded_console.py,sha256=lPEa34p-8LTmTbpf-2S5uYPaA2UmsIOPq2_UoVhMRgU,674
+cs2tracker/scraper.py,sha256=EhpHR3bHKgo0IgzFN7wAjKfiUwnvLhszXodgx8apvz4,22577
+cs2tracker/data/config.ini,sha256=960jvrTt6ZOwCrHTVC5Q4Uw9lVGNnVRY7-kG6-k_Mig,5197
+cs2tracker/data/output.csv,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cs2tracker-2.1.8.dist-info/licenses/LICENSE.md,sha256=G5wqQ_8KGA808kVuF-Fpu_Yhteg8K_5ux9n2v8eQK7s,1069
+cs2tracker-2.1.8.dist-info/METADATA,sha256=ncKNzK2yKBMWWFB07kH4s4D5aP7O5qrYol-2_QFOIwo,3734
+cs2tracker-2.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cs2tracker-2.1.8.dist-info/entry_points.txt,sha256=K8IwDIkg8QztSB9g9c89B9jR_2pG4QyJGrNs4z5RcZw,63
+cs2tracker-2.1.8.dist-info/top_level.txt,sha256=2HB4xDDOxaU5BDc_yvdi9UlYLgL768n8aR-hRhFM6VQ,11
+cs2tracker-2.1.8.dist-info/RECORD,,

cs2tracker-2.1.6.dist-info/RECORD

@@ -1,16 +0,0 @@
-cs2tracker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs2tracker/__main__.py,sha256=Ub--oSMv48YzfWF1CZqYlkn1-HvZ7Bhxoc7urn1oY6o,249
-cs2tracker/_version.py,sha256=CPOcsx1R_s9lB3K-XQvmbXItD2EvuBASo_a4U-9_vJ0,511
-cs2tracker/application.py,sha256=fuErv6Xit1iZpdjRhcjPqR1EZ8Nw4Yqtg3m8y9V3_vY,7363
-cs2tracker/constants.py,sha256=1rI7GfaEVyPjzX3GLMGUCNkwSJLI0jWmW10wJj2JJME,29042
-cs2tracker/main.py,sha256=-gw0n4Y2kpWyFrRGuK4ZHGTiCcEIlDUDKQGS4tK6gbc,833
-cs2tracker/padded_console.py,sha256=lPEa34p-8LTmTbpf-2S5uYPaA2UmsIOPq2_UoVhMRgU,674
-cs2tracker/scraper.py,sha256=RM7wxZpqawS6opb76zNPU2s1rxNHdDslJlW0NpDRiuQ,16206
-cs2tracker/data/config.ini,sha256=5LUUn1ee5nt8C_ifHxROUsxbT9aSezVqQ5641gkov-I,4945
-cs2tracker/data/output.csv,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs2tracker-2.1.6.dist-info/licenses/LICENSE.md,sha256=G5wqQ_8KGA808kVuF-Fpu_Yhteg8K_5ux9n2v8eQK7s,1069
-cs2tracker-2.1.6.dist-info/METADATA,sha256=2GCEnxRYH6ShZzM2q7a1Uu0kWZy754lWyEr_DvJ44gA,3141
-cs2tracker-2.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cs2tracker-2.1.6.dist-info/entry_points.txt,sha256=K8IwDIkg8QztSB9g9c89B9jR_2pG4QyJGrNs4z5RcZw,63
-cs2tracker-2.1.6.dist-info/top_level.txt,sha256=2HB4xDDOxaU5BDc_yvdi9UlYLgL768n8aR-hRhFM6VQ,11
-cs2tracker-2.1.6.dist-info/RECORD,,