cs2tracker 2.1.4__py3-none-any.whl → 2.1.5__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.4'
-__version_tuple__ = version_tuple = (2, 1, 4)
+__version__ = version = '2.1.5'
+__version_tuple__ = version_tuple = (2, 1, 5)

cs2tracker/application.py

@@ -1,15 +1,37 @@
-import os
-import subprocess
 import tkinter as tk
+from subprocess import Popen
+from threading import Thread
 from typing import cast
 
 import matplotlib.pyplot as plt
 from matplotlib.axes import Axes
 from matplotlib.dates import DateFormatter
 
-from cs2tracker.constants import CONFIG_FILE, OUTPUT_FILE, TEXT_EDITOR
+from cs2tracker.constants import (
+    CONFIG_FILE,
+    OS,
+    OUTPUT_FILE,
+    PYTHON_EXECUTABLE,
+    RUNNING_IN_EXE,
+    TEXT_EDITOR,
+    OSType,
+)
 from cs2tracker.scraper import Scraper
 
+WINDOW_TITLE = "CS2Tracker"
+WINDOW_SIZE = "450x380"
+BACKGROUND_COLOR = "#1e1e1e"
+BUTTON_COLOR = "#3c3f41"
+BUTTON_HOVER_COLOR = "#505354"
+BUTTON_ACTIVE_COLOR = "#5c5f61"
+FONT_STYLE = "Segoe UI"
+FONT_COLOR = "white"
+
+SCRAPER_WINDOW_TITLE = "CS2Tracker"
+SCRAPER_WINDOW_HEIGHT = 40
+SCRAPER_WINDOW_WIDTH = 80
+SCRAPER_WINDOW_BACKGROUND_COLOR = "Black"
+
 
 class Application:
     def __init__(self):
@@ -22,88 +44,156 @@ class Application:
         application_window = self._configure_window()
         application_window.mainloop()
 
+    def _add_button(self, frame, text, command):
+        """Create and style a button for the main application window."""
+        button_style = {
+            "font": (FONT_STYLE, 12),
+            "fg": FONT_COLOR,
+            "bg": BUTTON_COLOR,
+            "activebackground": BUTTON_ACTIVE_COLOR,
+        }
+        button = tk.Button(frame, text=text, command=command, **button_style)
+        button.pack(pady=5, fill="x")
+        button.bind("<Enter>", lambda _: button.config(bg=BUTTON_HOVER_COLOR))
+        button.bind("<Leave>", lambda _: button.config(bg=BUTTON_COLOR))
+        return button
+
     def _configure_window(self):
