cs2tracker 2.1.14__py3-none-any.whl → 2.1.16__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.14'
-__version_tuple__ = version_tuple = (2, 1, 14)
+__version__ = version = '2.1.16'
+__version_tuple__ = version_tuple = (2, 1, 16)

cs2tracker/app/__init__.py

@@ -1,3 +0,0 @@
-from cs2tracker.app.application import (  # noqa: F401 # pylint:disable=unused-import
-    Application,
-)

cs2tracker/app/{application.py → app.py}

@@ -3,30 +3,32 @@ import tkinter as tk
 from shutil import copy
 from tkinter import messagebox, ttk
 from tkinter.filedialog import askopenfilename, asksaveasfile
-from typing import cast
 
-import matplotlib.pyplot as plt
 import sv_ttk
-from matplotlib.axes import Axes
-from matplotlib.dates import DateFormatter
 
 from cs2tracker.app.editor_frame import ConfigEditorFrame
+from cs2tracker.app.history_frame import PriceHistoryFrame
 from cs2tracker.app.scraper_frame import ScraperFrame
+from cs2tracker.config import get_config
 from cs2tracker.constants import ICON_FILE, OS, OUTPUT_FILE, OSType
-from cs2tracker.scraper import BackgroundTask, Scraper
-from cs2tracker.util import PriceLogs
-from cs2tracker.util.validated_config import get_config
+from cs2tracker.logs import PriceLogs
+from cs2tracker.scraper.background_task import BackgroundTask
+from cs2tracker.scraper.scraper import Scraper
+from cs2tracker.util.currency_conversion import CURRENCY_SYMBOLS
+from cs2tracker.util.tkinter import centered, fix_sv_ttk, size_info
 
 APPLICATION_NAME = "CS2Tracker"
 WINDOW_SIZE = "630x335"
 DARK_THEME = True
 
-SCRAPER_WINDOW_TITLE = "CS2Tracker Scraper"
+SCRAPER_WINDOW_TITLE = "Price Overview"
 SCRAPER_WINDOW_SIZE = "900x750"
 
 CONFIG_EDITOR_TITLE = "Config Editor"
-CONFIG_EDITOR_SIZE = "900x750"
+CONFIG_EDITOR_SIZE = "850x750"
 
+PRICE_HISTORY_TITLE = "Price History"
+PRICE_HISTORY_SIZE = "900x700"
 
 config = get_config()
 
@@ -44,13 +46,16 @@ class Application:
         else:
             sv_ttk.use_light_theme()
 
+        fix_sv_ttk(ttk.Style())
+
         window.mainloop()
 
     def _configure_window(self):
         """Configure the main application window."""
         window = tk.Tk()
         window.title(APPLICATION_NAME)
-        window.geometry(WINDOW_SIZE)
+        window.geometry(centered(window, WINDOW_SIZE))
+        window.minsize(*size_info(WINDOW_SIZE))
 
         if OS == OSType.WINDOWS:
             app_id = "cs2tracker.unique.id"
@@ -80,9 +85,9 @@ class MainFrame(ttk.Frame):
         self.rowconfigure(0, weight=1)
 
         self._configure_button_frame()
-        self.button_frame.grid(row=0, column=0, padx=10, pady=(7, 20), sticky="nsew")
-        self._configure_checkbox_frame()
-        self.checkbox_frame.grid(row=0, column=1, padx=10, pady=(0, 20), sticky="nsew")
+        self.button_frame.grid(row=0, column=0, padx=10, pady=(0, 20), sticky="nsew")
+        self._configure_settings_frame()
+        self.settings_frame.grid(row=0, column=1, padx=10, pady=(0, 20), sticky="nsew")
 
     def _add_button(self, text, command, row):
         """Create and style a button for the button frame."""
@@ -97,7 +102,7 @@ class MainFrame(ttk.Frame):
 
         self._add_button("Run!", self.scrape_prices, 0)
         self._add_button("Edit Config", self._edit_config, 1)
