cs2tracker 2.0.10__tar.gz → 2.1.1__tar.gz

{cs2tracker-2.0.10 → cs2tracker-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cs2tracker
-Version: 2.0.10
+Version: 2.1.1
 Summary: Tracking the steam market prices of CS2 items
 Home-page: https://github.com/ashiven/cs2tracker
 Author: Jannik Novak
@@ -27,6 +27,9 @@ Dynamic: license-file
 
 **CS2Tracker** is a tool that can be used to keep track of the steam market prices of your CS2 investment.
 
+![demo](https://github.com/user-attachments/assets/6bd13c96-55ea-4857-8910-f97f5ce78704)
+
+
 ## Getting Started
 
 ### Prerequisites
@@ -49,10 +52,10 @@ Dynamic: license-file
 
 ### Options
 
--  `Edit Config` to change the specific numbers of each item you own and then save the config file.
 -  `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.
 -  `Show History` to see a price chart consisting of past calculations. A new data point for this chart is generated once a day upon running the program.
--  If you want to avoid temporary IP blocks, register for an API Key on [Crawlbase](crawlbase.com) and enter it into the `API_Key` field at the end of the config file. This will route every request through a different proxy server.
+-  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 at the end of the config file. This will route every request through a different proxy server.
 
 ---
 

{cs2tracker-2.0.10 → cs2tracker-2.1.1}/README.md

@@ -5,6 +5,9 @@
 
 **CS2Tracker** is a tool that can be used to keep track of the steam market prices of your CS2 investment.
 
+![demo](https://github.com/user-attachments/assets/6bd13c96-55ea-4857-8910-f97f5ce78704)
+
+
 ## Getting Started
 
 ### Prerequisites
@@ -27,10 +30,10 @@
 
 ### Options
 
--  `Edit Config` to change the specific numbers of each item you own and then save the config file.
 -  `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.
 -  `Show History` to see a price chart consisting of past calculations. A new data point for this chart is generated once a day upon running the program.
--  If you want to avoid temporary IP blocks, register for an API Key on [Crawlbase](crawlbase.com) and enter it into the `API_Key` field at the end of the config file. This will route every request through a different proxy server.
+-  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 at the end of the config file. This will route every request through a different proxy server.
 
 ---
 

{cs2tracker-2.0.10 → cs2tracker-2.1.1}/cs2tracker/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.0.10'
-__version_tuple__ = version_tuple = (2, 0, 10)
+__version__ = version = '2.1.1'
+__version_tuple__ = version_tuple = (2, 1, 1)

{cs2tracker-2.0.10 → cs2tracker-2.1.1}/cs2tracker/application.py

@@ -57,8 +57,8 @@ class Application:
 
     def _edit_config(self):
         subprocess.call([TEXT_EDITOR, CONFIG_FILE])
-        config = self.scraper._parse_config()
-        self.scraper._set_config(config)
+        config = self.scraper.parse_config()
+        self.scraper.set_config(config)
 
     def _draw_plot(self):
         datesp, dollars, euros = self._parse_output()
@@ -88,7 +88,7 @@ class Application:
         row_num = 0
 
         if not os.path.isfile(OUTPUT_FILE):
-            open(OUTPUT_FILE, "w").close()
+            open(OUTPUT_FILE, "w", encoding="utf-8").close()
 
         with open(OUTPUT_FILE, "r", newline="", encoding="utf-8") as csvfile:
             reader = csv.reader(csvfile)
@@ -110,5 +110,5 @@ class Application:
 
     def _plot_file(self):
         if not os.path.isfile(OUTPUT_FILE):
-            open(OUTPUT_FILE, "w").close()
+            open(OUTPUT_FILE, "w", encoding="utf-8").close()
         subprocess.call([TEXT_EDITOR, OUTPUT_FILE])

cs2tracker-2.1.1/cs2tracker/main.py

@@ -0,0 +1,36 @@
+from datetime import datetime
+
+import urllib3
+from rich.console import Console
+
+from ._version import version
+from .application import Application
+
+
+def main():
+    ## disable warnings for proxy requests
+    urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+
+    console = Console()
+    console.print(
+        "[bold yellow]"
+        + """
+    __   _____ _____  ______  ____    ____     __  __  _    ___  ____
+   /  ] / ___/|     T|      T|    \\  /    T   /  ]|  l/ ]  /  _]|    \\
+  /  / (   \\_ l__/  ||      ||  D  )Y  o  |  /  / |  ' /  /  [_ |  D  )
+ /  /   \\__  T|   __jl_j  l_j|    / |     | /  /  |    \\ Y    _]|    /
+/   \\_  /  \\ ||  /  |  |  |  |    \\ |  _  |/   \\_ |     Y|   [_ |    \\
+\\     | \\    ||     |  |  |  |  .  Y|  |  |\\     ||  .  ||     T|  .  Y
+ \\____j  \\___jl_____j  l__j  l__j\\_jl__j__j \\____jl__j\\_jl_____jl__j\\_j
+
+
+"""
+        + f"Version: v{version} - {datetime.today().strftime('%Y/%m/%d')} - Jannik Novak @ashiven_\n"
+    )
+
+    application = Application()
+    application.run()
+
+
+if __name__ == "__main__":
+    main()

{cs2tracker-2.0.10 → cs2tracker-2.1.1}/cs2tracker/scraper.py

@@ -23,9 +23,7 @@ from .constants import (
     OUTPUT_FILE,
 )
 
-MAX_LINE_LEN = 50
-PADDING_LEN = MAX_LINE_LEN // 2 - 1
-PADDING = "-" * PADDING_LEN
+MAX_LINE_LEN = 72
 
 
 class Scraper:
@@ -60,8 +58,8 @@ class Scraper:
 
         self.console = Console()
 
-        config = self._parse_config()
-        self._set_config(config)
+        config = self.parse_config()
+        self.set_config(config)
 
     def scrape_prices(self):
         for capsule_page_url in CAPSULE_PAGES:
@@ -124,25 +122,25 @@ class Scraper:
         )
 
     def print_total(self):
-        usd_string = f"{PADDING}USD Total{PADDING}"[:MAX_LINE_LEN]
+        usd_string = "USD Total".center(MAX_LINE_LEN, "-")
         self.console.print(f"[bold green]{usd_string}")
         self.console.print(f"${self.total_price:.2f}")
 
         self.total_price_euro = CurrencyConverter().convert(
             self.total_price, "USD", "EUR"
         )
-        eur_string = f"{PADDING}EUR Total{PADDING}"[:MAX_LINE_LEN]
+        eur_string = "EUR Total".center(MAX_LINE_LEN, "-")
         self.console.print(f"[bold green]{eur_string}")
         self.console.print(f"€{self.total_price_euro:.2f}")
-        end_string = f"{PADDING}{PADDING}{PADDING}"[:MAX_LINE_LEN]
-        self.console.print(f"[bold green]{end_string}")
+        end_string = "-" * MAX_LINE_LEN
+        self.console.print(f"[bold green]{end_string}\n")
 
     def save_to_file(self):
         now = datetime.datetime.now()
         date = now.strftime("%Y-%m-%d")
 
         if not os.path.isfile(OUTPUT_FILE):
-            open(OUTPUT_FILE, "w").close()
+            open(OUTPUT_FILE, "w", encoding="utf-8").close()
 
         with open(OUTPUT_FILE, "r", encoding="utf-8") as csvfile:
             reader = csv.reader(csvfile)
@@ -163,12 +161,16 @@ class Scraper:
                 writer.writerow([today, total])
                 writer.writerow([today, total_euro])
 
-    def _parse_config(self):
+        # reset total prices for next run
+        self.total_price = 0
+        self.total_price_euro = 0
+
+    def parse_config(self):
         config = configparser.ConfigParser()
         config.read(CONFIG_FILE)
         return config
 
-    def _set_config(self, config):
+    def set_config(self, config):
         self.use_proxy = (
             False if config.get("Proxy API Key", "Use_Proxy") == "False" else True
         )
@@ -247,7 +249,7 @@ class Scraper:
         capsule_quantities,
     ):
         if any([quantity > 0 for quantity in capsule_quantities]):