-        """Configure the main application window layout with buttons for the various
-        actions.
+        """Configure the main application window UI and add buttons for the main
+        functionalities.
         """
         window = tk.Tk()
-        window.title("CS2Tracker")
-        window.geometry("450x450")
-
-        label = tk.Label(window, text="Welcome to CS2Tracker!")
-        run_button = tk.Button(window, text="Run!", command=self._scrape_prices)
-        edit_button = tk.Button(window, text="Edit Config", command=self._edit_config)
-        plot_button = tk.Button(window, text="Show History (Chart)", command=self._draw_plot)
-        plot_file_button = tk.Button(
-            window, text="Show History (File)", command=self._edit_log_file
+        window.title(WINDOW_TITLE)
+        window.geometry(WINDOW_SIZE)
+        window.configure(bg=BACKGROUND_COLOR)
+
+        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}!",
+            font=(FONT_STYLE, 16, "bold"),
+            fg=FONT_COLOR,
+            bg=BACKGROUND_COLOR,
         )
+        label.pack(pady=(0, 30))
+
+        self._add_button(frame, "Run!", self.scrape_prices)
+        self._add_button(frame, "Edit Config", self._edit_config)
+        self._add_button(frame, "Show History (Chart)", self._draw_plot)
+        self._add_button(frame, "Show History (File)", self._edit_log_file)
+
         background_checkbox_value = tk.BooleanVar(value=self.scraper.identify_background_task())
         background_checkbox = tk.Checkbutton(
-            window,
+            frame,
             text="Daily Background Calculation",
-            command=lambda: self._toggle_background_task(background_checkbox_value.get()),
             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),
         )
-
-        label.grid(row=0, column=0, pady=50, sticky="NSEW")
-        run_button.grid(row=1, column=0, pady=10, sticky="NSEW")
-        edit_button.grid(row=2, column=0, pady=10, sticky="NSEW")
-        plot_button.grid(row=3, column=0, pady=10, sticky="NSEW")
-        plot_file_button.grid(row=4, column=0, pady=10, sticky="NSEW")
-        background_checkbox.grid(row=5, column=0, pady=10, sticky="NS")
-
-        window.grid_columnconfigure(0, weight=1)
-        window.grid_rowconfigure(1, weight=1)
-        window.grid_rowconfigure(2, weight=1)
-        window.grid_rowconfigure(3, weight=1)
-        window.grid_rowconfigure(4, weight=1)
-        window.grid_rowconfigure(5, weight=1)
-
-        label.grid_configure(sticky="NSEW")
-        run_button.grid_configure(sticky="NSEW")
-        edit_button.grid_configure(sticky="NSEW")
-        plot_button.grid_configure(sticky="NSEW")
-        plot_file_button.grid_configure(sticky="NSEW")
-        background_checkbox.grid_configure(sticky="NSEW")
+        background_checkbox.pack(pady=20)
 
         return window
 
-    def _scrape_prices(self):
+    def _construct_scraper_command(self):
+        """Construct the command to run the scraper in a new window."""
+        if OS == OSType.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_width = f"$size.Width = {SCRAPER_WINDOW_WIDTH};"
+            set_window_height = f"$size.Height = {SCRAPER_WINDOW_HEIGHT};"
+            set_background_color = (
+                f"$Host.UI.RawUI.BackgroundColor = '{SCRAPER_WINDOW_BACKGROUND_COLOR}';"
+            )
+            clear = "Clear-Host;"
+
+            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"
+            else:
+                scraper_cmd = f"{PYTHON_EXECUTABLE} -m cs2tracker --only-scrape"
+
+            cmd = (
+                'start powershell -NoExit -Command "& {'
+                + set_utf8_encoding
+                + set_window_title
+                + get_size
+                + set_window_width
+                + set_window_height
+                + set_size
+                + set_background_color
+                + clear
+                + scraper_cmd
+                + '}"'
+            )
+            return cmd
+        else:
+            # TODO: Implement for Linux
+            return ""
+
+    def scrape_prices(self):
         """Scrape prices from the configured sources, print the total, and save the
         results to a file.
         """
-        self.scraper.scrape_prices()
+        if OS == OSType.WINDOWS:
+            scraper_cmd = self._construct_scraper_command()
+            Popen(scraper_cmd, shell=True)
+        else:
+            # TODO: implement external window for Linux
+            self.scraper.scrape_prices()
 
     def _edit_config(self):
         """Edit the configuration file using the specified text editor."""
-        subprocess.call([TEXT_EDITOR, CONFIG_FILE])
-        self.scraper.parse_config()
+        _popen_and_call(
+            popen_args={"args": [TEXT_EDITOR, CONFIG_FILE], "shell": True},
+            callback=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()
 
-        fig, ax_raw = plt.subplots()
-        ax = cast(Axes, ax_raw)
+        fig, ax_raw = plt.subplots(figsize=(10, 8), num="CS2Tracker Price History")
+        fig.suptitle("CS2Tracker Price History", fontsize=16)
+        fig.autofmt_xdate()
 
+        ax = cast(Axes, ax_raw)
         ax.plot(dates, dollars, label="Dollars")
         ax.plot(dates, euros, label="Euros")
-        ax.set_xlabel("Date")
-        ax.set_ylabel("Price")
         ax.legend()
-
         date_formatter = DateFormatter("%d-%m-%Y")
         ax.xaxis.set_major_formatter(date_formatter)
-        fig.autofmt_xdate()
 
         plt.show()
 
     def _edit_log_file(self):
         """Opens the file containing past price calculations."""
-        if not os.path.isfile(OUTPUT_FILE):
-            open(OUTPUT_FILE, "w", encoding="utf-8").close()
-        subprocess.call([TEXT_EDITOR, OUTPUT_FILE])
+        Popen([TEXT_EDITOR, OUTPUT_FILE], shell=True)
 
     def _toggle_background_task(self, enabled: bool):
         """Toggle whether a daily price calculation should run in the background."""
         self.scraper.toggle_background_task(enabled)
+
+
+def _popen_and_call(popen_args, callback):
+    """
+    Runs the given args in a subprocess.Popen, and then calls the function callback when
+    the subprocess completes.
+
+    Source: https://stackoverflow.com/questions/2581817/python-subprocess-callback-when-cmd-exits
+    """
+
+    def process_and_callback(popen_args, callback):
+        process = Popen(**popen_args)
+        process.wait()
+        callback()
+
+    thread = Thread(target=process_and_callback, args=(popen_args, callback), daemon=True)
+    thread.start()

cs2tracker/constants.py

@@ -1,8 +1,25 @@
+import enum
 import os
 import sys
+from datetime import datetime
+from shutil import copy
 
-TEXT_EDITOR = "notepad" if sys.platform.startswith("win") else "nano"
+try:
+    from cs2tracker._version import version  # pylint: disable=E0611
+except ImportError:
+    version = "0.0.0"
+
+
+class OSType(enum.Enum):
+    WINDOWS = "Windows"
+    LINUX = "Linux"
+
+
+OS = OSType.WINDOWS if sys.platform.startswith("win") else OSType.LINUX
+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)
 OUTPUT_FILE = os.path.join(MODULE_DIR, "data", "output.csv")
@@ -10,6 +27,44 @@ 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:
+    MEIPASS_DIR = sys._MEIPASS  # type: ignore  pylint: disable=protected-access
+    MODULE_DIR = MEIPASS_DIR
+    PROJECT_DIR = MEIPASS_DIR
+    CONFIG_FILE_SOURCE = os.path.join(MODULE_DIR, "data", "config.ini")
+    OUTPUT_FILE_SOURCE = os.path.join(MODULE_DIR, "data", "output.csv")
+
+    APP_DATA_DIR = os.path.join(os.path.expanduser("~"), "AppData", "Local")
+    DATA_DIR = os.path.join(APP_DATA_DIR, "cs2tracker", "data")
+    os.makedirs(DATA_DIR, exist_ok=True)
+
+    CONFIG_FILE = os.path.join(DATA_DIR, "config.ini")
+    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)
+    if not os.path.exists(OUTPUT_FILE):
+        copy(OUTPUT_FILE_SOURCE, OUTPUT_FILE)
+
+
+BANNER = """
+    __   _____ _____  ______  ____    ____     __  __  _    ___  ____
+   /  ] / ___/|     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
+
+
+"""
+AUTHOR_STRING = (
+    f"Version: v{version} - {datetime.today().strftime('%Y/%m/%d')} - Jannik Novak @ashiven\n"
+)
+
+
 RMR_CAPSULES = {
     "page": "https://steamcommunity.com/market/search?q=2020+rmr",
     "items": [
@@ -172,13 +227,13 @@ AUSTIN_CAPSULES = {
 
 CAPSULE_INFO = {
     "2020 RMR Sticker Capsule": RMR_CAPSULES,
-    "Stockholm Sticker Capsule": STOCKHOLM_CAPSULES,
-    "Antwerp Sticker Capsule": ANTWERP_CAPSULES,
-    "Rio Sticker Capsule": RIO_CAPSULES,
-    "Paris Sticker Capsule": PARIS_CAPSULES,
-    "Copenhagen Sticker Capsule": COPENHAGEN_CAPSULES,
-    "Shanghai Sticker Capsule": SHANGHAI_CAPSULES,
-    "Austin Sticker Capsule": AUSTIN_CAPSULES,
+    "Stockholm 2021 Sticker Capsule": STOCKHOLM_CAPSULES,
+    "Antwerp 2022 Sticker Capsule": ANTWERP_CAPSULES,
+    "Rio 2022 Sticker Capsule": RIO_CAPSULES,
+    "Paris 2023 Sticker Capsule": PARIS_CAPSULES,
+    "Copenhagen 2024 Sticker Capsule": COPENHAGEN_CAPSULES,
+    "Shanghai 2024 Sticker Capsule": SHANGHAI_CAPSULES,
+    "Austin 2025 Sticker Capsule": AUSTIN_CAPSULES,
 }
 
 

cs2tracker/data/config.ini

@@ -7,14 +7,14 @@ RMR_Challengers = 0
 RMR_Legends = 0
 RMR_Contenders = 0
 
-[Stockholm Sticker Capsule]
+[Stockholm 2021 Sticker Capsule]
 Stockholm_Challengers = 0
 Stockholm_Legends = 0
 Stockholm_Contenders = 0
 Stockholm_Champions_Autographs = 0
 Stockholm_Finalists_Autographs = 0
 
-[Antwerp Sticker Capsule]
+[Antwerp 2022 Sticker Capsule]
 Antwerp_Challengers = 0
 Antwerp_Legends = 0
 Antwerp_Contenders = 0
@@ -23,7 +23,7 @@ Antwerp_Contenders_Autographs = 0
 Antwerp_Challengers_Autographs = 0
 Antwerp_Legends_Autographs = 0
 
-[Rio Sticker Capsule]
+[Rio 2022 Sticker Capsule]
 Rio_Challengers = 0
 Rio_Legends = 0
 Rio_Contenders = 0
@@ -32,7 +32,7 @@ Rio_Contenders_Autographs = 0
 Rio_Challengers_Autographs = 0
 Rio_Legends_Autographs = 0
 
-[Paris Sticker Capsule]
+[Paris 2023 Sticker Capsule]
 Paris_Challengers = 0
 Paris_Legends = 0
 Paris_Contenders = 0
@@ -41,7 +41,7 @@ Paris_Contenders_Autographs = 0
 Paris_Challengers_Autographs = 0
 Paris_Legends_Autographs = 0
 
-[Copenhagen Sticker Capsule]
+[Copenhagen 2024 Sticker Capsule]
 Copenhagen_Challengers = 0
 Copenhagen_Legends = 0
 Copenhagen_Contenders = 0
@@ -50,7 +50,7 @@ Copenhagen_Contenders_Autographs = 0
 Copenhagen_Challengers_Autographs = 0
 Copenhagen_Legends_Autographs = 0
 
-[Shanghai Sticker Capsule]
+[Shanghai 2024 Sticker Capsule]
 Shanghai_Challengers = 0
 Shanghai_Legends = 0
 Shanghai_Contenders = 0
@@ -59,7 +59,7 @@ Shanghai_Contenders_Autographs = 0
 Shanghai_Challengers_Autographs = 0
 Shanghai_Legends_Autographs = 0
 
-[Austin Sticker Capsule]
+[Austin 2025 Sticker Capsule]
 Austin_Challengers = 0
 Austin_Legends = 0
 Austin_Contenders = 0

cs2tracker/main.py

@@ -1,10 +1,11 @@
-from datetime import datetime
+import sys
 
 import urllib3
-from rich.console import Console
 
-from cs2tracker._version import version  # pylint: disable=E0611
 from cs2tracker.application import Application
+from cs2tracker.constants import AUTHOR_STRING, BANNER
+from cs2tracker.padded_console import PaddedConsole
+from cs2tracker.scraper import Scraper
 
 
 def main():
@@ -18,25 +19,15 @@ 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 "--only-scrape" in sys.argv:
+        scraper = Scraper()
+        scraper.console.print(f"[bold yellow]{BANNER}\n{AUTHOR_STRING}\n")
+        scraper.scrape_prices()
+    else:
+        console = PaddedConsole()
+        console.print(f"[bold yellow]{BANNER}\n{AUTHOR_STRING}\n")
+        application = Application()
+        application.run()
 
 
 if __name__ == "__main__":

cs2tracker/padded_console.py

@@ -0,0 +1,22 @@
+from rich.console import Console
+from rich.padding import Padding
+
+PADDING_BOTTOM = 0
+PADDING_TOP = 0
+PADDING_LEFT = 4
+PADDING_RIGHT = 0
+
+
+class PaddedConsole:
+    def __init__(self, padding=(PADDING_TOP, PADDING_RIGHT, PADDING_BOTTOM, PADDING_LEFT)):
+        """Initialize a PaddedConsole with specified padding."""
+        self.console = Console()
+        self.padding = padding
+
+    def print(self, text):
+        """Print text with padding to the console."""
+        self.console.print(Padding(text, self.padding))
+
+    def __getattr__(self, attr):
+        """Ensure console methods can be called directly on PaddedConsole."""
+        return getattr(self.console, attr)

cs2tracker/scraper.py

@@ -1,6 +1,5 @@
 import csv
 import os
-import sys
 import time
 from configparser import ConfigParser
 from datetime import datetime
@@ -11,24 +10,32 @@ from bs4.element import Tag
 from currency_converter import CurrencyConverter
 from requests import RequestException, Session
 from requests.adapters import HTTPAdapter, Retry
-from rich.console import Console
 from tenacity import RetryError, retry, stop_after_attempt
 
 from cs2tracker.constants import (
+    AUTHOR_STRING,
+    BANNER,
     BATCH_FILE,
     CAPSULE_INFO,
     CASE_HREFS,
     CASE_PAGES,
     CONFIG_FILE,
+    OS,
     OUTPUT_FILE,
     PROJECT_DIR,
     PYTHON_EXECUTABLE,
+    RUNNING_IN_EXE,
+    OSType,
 )
+from cs2tracker.padded_console import PaddedConsole
 
 MAX_LINE_LEN = 72
 SEPARATOR = "-"
 PRICE_INFO = "Owned: {}      Steam market price: ${}      Total: ${}\n"
 
+HTTP_PROXY_URL = "http://{}:@smartproxy.crawlbase.com:8012"
+HTTPS_PROXY_URL = "http://{}:@smartproxy.crawlbase.com:8012"
+
 WIN_BACKGROUND_TASK_NAME = "CS2Tracker Daily Calculation"
 WIN_BACKGROUND_TASK_SCHEDULE = "DAILY"
 WIN_BACKGROUND_TASK_TIME = "12:00"
@@ -40,7 +47,7 @@ WIN_BACKGROUND_TASK_CMD = (
 class Scraper:
     def __init__(self):
         """Initialize the Scraper class."""
-        self.console = Console()
+        self.console = PaddedConsole()
         self.parse_config()
         self._start_session()
 
@@ -116,21 +123,33 @@ class Scraper:
         This will append a new entry to the output file if no entry has been made for
         today.
         """
