cs2tracker 2.1.10__py3-none-any.whl → 2.1.12__py3-none-any.whl

cs2tracker/{discord_notifier.py → scraper/discord_notifier.py}

@@ -1,8 +1,7 @@
 import requests
 from requests.exceptions import RequestException
 
-from cs2tracker.padded_console import PaddedConsole
-from cs2tracker.price_logs import PriceLogs
+from cs2tracker.util import PaddedConsole, PriceLogs
 
 DC_WEBHOOK_USERNAME = "CS2Tracker"
 DC_WEBHOOK_AVATAR_URL = "https://img.icons8.com/?size=100&id=uWQJp2tLXUH6&format=png&color=000000"

cs2tracker/{scraper.py → scraper/scraper.py}

@@ -1,4 +1,5 @@
 import time
+from datetime import datetime
 from urllib.parse import unquote
 
 from bs4 import BeautifulSoup
@@ -9,10 +10,8 @@ from requests.adapters import HTTPAdapter, Retry
 from tenacity import RetryError, retry, stop_after_attempt
 
 from cs2tracker.constants import AUTHOR_STRING, BANNER, CAPSULE_INFO, CASE_HREFS
-from cs2tracker.discord_notifier import DiscordNotifier
-from cs2tracker.padded_console import PaddedConsole
-from cs2tracker.price_logs import PriceLogs
-from cs2tracker.validated_config import ValidatedConfig
+from cs2tracker.scraper.discord_notifier import DiscordNotifier
+from cs2tracker.util import PaddedConsole, PriceLogs, ValidatedConfig
 
 MAX_LINE_LEN = 72
 SEPARATOR = "-"
@@ -49,9 +48,13 @@ class Scraper:
         self.session.mount("http://", HTTPAdapter(max_retries=retries))
         self.session.mount("https://", HTTPAdapter(max_retries=retries))
 
-    def scrape_prices(self):
-        """Scrape prices for capsules and cases, calculate totals in USD and EUR, and
+    def scrape_prices(self, update_sheet_callback=None):
+        """
+        Scrape prices for capsules and cases, calculate totals in USD and EUR, and
         print/save the results.
+
+        :param update_sheet_callback: Optional callback function to update a tksheet
+            that is displayed in the GUI with the latest scraper price calculation.
         """
         if not self.config.valid:
             console.print(
@@ -59,15 +62,26 @@ class Scraper:
             )
             return
 
-        capsule_usd_total = self._scrape_capsule_section_prices()
-        case_usd_total = self._scrape_case_prices()
-        custom_item_usd_total = self._scrape_custom_item_prices()
+        capsule_usd_total = self._scrape_capsule_section_prices(update_sheet_callback)
+        case_usd_total = self._scrape_case_prices(update_sheet_callback)
+        custom_item_usd_total = self._scrape_custom_item_prices(update_sheet_callback)
 
         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")
 
+        if update_sheet_callback:
+            update_sheet_callback(["", "", "", ""])
+            update_sheet_callback(
+                [
+                    f"[{datetime.now().strftime('%Y-%m-%d')}] Total:",
+                    f"${self.usd_total:.2f}",
+                    f"€{self.eur_total:.2f}",
+                    "",
+                ]
+            )
+
         self._print_total()
         PriceLogs.save(self.usd_total, self.eur_total)
         self._send_discord_notification()
@@ -158,11 +172,7 @@ class Scraper:
 
         return price
 
-    def _scrape_capsule_prices(
-        self,
-        capsule_section,
-        capsule_info,
-    ):
+    def _scrape_capsule_prices(self, capsule_section, capsule_info, update_sheet_callback=None):
         """
         Scrape prices for a specific capsule section, printing the details to the
         console.
@@ -170,6 +180,8 @@ class Scraper:
         :param capsule_section: The section name in the config for the capsule.
         :param capsule_info: A dictionary containing information about the capsule page,
             hrefs, and names.