-        self._add_button("Show History", self._draw_plot, 2)
+        self._add_button("Show History", self._show_history, 2)
         self._add_button("Export History", self._export_log_file, 3)
         self._add_button("Import History", self._import_log_file, 4)
 
@@ -107,7 +112,7 @@ class MainFrame(ttk.Frame):
         """Create and style a checkbox for the checkbox frame."""
         grid_pos = {"row": row, "column": 0, "sticky": "w", "padx": (10, 0), "pady": 5}
         checkbox = ttk.Checkbutton(
-            self.checkbox_frame,
+            self.settings_frame,
             text=text,
             variable=variable,
             command=command,
@@ -115,9 +120,10 @@ class MainFrame(ttk.Frame):
         )
         checkbox.grid(**grid_pos)
 
-    def _configure_checkbox_frame(self):
-        """Configure the checkbox frame for background tasks and settings."""
-        self.checkbox_frame = ttk.LabelFrame(self, text="Settings", padding=15)
+    def _configure_settings_frame(self):
+        """Configure the settings frame for background tasks and other settings."""
+        self.settings_frame = ttk.LabelFrame(self, text="Settings", padding=15)
+        self.settings_frame.columnconfigure(0, weight=1)
 
         self.background_checkbox_value = tk.BooleanVar(value=BackgroundTask.identify())
         self._add_checkbox(
@@ -127,9 +133,7 @@ class MainFrame(ttk.Frame):
             0,
         )
 
-        self.discord_webhook_checkbox_value = tk.BooleanVar(
-            value=config.getboolean("App Settings", "discord_notifications", fallback=False)
-        )
+        self.discord_webhook_checkbox_value = tk.BooleanVar(value=config.discord_notifications)
         self._add_checkbox(
             "Discord Notifications",
             self.discord_webhook_checkbox_value,
@@ -139,9 +143,7 @@ class MainFrame(ttk.Frame):
             1,
         )
 
-        self.use_proxy_checkbox_value = tk.BooleanVar(
-            value=config.getboolean("App Settings", "use_proxy", fallback=False)
-        )
+        self.use_proxy_checkbox_value = tk.BooleanVar(value=config.use_proxy)
         self._add_checkbox(
             "Proxy Requests",
             self.use_proxy_checkbox_value,
@@ -152,14 +154,36 @@ class MainFrame(ttk.Frame):
         )
 
         self.dark_theme_checkbox_value = tk.BooleanVar(value=DARK_THEME)
-        self._add_checkbox("Dark Theme", self.dark_theme_checkbox_value, sv_ttk.toggle_theme, 3)
+        self._add_checkbox("Dark Theme", self.dark_theme_checkbox_value, self._toggle_theme, 3)
+
+        self.currency_selection_label = ttk.Label(self.settings_frame, text="Currency:")
+        self.currency_selection_label.grid(row=4, column=0, sticky="w", padx=(20, 0), pady=5)
+        self.currency_selection = ttk.Combobox(
+            self.settings_frame,
+            state="readonly",
+            values=list(CURRENCY_SYMBOLS),
+            postcommand=self.parent.focus_set,
+        )
+        self.currency_selection.set(config.conversion_currency)
+        self.currency_selection.grid(row=5, column=0, sticky="w", padx=(20, 0), pady=5)
+
+        def on_currency_change(_):
+            config.set_app_option("conversion_currency", self.currency_selection.get())
+            self.currency_selection.selection_clear()
+            self.parent.focus_set()
+
+        self.currency_selection.bind(
+            "<<ComboboxSelected>>",
+            on_currency_change,
+        )
 
     def scrape_prices(self):
         """Scrape prices from the configured sources, print the total, and save the
         results to a file.
         """
         scraper_window = tk.Toplevel(self.parent)