-        if not os.path.isfile(OUTPUT_FILE):
-            open(OUTPUT_FILE, "w", encoding="utf-8").close()
-
         with open(OUTPUT_FILE, "r", encoding="utf-8") as price_logs:
             price_logs_reader = csv.reader(price_logs)
-            last_log_date = ""
-            for row in price_logs_reader:
-                last_log_date, _ = row
+            rows = list(price_logs_reader)
+            last_log_date, _, _ = rows[-1] if rows else ("", "", "")
 
         today = datetime.now().strftime("%Y-%m-%d")
         if last_log_date != today:
+            # Append first price calculation of the day
             with open(OUTPUT_FILE, "a", newline="", encoding="utf-8") as price_logs:
                 price_logs_writer = csv.writer(price_logs)
-                price_logs_writer.writerow([today, f"{self.usd_total:.2f}$"])
-                price_logs_writer.writerow([today, f"{self.eur_total:.2f}€"])
+                price_logs_writer.writerow(
+                    [today, f"{self.usd_total:.2f}$", f"{self.eur_total:.2f}€"]
+                )
+        else:
+            # Replace the last calculation of today with the most recent one of today
+            with open(OUTPUT_FILE, "r+", newline="", encoding="utf-8") as price_logs:
+                price_logs_reader = csv.reader(price_logs)
+                rows = list(price_logs_reader)
+                rows_without_today = rows[:-1]
+                price_logs.seek(0)
+                price_logs.truncate()
+
+                price_logs_writer = csv.writer(price_logs)
+                price_logs_writer.writerows(rows_without_today)
+                price_logs_writer.writerow(
+                    [today, f"{self.usd_total:.2f}$", f"{self.eur_total:.2f}€"]
+                )
 
     def read_price_log(self):
         """
@@ -139,23 +158,18 @@ class Scraper:
 
         :return: A tuple containing three lists: dates, dollar prices, and euro prices.
         """