-            title_string = f"{PADDING}{capsule_name}{PADDING}"[:MAX_LINE_LEN]
+            title_string = capsule_name.center(MAX_LINE_LEN, "-")
             self.console.print(f"[bold magenta]{title_string}")
 
             page = self._get_page(capsule_page_url)
@@ -276,23 +278,27 @@ class Scraper:
                             float(capsule_quantities[href_index] * price), 2
                         )
 
-                        self.console.print(capsule_names_generic[href_index])
                         self.console.print(
-                            f"${price} --> ${price_total} ({capsule_quantities[href_index]})"
+                            f"[bold red]{capsule_names_generic[href_index]}"
+                        )
+                        self.console.print(
+                            f"Owned: {capsule_quantities[href_index]}      Steam market price: ${price}      Total: ${price_total}"
                         )
 
                         self.total_price += price_total
 
-                    except ValueError:
+                    except (AttributeError, ValueError):
                         self.console.print("[bold red][!] Failed to find price listing")
                         break
 
+            self.console.print("\n")
+
     def _scrape_prices_case(
         self, case_quantities, case_page_urls, case_hrefs, case_names
     ):
         for index, case_quantity in enumerate(case_quantities):
             if case_quantity > 0:
-                title_string = f"{PADDING}{case_names[index]}{PADDING}"[:MAX_LINE_LEN]
+                title_string = case_names[index].center(MAX_LINE_LEN, "-")
                 self.console.print(f"[bold magenta]{title_string}")
 
                 page = self._get_page(case_page_urls[index])
