cs2tracker 2.1.13__tar.gz → 2.1.14__tar.gz

{cs2tracker-2.1.13 → cs2tracker-2.1.14}/.isort.cfg

@@ -1,2 +1,2 @@
 [settings]
-known_third_party = bs4,currency_converter,matplotlib,nodejs,requests,rich,sv_ttk,tenacity,tksheet,ttk_text,urllib3
+known_third_party = bs4,currency_converter,matplotlib,nodejs,requests,requests_cache,rich,sv_ttk,tenacity,tksheet,ttk_text,urllib3

{cs2tracker-2.1.13 → cs2tracker-2.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cs2tracker
-Version: 2.1.13
+Version: 2.1.14
 Summary: Tracking the steam market prices of CS2 items
 Home-page: https://github.com/ashiven/cs2tracker
 Author: Jannik Novak
@@ -23,6 +23,7 @@ Requires-Dist: sv_ttk==2.6.1
 Requires-Dist: tksheet==7.5.12
 Requires-Dist: nodejs-bin==18.4.0a4
 Requires-Dist: ttk-text==0.2.0
+Requires-Dist: requests-cache==1.2.1
 Dynamic: license-file
 
 <p align="center">
@@ -106,7 +107,7 @@ Dynamic: license-file
 ## Configuration
 
 You can configure the app settings via the **Edit Config** option.
-This will open the config editor where you can change any setting by simply double clicking on it. On top of that, the config editor allows you to:
+This will open the config editor where you can change any setting by double clicking on it or navigating to it with the arrow keys and hitting enter. On top of that, the config editor allows you to:
 
 - Automatically import items from your Storage Units
 - Manually Specify the number of items you own

{cs2tracker-2.1.13 → cs2tracker-2.1.14}/README.md

@@ -79,7 +79,7 @@
 ## Configuration
 
 You can configure the app settings via the **Edit Config** option.
-This will open the config editor where you can change any setting by simply double clicking on it. On top of that, the config editor allows you to:
+This will open the config editor where you can change any setting by double clicking on it or navigating to it with the arrow keys and hitting enter. On top of that, the config editor allows you to:
 
 - Automatically import items from your Storage Units
 - Manually Specify the number of items you own

{cs2tracker-2.1.13 → cs2tracker-2.1.14}/cs2tracker/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.1.13'
-__version_tuple__ = version_tuple = (2, 1, 13)
+__version__ = version = '2.1.14'
+__version_tuple__ = version_tuple = (2, 1, 14)

{cs2tracker-2.1.13 → cs2tracker-2.1.14}/cs2tracker/app/application.py

@@ -34,46 +34,80 @@ config = get_config()
 class Application:
     def __init__(self):
         self.scraper = Scraper()
-        self.application_window = None
 
     def run(self):
-        """Run the main application window with buttons for scraping prices, editing the
-        configuration, showing history in a chart, and editing the log file.
-        """
-        self.application_window = self._configure_window()
+        """Run the main application window."""
+        window = self._configure_window()
 
         if DARK_THEME:
             sv_ttk.use_dark_theme()
         else:
             sv_ttk.use_light_theme()
 
-        self.application_window.mainloop()
+        window.mainloop()
+
+    def _configure_window(self):
+        """Configure the main application window."""
+        window = tk.Tk()
+        window.title(APPLICATION_NAME)
+        window.geometry(WINDOW_SIZE)
+
+        if OS == OSType.WINDOWS:
+            app_id = "cs2tracker.unique.id"
+            ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(app_id)
+
+        icon = tk.PhotoImage(file=ICON_FILE)
+        window.wm_iconphoto(True, icon)
+
+        main_frame = MainFrame(window, self.scraper)
+        main_frame.pack(expand=True, fill="both")
+
+        return window
 
-    def _add_button(self, frame, text, command, row):
+
+class MainFrame(ttk.Frame):
+    # pylint: disable=too-many-instance-attributes,attribute-defined-outside-init
+    def __init__(self, parent, scraper):
+        super().__init__(parent, padding=15)
+        self.parent = parent
+        self.scraper = scraper
+        self._add_widgets()
+
+    def _add_widgets(self):
+        """Add widgets to the main frame."""
+        self.columnconfigure(0, weight=1)
+        self.columnconfigure(1, weight=1)
+        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")
+
+    def _add_button(self, text, command, row):
         """Create and style a button for the button frame."""
         grid_pos = {"row": row, "column": 0, "sticky": "ew", "padx": 10, "pady": 10}
-        button = ttk.Button(frame, text=text, command=command)
+        button = ttk.Button(self.button_frame, text=text, command=command)
         button.grid(**grid_pos)
 
-    def _configure_button_frame(self, main_frame):
+    def _configure_button_frame(self):
         """Configure the button frame of the application main frame."""
-        button_frame = ttk.Frame(main_frame, style="Card.TFrame", padding=15)
-        button_frame.columnconfigure(0, weight=1)
-        button_frame.grid(row=0, column=0, padx=10, pady=(7, 20), sticky="nsew")
+        self.button_frame = ttk.Frame(self, style="Card.TFrame", padding=15)
+        self.button_frame.columnconfigure(0, weight=1)
 
-        self._add_button(button_frame, "Run!", self.scrape_prices, 0)
-        self._add_button(button_frame, "Edit Config", self._edit_config, 1)
-        self._add_button(button_frame, "Show History", self._draw_plot, 2)
-        self._add_button(button_frame, "Export History", self._export_log_file, 3)
-        self._add_button(button_frame, "Import History", self._import_log_file, 4)
+        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("Export History", self._export_log_file, 3)
+        self._add_button("Import History", self._import_log_file, 4)
 
     def _add_checkbox(
-        self, frame, text, variable, command, row
-    ):  # pylint: disable=too-many-arguments,too-many-positional-arguments
+        self, text, variable, command, row
+    ):  # pylint: disable=too-many-arguments,too-many-positional-arguments,attribute-defined-outside-init
         """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(
-            frame,
+            self.checkbox_frame,
             text=text,
             variable=variable,
             command=command,
@@ -81,90 +115,50 @@ class Application:
         )
         checkbox.grid(**grid_pos)
 
-    def _configure_checkbox_frame(self, main_frame):
+    def _configure_checkbox_frame(self):
         """Configure the checkbox frame for background tasks and settings."""
-        checkbox_frame = ttk.LabelFrame(main_frame, text="Settings", padding=15)
-        checkbox_frame.grid(row=0, column=1, padx=10, pady=(0, 20), sticky="nsew")
+        self.checkbox_frame = ttk.LabelFrame(self, text="Settings", padding=15)
 
-        background_checkbox_value = tk.BooleanVar(value=BackgroundTask.identify())
+        self.background_checkbox_value = tk.BooleanVar(value=BackgroundTask.identify())
         self._add_checkbox(
-            checkbox_frame,
             "Background Task",
-            background_checkbox_value,
-            lambda: self._toggle_background_task(background_checkbox_value.get()),
+            self.background_checkbox_value,
+            lambda: self._toggle_background_task(self.background_checkbox_value.get()),
             0,
         )
 
-        discord_webhook_checkbox_value = tk.BooleanVar(
+        self.discord_webhook_checkbox_value = tk.BooleanVar(
             value=config.getboolean("App Settings", "discord_notifications", fallback=False)
         )
         self._add_checkbox(
-            checkbox_frame,
             "Discord Notifications",
-            discord_webhook_checkbox_value,
-            lambda: discord_webhook_checkbox_value.set(
-                self._toggle_discord_webhook(discord_webhook_checkbox_value.get())
+            self.discord_webhook_checkbox_value,
+            lambda: self.discord_webhook_checkbox_value.set(
+                self._toggle_discord_webhook(self.discord_webhook_checkbox_value.get())
             ),
             1,
         )
 
-        use_proxy_checkbox_value = tk.BooleanVar(
+        self.use_proxy_checkbox_value = tk.BooleanVar(
             value=config.getboolean("App Settings", "use_proxy", fallback=False)
         )
         self._add_checkbox(
-            checkbox_frame,
             "Proxy Requests",
-            use_proxy_checkbox_value,
-            lambda: use_proxy_checkbox_value.set(
-                self._toggle_use_proxy(use_proxy_checkbox_value.get())
+            self.use_proxy_checkbox_value,
+            lambda: self.use_proxy_checkbox_value.set(
+                self._toggle_use_proxy(self.use_proxy_checkbox_value.get())
             ),
             2,
         )
 
-        # pylint: disable=attribute-defined-outside-init
         self.dark_theme_checkbox_value = tk.BooleanVar(value=DARK_THEME)
-        self._add_checkbox(
-            checkbox_frame, "Dark Theme", self.dark_theme_checkbox_value, sv_ttk.toggle_theme, 3
-        )
-
-    def _configure_main_frame(self, window):
-        """Configure the main frame of the application window with buttons and
-        checkboxes.
-        """
-        main_frame = ttk.Frame(window, padding=15)
-        main_frame.columnconfigure(0, weight=1)
-        main_frame.columnconfigure(1, weight=1)
-        main_frame.rowconfigure(0, weight=1)
-
-        self._configure_button_frame(main_frame)
-        self._configure_checkbox_frame(main_frame)
-
-        main_frame.pack(expand=True, fill="both")
-
-    def _configure_window(self):
-        """Configure the main application window UI and add buttons for the main
-        functionalities.
-        """
-        window = tk.Tk()
-        window.title(APPLICATION_NAME)
-        window.geometry(WINDOW_SIZE)
-
-        if OS == OSType.WINDOWS:
-            app_id = "cs2tracker.unique.id"
-            ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(app_id)
-
-        icon = tk.PhotoImage(file=ICON_FILE)
-        window.wm_iconphoto(True, icon)
-
-        self._configure_main_frame(window)
-
-        return window
+        self._add_checkbox("Dark Theme", self.dark_theme_checkbox_value, sv_ttk.toggle_theme, 3)
 
     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.application_window)
+        scraper_window = tk.Toplevel(self.parent)
         scraper_window.geometry(SCRAPER_WINDOW_SIZE)
         scraper_window.title(SCRAPER_WINDOW_TITLE)
 
@@ -179,7 +173,7 @@ class Application:
 
     def _edit_config(self):
         """Open a new window with a config editor GUI."""
-        config_editor_window = tk.Toplevel(self.application_window)
+        config_editor_window = tk.Toplevel(self.parent)
         config_editor_window.geometry(CONFIG_EDITOR_SIZE)
         config_editor_window.title(CONFIG_EDITOR_TITLE)
 
@@ -235,6 +229,7 @@ class Application:
             messagebox.showerror(
                 "Config Error",
                 "You need to enter a valid crawlbase API key into the configuration to use this feature.",
+                parent=self.parent,
             )
             return False
 
@@ -248,6 +243,7 @@ class Application:
             messagebox.showerror(
                 "Config Error",
                 "You need to enter a valid Discord webhook URL into the configuration to use this feature.",
+                parent=self.parent,
             )
             return False