-        if not os.path.isfile(OUTPUT_FILE):
-            open(OUTPUT_FILE, "w", encoding="utf-8").close()
-
         dates, dollars, euros = [], [], []
         with open(OUTPUT_FILE, "r", encoding="utf-8") as price_logs:
             price_logs_reader = csv.reader(price_logs)
             for row in price_logs_reader:
-                date, price_with_currency = row
+                date, price_usd, price_eur = row
                 date = datetime.strptime(date, "%Y-%m-%d")
-                price = float(price_with_currency.rstrip("$€"))
-                if price_with_currency.endswith("€"):
-                    euros.append(price)
-                else:
-                    dollars.append(price)
-                    # Only append every second date since the dates are the same for euros and dollars
-                    # and we want the length of dates to match the lengths of dollars and euros
-                    dates.append(date)
+                price_usd = float(price_usd.rstrip("$"))
+                price_eur = float(price_eur.rstrip("€"))
+
+                dates.append(date)
+                dollars.append(price_usd)
+                euros.append(price_eur)
 
         return dates, dollars, euros
 
@@ -172,12 +186,13 @@ class Scraper:
         """
         use_proxy = self.config.getboolean("Settings", "Use_Proxy", fallback=False)
         api_key = self.config.get("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,
                 proxies={
-                    "http": f"http://{api_key}:@smartproxy.crawlbase.com:8012",
-                    "https": f"http://{api_key}:@smartproxy.crawlbase.com:8012",
+                    "http": HTTP_PROXY_URL.format(api_key),
+                    "https": HTTPS_PROXY_URL.format(api_key),
                 },
                 verify=False,
             )
@@ -315,7 +330,7 @@ class Scraper:
 
         :return: True if a background task is found, False otherwise.
         """