+        :param update_sheet_callback: Optional callback function to update a tksheet
+            that is displayed in the GUI with the latest scraper price calculation.
         """
         capsule_title = capsule_section.center(MAX_LINE_LEN, SEPARATOR)
         console.print(f"[bold magenta]{capsule_title}\n")
@@ -178,7 +190,7 @@ class Scraper:
         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(" ", "_")
+                config_capsule_name = capsule_name.replace(" ", "_").lower()
                 owned = self.config.getint(capsule_section, config_capsule_name, fallback=0)
                 if owned == 0:
                     continue
@@ -188,6 +200,8 @@ class Scraper:
 
                 console.print(f"[bold deep_sky_blue4]{capsule_name}")
                 console.print(PRICE_INFO.format(owned, price_usd, price_usd_owned))
+                if update_sheet_callback:
+                    update_sheet_callback([capsule_name, owned, price_usd, price_usd_owned])
                 capsule_usd_total += price_usd_owned
         except (RetryError, ValueError):
             console.print(
@@ -198,13 +212,20 @@ class Scraper:
 
         return capsule_usd_total
 
-    def _scrape_capsule_section_prices(self):
-        """Scrape prices for all capsule sections defined in the configuration."""
+    def _scrape_capsule_section_prices(self, update_sheet_callback=None):
+        """
+        Scrape prices for all capsule sections defined in the configuration.
+
+        :param update_sheet_callback: Optional callback function to update a tksheet
+            that is displayed in the GUI with the latest scraper price calculation.
+        """
         capsule_usd_total = 0
         for capsule_section, capsule_info in CAPSULE_INFO.items():
             # Only scrape capsule sections where the user owns at least one item
             if any(int(owned) > 0 for _, owned in self.config.items(capsule_section)):
-                capsule_usd_total += self._scrape_capsule_prices(capsule_section, capsule_info)
+                capsule_usd_total += self._scrape_capsule_prices(
+                    capsule_section, capsule_info, update_sheet_callback
+                )
 
         return capsule_usd_total
 
@@ -221,12 +242,15 @@ class Scraper:
 
         return page_url
 
-    def _scrape_case_prices(self):
+    def _scrape_case_prices(self, update_sheet_callback=None):
         """
         Scrape prices for all cases defined in the configuration.
 
         For each case, it prints the case name, owned count, price per item, and total
         price for owned items.
+
+        :param update_sheet_callback: Optional callback function to update a tksheet
+            that is displayed in the GUI with the latest scraper price calculation.
         """
         case_usd_total = 0
         for case_index, (config_case_name, owned) in enumerate(self.config.items("Cases")):
@@ -244,6 +268,8 @@ class Scraper:
                 price_usd_owned = round(float(int(owned) * price_usd), 2)
 
                 console.print(PRICE_INFO.format(owned, price_usd, price_usd_owned))
+                if update_sheet_callback:
+                    update_sheet_callback([case_name, owned, price_usd, price_usd_owned])
                 case_usd_total += price_usd_owned
 
                 if not self.config.getboolean("App Settings", "use_proxy", fallback=False):
@@ -257,12 +283,15 @@ class Scraper:
 
         return case_usd_total
 
-    def _scrape_custom_item_prices(self):
+    def _scrape_custom_item_prices(self, update_sheet_callback=None):
         """
         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.
