cs2tracker 2.1.4__py3-none-any.whl → 2.1.6__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.6'
+__version_tuple__ = version_tuple = (2, 1, 6)

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 = 100
+SCRAPER_WINDOW_BACKGROUND_COLOR = "Black"
+
 
 class Application:
     def __init__(self):
@@ -22,88 +44,164 @@ 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_windows(self):
+        """Construct the command to run the scraper in a new window for 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 = [Math]::Min({SCRAPER_WINDOW_WIDTH}, $Host.UI.RawUI.BufferSize.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
+
+    def _construct_scraper_command(self):
+        """Construct the command to run the scraper in a new window."""
+        if OS == OSType.WINDOWS:
+            return self._construct_scraper_command_windows()
+        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()