-        if sys.platform.startswith("win"):
+        if OS == OSType.WINDOWS:
             cmd = ["schtasks", "/query", "/tn", WIN_BACKGROUND_TASK_NAME]
             return_code = call(cmd, stdout=DEVNULL, stderr=DEVNULL)
             found = return_code == 0
@@ -333,8 +348,13 @@ class Scraper:
         """
         if enabled:
             with open(BATCH_FILE, "w", encoding="utf-8") as batch_file:
-                batch_file.write(f"cd {PROJECT_DIR}\n")
-                batch_file.write(f"{PYTHON_EXECUTABLE} -m cs2tracker.scraper\n")
+                if RUNNING_IN_EXE:
+                    # The python executable is set to the executable itself
+                    # for executables created with PyInstaller
+                    batch_file.write(f"{PYTHON_EXECUTABLE} --only-scrape\n")
+                else:
+                    batch_file.write(f"cd {PROJECT_DIR}\n")
+                    batch_file.write(f"{PYTHON_EXECUTABLE} -m cs2tracker --only-scrape\n")
         else:
             if os.path.exists(BATCH_FILE):
                 os.remove(BATCH_FILE)
@@ -380,7 +400,7 @@ class Scraper:
         :param enabled: If True, the task will be created; if False, the task will be
             deleted.
         """