+
+        :param update_sheet_callback: Optional callback function to update a tksheet
+            that is displayed in the GUI with the latest scraper price calculation.
         """
         custom_item_usd_total = 0
         for custom_item_href, owned in self.config.items("Custom Items"):
@@ -280,6 +309,8 @@ class Scraper:
                 price_usd_owned = round(float(int(owned) * price_usd), 2)
 
                 console.print(PRICE_INFO.format(owned, price_usd, price_usd_owned))
+                if update_sheet_callback:
+                    update_sheet_callback([custom_item_name, owned, price_usd, price_usd_owned])
                 custom_item_usd_total += price_usd_owned
 
                 if not self.config.getboolean("App Settings", "use_proxy", fallback=False):

cs2tracker/util/__init__.py

@@ -0,0 +1,9 @@
+from cs2tracker.util.padded_console import (  # noqa: F401 # pylint:disable=unused-import
+    PaddedConsole,
+)
+from cs2tracker.util.price_logs import (  # noqa: F401 # pylint:disable=unused-import
+    PriceLogs,
+)
+from cs2tracker.util.validated_config import (  # noqa: F401 # pylint:disable=unused-import
+    ValidatedConfig,
+)

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

@@ -2,7 +2,7 @@ import re
 from configparser import ConfigParser
 
 from cs2tracker.constants import CAPSULE_INFO, CONFIG_FILE
-from cs2tracker.padded_console import PaddedConsole
+from cs2tracker.util.padded_console import PaddedConsole
 
 console = PaddedConsole()
 

{cs2tracker-2.1.10.dist-info → cs2tracker-2.1.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cs2tracker
-Version: 2.1.10
+Version: 2.1.12
 Summary: Tracking the steam market prices of CS2 items
 Home-page: https://github.com/ashiven/cs2tracker
 Author: Jannik Novak
@@ -20,6 +20,7 @@ Requires-Dist: rich==13.6.0
 Requires-Dist: tenacity==8.2.2
 Requires-Dist: urllib3==2.1.0
 Requires-Dist: sv_ttk==2.6.1
+Requires-Dist: tksheet==7.5.12
 Dynamic: license-file
 
 <div align="center">
@@ -67,9 +68,8 @@ Dynamic: license-file
 
 ### Options
 
-- `Run!` to gather the current market prices of your items and calculate the total amount in USD and EUR.
+- `Run!` to gather the current market prices of your items and calculate the total amount in USD and EUR. The generated Excel sheet can be saved by right-clicking and then selecting `Save Sheet`.
 - `Edit Config` to specify the numbers of items owned in the configuration. You can also add items other than cases and sticker capsules via `Add Custom Item`
-- `Reset Config` to reset the configuration to its original state. This will remove any custom items you have added and reset the number of items owned for all items.
 - `Show History` to see a price chart consisting of past calculations. A new data point is generated once a day upon running the program.
 - `Export / Import History` to export the price history to a CSV file or import it from a CSV file. This may be used to back up your history data or perform further analysis on it.
 - `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`.

cs2tracker-2.1.12.dist-info/RECORD

@@ -0,0 +1,25 @@
+cs2tracker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cs2tracker/__main__.py,sha256=Ub--oSMv48YzfWF1CZqYlkn1-HvZ7Bhxoc7urn1oY6o,249
+cs2tracker/_version.py,sha256=-B2mQZ--x6naZOZ9F0dSrWJNv2VV6u4VsADdB1kHH0k,513
+cs2tracker/constants.py,sha256=G6OaunSpb-SjIgzRSJA9LFczx5MPrXS3Qcq8eHBMa7I,27393
+cs2tracker/main.py,sha256=kyQC0qvUYvd6Cgso48WnDCA8mJRijHMdlV4CffLuoBI,1023
+cs2tracker/app/__init__.py,sha256=uqAxdDzoR2-2IrDc1riIU3Pi9vLEDwr68eg93-0RFmM,105
+cs2tracker/app/application.py,sha256=mlO1P8fs4H_GEhOVaViwX6g9Xw0697qqB_Ypmq3sZwA,9445
+cs2tracker/app/editor_frame.py,sha256=g6DLAct7ZPREDNP4gN6KkFQKxgqjpFyyq18n5h-AOQg,9786
+cs2tracker/app/scraper_frame.py,sha256=VXDl942Jm1gPnw8DRhsYaxmMt_2N6GA0kz259iEsmX0,2576
+cs2tracker/data/config.ini,sha256=pnd-s5X3x73KnLfjvRg5mfs4qfpv0ieyF-4AKq1EXTs,5576
+cs2tracker/data/output.csv,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cs2tracker/scraper/__init__.py,sha256=kfUB9yfshSche92ZvTqQQYBkVqujRez46djPoa9u0YU,335
+cs2tracker/scraper/background_task.py,sha256=zuMqAaWFbrwDNKtO3kwynp1Dq8ATUCdlJlfReZQS_48,3703
+cs2tracker/scraper/discord_notifier.py,sha256=pVmQohhG_61Pvq2zzqDDfImT6l5lGc-nQ_LPwpOLa3k,2994
+cs2tracker/scraper/scraper.py,sha256=gpKziIzOGu7916bslJ3r2dXvJl6mLR2etopaLm752ww,14658
+cs2tracker/util/__init__.py,sha256=TId6-M-sVLjPcwc3XvtdnluvQOB8C4NsQx4NHHIIzUg,329
+cs2tracker/util/padded_console.py,sha256=lPEa34p-8LTmTbpf-2S5uYPaA2UmsIOPq2_UoVhMRgU,674
+cs2tracker/util/price_logs.py,sha256=JuZ2ptDtxA-NzKjpG_4q0eeOr1IaUvVah-Qth6GrDDU,4165
+cs2tracker/util/validated_config.py,sha256=WCkAhLsh16oFiemUV0Uap0NuecAVSEv-ceXwybh_AYk,4790
+cs2tracker-2.1.12.dist-info/licenses/LICENSE.md,sha256=G5wqQ_8KGA808kVuF-Fpu_Yhteg8K_5ux9n2v8eQK7s,1069
+cs2tracker-2.1.12.dist-info/METADATA,sha256=5FcfWK5Wkg5751t5ewdJl1OavDr8kXf3tUGPObV3XvI,4014
+cs2tracker-2.1.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cs2tracker-2.1.12.dist-info/entry_points.txt,sha256=K8IwDIkg8QztSB9g9c89B9jR_2pG4QyJGrNs4z5RcZw,63
+cs2tracker-2.1.12.dist-info/top_level.txt,sha256=2HB4xDDOxaU5BDc_yvdi9UlYLgL768n8aR-hRhFM6VQ,11
+cs2tracker-2.1.12.dist-info/RECORD,,