@@ -317,12 +323,16 @@ class Scraper:
                     price = float(price_str.replace("$", ""))
                     price_total = round(float(case_quantity * price), 2)
 
-                    self.console.print(f"${price} --> ${price_total} ({case_quantity})")
+                    self.console.print(
+                        f"Owned: {case_quantity}      Steam market price: ${price}      Total: ${price_total}"
+                    )
 
                     self.total_price += price_total
 
-                except ValueError:
+                except (AttributeError, ValueError):
                     self.console.print("[bold red][!] Failed to find price listing")
 
+                self.console.print("\n")
+
                 if not self.use_proxy:
                     time.sleep(1)

{cs2tracker-2.0.10 → cs2tracker-2.1.1}/cs2tracker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cs2tracker
-Version: 2.0.10
+Version: 2.1.1
 Summary: Tracking the steam market prices of CS2 items
 Home-page: https://github.com/ashiven/cs2tracker
 Author: Jannik Novak
@@ -27,6 +27,9 @@ Dynamic: license-file
 
 **CS2Tracker** is a tool that can be used to keep track of the steam market prices of your CS2 investment.
 
+![demo](https://github.com/user-attachments/assets/6bd13c96-55ea-4857-8910-f97f5ce78704)
+
+
 ## Getting Started
 
 ### Prerequisites
@@ -49,10 +52,10 @@ Dynamic: license-file
 
 ### Options
 
--  `Edit Config` to change the specific numbers of each item you own and then save the config file.
 -  `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.
 -  `Show History` to see a price chart consisting of past calculations. A new data point for this chart is generated once a day upon running the program.
--  If you want to avoid temporary IP blocks, register for an API Key on [Crawlbase](crawlbase.com) and enter it into the `API_Key` field at the end of the config file. This will route every request through a different proxy server.
+-  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 at the end of the config file. This will route every request through a different proxy server.
 
 ---
 

cs2tracker-2.0.10/cs2tracker/main.py

@@ -1,34 +0,0 @@
-import urllib3
-from rich.console import Console
-
-from ._version import version
-from .application import Application
-
-
-def main():
-    ## disable warnings for proxy requests
-    urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-
-    console = Console()
-    console.print(
-        "[bold yellow]"
-        + """
-    __   _____ _____  ______  ____    ____     __  __  _    ___  ____
-   /  ] / ___/|     T|      T|    \  /    T   /  ]|  l/ ]  /  _]|    \\
-  /  / (   \_ l__/  ||      ||  D  )Y  o  |  /  / |  ' /  /  [_ |  D  )
- /  /   \__  T|   __jl_j  l_j|    / |     | /  /  |    \ Y    _]|    /
-/   \_  /  \ ||  /  |  |  |  |    \ |  _  |/   \_ |     Y|   [_ |    \\
-\     | \    ||     |  |  |  |  .  Y|  |  |\     ||  .  ||     T|  .  Y
- \____j  \___jl_____j  l__j  l__j\_jl__j__j \____jl__j\_jl_____jl__j\_j
-
-
-"""
-        + f"Version: v{version} - 11/14/2023 - Jannik Novak @ashiven_\n"
-    )
-
-    application = Application()
-    application.run()
-
-
-if __name__ == "__main__":
-    main()