-        if sys.platform.startswith("win"):
+        if OS == OSType.WINDOWS:
             self._toggle_background_task_windows(enabled)
         else:
             # TODO: implement toggle for cron jobs
@@ -388,7 +408,6 @@ class Scraper:
 
 
 if __name__ == "__main__":
-    # If this file is run as a script, create a Scraper instance and run the
-    # scrape_prices method.
     scraper = Scraper()
+    scraper.console.print(f"[bold yellow]{BANNER}\n{AUTHOR_STRING}\n")
     scraper.scrape_prices()

{cs2tracker-2.1.4.dist-info → cs2tracker-2.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cs2tracker
-Version: 2.1.4
+Version: 2.1.5
 Summary: Tracking the steam market prices of CS2 items
 Home-page: https://github.com/ashiven/cs2tracker
 Author: Jannik Novak
@@ -40,11 +40,17 @@ Dynamic: license-file
 
 ### Prerequisites
 
--  Download and install the latest versions of [Python](https://www.python.org/downloads/) and [Pip](https://pypi.org/project/pip/).
--  Register for the [Crawlbase Smart Proxy API](https://crawlbase.com/) and retrieve your API key. (Optional)
+- Download and install the latest versions of [Python](https://www.python.org/downloads/) and [Pip](https://pypi.org/project/pip/). (Required for Linux)
+- Register for the [Crawlbase Smart Proxy API](https://crawlbase.com/) and retrieve your API key. (Optional)
 
 ### Setup
 
+#### Windows Executable (No color support)
+
+- Simply download the [latest executable](https://github.com/ashiven/cs2tracker/releases) and run it.
+
+#### Install via Pip
+
 1. Install the program via pip:
 
    ```bash
@@ -58,11 +64,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.
--  `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 at the end of the config file. This will route every request through a different proxy server.
+- `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 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.
 
 ---
 

cs2tracker-2.1.5.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=ezuEPMmZBPsFTNec3uKYV6IfWrjNpfiIok1e_GQvZGQ,511
+cs2tracker/application.py,sha256=pFmPRmm9OdYRLLl6qnmkHyV7oLI-Le4YSO26VX7eP4U,7180
+cs2tracker/constants.py,sha256=er-YFaEe8WachO_q-RU6vik5SUcFEtacHxGYhD15Stk,17104
+cs2tracker/main.py,sha256=kiTADEXXnX1y3kh0zII91mjadztMB145RBteXM2WG3I,915
+cs2tracker/padded_console.py,sha256=lPEa34p-8LTmTbpf-2S5uYPaA2UmsIOPq2_UoVhMRgU,674
+cs2tracker/scraper.py,sha256=hrL01_HWHpZZgkevj5JCmET0o2T1wSbmsxapuK11gv4,16202
+cs2tracker/data/config.ini,sha256=q-T7_W3krPVJJoMcRJGGczNRvCZw-wJfNobpsdUEDNs,2672
+cs2tracker/data/output.csv,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cs2tracker-2.1.5.dist-info/licenses/LICENSE.md,sha256=G5wqQ_8KGA808kVuF-Fpu_Yhteg8K_5ux9n2v8eQK7s,1069
+cs2tracker-2.1.5.dist-info/METADATA,sha256=zFEptkI_0AXDALL3uGqz0pTsRGn5OQMmnn-qAL6azfs,3126
+cs2tracker-2.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cs2tracker-2.1.5.dist-info/entry_points.txt,sha256=K8IwDIkg8QztSB9g9c89B9jR_2pG4QyJGrNs4z5RcZw,63
+cs2tracker-2.1.5.dist-info/top_level.txt,sha256=2HB4xDDOxaU5BDc_yvdi9UlYLgL768n8aR-hRhFM6VQ,11
+cs2tracker-2.1.5.dist-info/RECORD,,

cs2tracker-2.1.4.dist-info/RECORD

@@ -1,14 +0,0 @@
-cs2tracker/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cs2tracker/__main__.py,sha256=Ub--oSMv48YzfWF1CZqYlkn1-HvZ7Bhxoc7urn1oY6o,249
-cs2tracker/_version.py,sha256=cuCBChX_WW6rxX7DfFGzi-EJBf76bHcqGsjRlHgeMvg,511
-cs2tracker/application.py,sha256=CYuvEV2PlAKQ0MD_9vLViTonzspQFWJBGN6rzAOpAQY,4212
-cs2tracker/constants.py,sha256=VG4QBedqHT9kjehWU-Uop7MNlD1VuERgL_VA4oN3obc,15127
-cs2tracker/main.py,sha256=YmWXza0lmDDvLbOWzkJ6n0B1c-tq7Ub-IpwXSeIoKuQ,1309
-cs2tracker/scraper.py,sha256=XoRtTPwN2Lxzqqghvcp3TOe9VdRge7Y_JTGOOJJyd3g,15457
-cs2tracker/data/config.ini,sha256=LbdwEMFlgD8ubuEvGhYZdPtYsWhlho3nX3SLWi4T7Kg,2637
-cs2tracker-2.1.4.dist-info/licenses/LICENSE.md,sha256=G5wqQ_8KGA808kVuF-Fpu_Yhteg8K_5ux9n2v8eQK7s,1069
-cs2tracker-2.1.4.dist-info/METADATA,sha256=CfTvVmloYwmxtvnu0UUeOY6CzO7W3gsBNjGdMFxkBbk,2954
-cs2tracker-2.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cs2tracker-2.1.4.dist-info/entry_points.txt,sha256=K8IwDIkg8QztSB9g9c89B9jR_2pG4QyJGrNs4z5RcZw,63
-cs2tracker-2.1.4.dist-info/top_level.txt,sha256=2HB4xDDOxaU5BDc_yvdi9UlYLgL768n8aR-hRhFM6VQ,11
-cs2tracker-2.1.4.dist-info/RECORD,,