Merge pull request #67 from ashiven/Issue-#52

Issue #52

Author: ashiven

.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/app/application.py

@@ -34,137 +34,131 @@
 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,
             style="Switch.TCheckbutton",
         )
         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 @@ def scrape_prices(self):
 
     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,7 +229,7 @@ def _toggle_use_proxy(self, enabled: bool):
             messagebox.showerror(
                 "Config Error",
                 "You need to enter a valid crawlbase API key into the configuration to use this feature.",
-                parent=self.application_window,
+                parent=self.parent,
             )
             return False
 
@@ -249,7 +243,7 @@ def _toggle_discord_webhook(self, enabled: bool):
             messagebox.showerror(
                 "Config Error",
                 "You need to enter a valid Discord webhook URL into the configuration to use this feature.",
-                parent=self.application_window,
+                parent=self.parent,
             )
             return False
 

cs2tracker/app/editor_frame.py

@@ -59,11 +59,10 @@ def save_config(self):
             config.add_section(section)
             for item in self.tree.get_children(section):
                 item_name = self.tree.item(item, "text")
-                config_option = (
-                    config.name_to_option(item_name, custom=True)
-                    if section == "Custom Items"
-                    else config.name_to_option(item_name)
-                )
+                if section not in ("App Settings", "User Settings"):
+                    config_option = config.name_to_option(item_name, href=True)
+                else:
+                    config_option = config.name_to_option(item_name)
                 value = self.tree.item(item, "values")[0]
                 config.set(section, config_option, value)
 
@@ -95,7 +94,7 @@ def _set_cell_value(self, event, row=None, column=None):
                 column = self.tree.identify_column(event.x)
 
             item_text = self.tree.item(row, "text")
-            if any(item_text == section for section in config.sections()):
+            if column == "#0" or any(item_text == section for section in config.sections()):
                 return
             item_value = self.tree.item(row, "values")[0]
 
@@ -161,9 +160,9 @@ def _load_config_into_tree(self):
                 continue
             section_level = self.tree.insert("", "end", iid=section, text=section)
             for config_option, value in config.items(section):
-                if section == "Custom Items":
-                    custom_item_name = config.option_to_name(config_option, custom=True)
-                    self.tree.insert(section_level, "end", text=custom_item_name, values=[value])
+                if section not in ("User Settings", "App Settings"):
+                    option_name = config.option_to_name(config_option, href=True)
+                    self.tree.insert(section_level, "end", text=option_name, values=[value])
                 else:
                     option_name = config.option_to_name(config_option)
                     self.tree.insert(section_level, "end", text=option_name, values=[value])
@@ -290,18 +289,30 @@ def _add_widgets(self):
         add_button.pack(pady=10)
         self.parent.bind("<Return>", lambda _: add_button.invoke())
 
-    def _add_custom_item(self, item_url, item_owned):
+    def _add_custom_item(self, item_href, item_owned):
         """Add a custom item to the configuration."""
-        if not item_url or not item_owned:
+        if not item_href or not item_owned:
             messagebox.showerror("Input Error", "All fields must be filled out.", parent=self)
             self.editor_frame.focus_set()
             self.parent.focus_set()
             return
 
+        item_name = config.option_to_name(item_href, href=True)
+
+        # Make sure not to reinsert custom items that have already been added
+        for option in self.editor_frame.tree.get_children("Custom Items"):
+            option_name = self.editor_frame.tree.item(option, "text")
+            if option_name == item_name:
+                self.editor_frame.tree.set(option, column="#1", value=item_owned)
+                self.editor_frame.focus_set()
+                self.editor_frame.save_config()
+                self.parent.destroy()
+                return
+
         self.editor_frame.tree.insert(
             "Custom Items",
             "end",
-            text=config.option_to_name(item_url, custom=True),
+            text=item_name,
             values=[item_owned],
         )
         self.editor_frame.focus_set()

cs2tracker/app/scraper_frame.py

@@ -4,6 +4,8 @@
 
 from tksheet import Sheet
 
+from cs2tracker.scraper.scraper import ParsingError
+
 
 class ScraperFrame(ttk.Frame):
     def __init__(self, parent, scraper, sheet_size, dark_theme):
@@ -43,18 +45,36 @@ def _configure_sheet(self):
             height=self.sheet_height,
             width=self.sheet_width,
             auto_resize_columns=150,
+            default_column_width=150,
             sticky="nsew",
         )
         self.sheet.enable_bindings()
+
+        source_titles = []
+        for price_source in self.scraper.parser.SOURCES:
+            source_titles += [
+                f"{price_source.value.title()} (USD)",
+                f"{price_source.value.title()} Owned (USD)",
+            ]
         self.sheet.insert_row(
-            ["Item Name", "Item Owned", "Steam Market Price (USD)", "Total Value Owned (USD)"]
+            [
+                "Item Name",
+                "Item Owned",
+            ]
+            + source_titles
         )
-        self.sheet.column_width(0, 220)
-        self.sheet.column_width(1, 20)
         self.sheet.align_rows([0], "c")
-        self.sheet.align_columns([1, 2, 3], "c")
-        self.sheet.popup_menu_add_command("Save Sheet", self._save_sheet)
 
+        price_columns = list(range(2 * len(self.scraper.parser.SOURCES)))
+        price_columns = [1] + [column_index + 2 for column_index in price_columns]
+        self.sheet.align_columns(price_columns, "c")
+        self.sheet.column_width(0, 220)
+
+        required_window_width = 220 + 150 * len(price_columns)
+        if int(self.sheet_width) < required_window_width:
+            self.parent.geometry(f"{required_window_width}x{self.sheet_height}")
+
+        self.sheet.popup_menu_add_command("Save Sheet", self._save_sheet)
         self.parent.bind("<Configure>", self._readjust_sheet_size_with_window_size)
 
     def _save_sheet(self):
@@ -84,10 +104,7 @@ def update_sheet_callback(row):
 
         self.scraper.scrape_prices(update_sheet_callback)
 
-        row_heights = self.sheet.get_row_heights()
-        last_row_index = len(row_heights) - 1
-        self.sheet.align_rows(last_row_index, "c")
-
         if self.scraper.error_stack:
             last_error = self.scraper.error_stack[-1]
-            messagebox.showerror("An Error Occurred", f"{last_error.message}", parent=self)
+            if not isinstance(last_error, ParsingError):
+                messagebox.showerror("An Error Occurred", f"{last_error.message}", parent=self)