-        scraper_window.geometry(SCRAPER_WINDOW_SIZE)
+        scraper_window.geometry(centered(scraper_window, SCRAPER_WINDOW_SIZE))
+        scraper_window.minsize(*size_info(SCRAPER_WINDOW_SIZE))
         scraper_window.title(SCRAPER_WINDOW_TITLE)
 
         run_frame = ScraperFrame(
@@ -174,31 +198,31 @@ class MainFrame(ttk.Frame):
     def _edit_config(self):
         """Open a new window with a config editor GUI."""
         config_editor_window = tk.Toplevel(self.parent)
-        config_editor_window.geometry(CONFIG_EDITOR_SIZE)
+        config_editor_window.geometry(centered(config_editor_window, CONFIG_EDITOR_SIZE))
+        config_editor_window.minsize(*size_info(CONFIG_EDITOR_SIZE))
         config_editor_window.title(CONFIG_EDITOR_TITLE)
 
         editor_frame = ConfigEditorFrame(config_editor_window)
         editor_frame.pack(expand=True, fill="both")
 
-    def _draw_plot(self):
-        """Draw a plot of the scraped prices over time."""
-        dates, usd_prices, eur_prices = PriceLogs.read()
-
-        fig, ax_raw = plt.subplots(figsize=(10, 8), num="CS2Tracker Price History")
-        fig.suptitle("CS2Tracker Price History", fontsize=16)
-        fig.autofmt_xdate()
+    def _show_history(self):
+        """Show a chart consisting of past calculations."""
+        if PriceLogs.empty():
+            return
 
-        ax = cast(Axes, ax_raw)
-        ax.plot(dates, usd_prices, label="Dollars")
-        ax.plot(dates, eur_prices, label="Euros")
-        ax.legend()
-        date_formatter = DateFormatter("%Y-%m-%d")
-        ax.xaxis.set_major_formatter(date_formatter)
+        price_history_window = tk.Toplevel(self.parent)
+        price_history_window.geometry(centered(price_history_window, PRICE_HISTORY_SIZE))
+        price_history_window.minsize(*size_info(PRICE_HISTORY_SIZE))
+        price_history_window.title(PRICE_HISTORY_TITLE)
 
-        plt.show()
+        history_frame = PriceHistoryFrame(price_history_window)
+        history_frame.pack(expand=True, fill="both")
 
     def _export_log_file(self):
         """Lets the user export the log file to a different location."""
+        if PriceLogs.empty():
+            return
+
         export_path = asksaveasfile(
             title="Export Log File",
             defaultextension=".csv",
@@ -224,7 +248,7 @@ class MainFrame(ttk.Frame):
 
     def _toggle_use_proxy(self, enabled: bool):
         """Toggle whether the scraper should use proxy servers for requests."""
-        proxy_api_key = config.get("User Settings", "proxy_api_key", fallback=None)
+        proxy_api_key = config.proxy_api_key
         if not proxy_api_key and enabled:
             messagebox.showerror(
                 "Config Error",
@@ -233,12 +257,12 @@ class MainFrame(ttk.Frame):
             )
             return False
 
-        config.toggle_use_proxy(enabled)
+        config.toggle_app_option("use_proxy", enabled)
         return True
 
     def _toggle_discord_webhook(self, enabled: bool):
         """Toggle whether the scraper should send notifications to a Discord webhook."""
-        discord_webhook_url = config.get("User Settings", "discord_webhook_url", fallback=None)
+        discord_webhook_url = config.discord_webhook_url
         if not discord_webhook_url and enabled:
             messagebox.showerror(
                 "Config Error",
@@ -247,5 +271,13 @@ class MainFrame(ttk.Frame):
             )
             return False
 
-        config.toggle_discord_webhook(enabled)
+        config.toggle_app_option("discord_webhook", enabled)
         return True
+
+    def _toggle_theme(self):
+        """Toggle the theme of the application."""
+        if self.dark_theme_checkbox_value.get():
+            sv_ttk.use_dark_theme()
+        else:
+            sv_ttk.use_light_theme()
+        fix_sv_ttk(ttk.Style())