GameSentenceMiner 2.0.1.post2__py3-none-any.whl → 2.1.1__py3-none-any.whl

GameSentenceMiner/config_gui.py

@@ -3,6 +3,7 @@ from tkinter import filedialog, messagebox, simpledialog
 
 import ttkbootstrap as ttk
 
+from .package_updater import check_for_updates, get_latest_version, update, get_current_version
 from . import configuration
 from . import obs
 from .configuration import *
@@ -89,6 +90,26 @@ class ConfigApp:
         if self.window is not None:
             self.window.withdraw()
 
+    def update_now(self):
+        update_available, version = check_for_updates(force=True)
+        if update_available:
+            messagebox.showinfo("Update", "GSM will now close and update")
+            success = update()
+            if not success:
+                messagebox.showinfo("Update Unsuccessful", "Couldn't Start Update, please update manually.")
+        else:
+            messagebox.showinfo("No Update Found", "No update found.")
+
+    def check_update(self, show_no_update=False):
+        update_available, version = check_for_updates()
+        if update_available:
+            self.latest_version.config(text=version)
+            should_update = messagebox.askyesno("Update Found", "Update Found, would you like to update now?")
+            if should_update:
+                self.update_now()
+        elif show_no_update:
+            messagebox.showinfo("No Update Found", "No update found.")
+
     def add_save_hook(self, func):
         on_save.append(func)
 
@@ -100,7 +121,8 @@ class ConfigApp:
             general=General(
                 use_websocket=self.websocket_enabled.get(),
                 websocket_uri=self.websocket_uri.get(),
-                open_config_on_startup=self.open_config_on_startup.get()
+                open_config_on_startup=self.open_config_on_startup.get(),
+                check_for_update_on_startup=self.check_for_update_on_startup.get()
             ),
             paths=Paths(
                 folder_to_watch=self.folder_to_watch.get(),
@@ -228,6 +250,9 @@ class ConfigApp:
         HoverInfoWidget(root, label, row=self.current_row, column=column)
         self.increment_row()
 
+    def add_label_without_row_increment(self, root, label, row=0, column=0):
+        HoverInfoWidget(root, label, row=self.current_row, column=column)
+
     @new_tab
     def create_general_tab(self):
         general_frame = ttk.Frame(self.notebook)
@@ -254,6 +279,32 @@ class ConfigApp:
         self.add_label_and_increment_row(general_frame, "Whether to open config when the script starts.",
                                          row=self.current_row, column=2)
 
+        ttk.Label(general_frame, text="Check for Updates On Startup:").grid(row=self.current_row, column=0, sticky='W')
+        self.check_for_update_on_startup = tk.BooleanVar(value=self.settings.general.check_for_update_on_startup)
+        ttk.Checkbutton(general_frame, variable=self.check_for_update_on_startup).grid(row=self.current_row, column=1,
+                                                                                  sticky='W')
+        self.add_label_and_increment_row(general_frame, "Always check for Updates On Startup.",
+                                         row=self.current_row, column=2)
+
+        ttk.Label(general_frame, text="Current Version:").grid(row=self.current_row, column=0, sticky='W')
+        self.current_version = ttk.Label(general_frame, text=get_current_version())
+        self.current_version.grid(row=self.current_row, column=1)
+        self.add_label_and_increment_row(general_frame, "The current version of the application.", row=self.current_row,
+                                         column=2)
+
+        ttk.Label(general_frame, text="Latest Version:").grid(row=self.current_row, column=0, sticky='W')
+        self.latest_version = ttk.Label(general_frame, text=get_latest_version())
+        self.latest_version.grid(row=self.current_row, column=1)
+        self.add_label_and_increment_row(general_frame, "The latest available version of the application.",
+                                         row=self.current_row, column=2)
+
+        ttk.Button(general_frame, text="Check Update", command=lambda: self.check_update(True)).grid(row=self.current_row, column=0,
+                                                                                       pady=5)
+        ttk.Button(general_frame, text="Update Now", command=self.update_now).grid(row=self.current_row, column=1,
+                                                                                   pady=5)
+        self.add_label_and_increment_row(general_frame, "Check for updates or update to the latest version.",
+                                         row=self.current_row, column=2)
+
         # ttk.Label(general_frame, text="Per Scene Config:").grid(row=self.current_row, column=0, sticky='W')
         # self.per_scene_config = tk.BooleanVar(value=self.master_config.per_scene_config)
         # ttk.Checkbutton(general_frame, variable=self.per_scene_config).grid(row=self.current_row, column=1,

GameSentenceMiner/configuration.py

@@ -40,6 +40,7 @@ class General:
     use_websocket: bool = True
     websocket_uri: str = 'localhost:6677'
     open_config_on_startup: bool = False
+    check_for_update_on_startup: bool = False
 
 
 @dataclass_json

GameSentenceMiner/gsm.py

@@ -358,6 +358,8 @@ def main(reloading=False, do_config_input=True):
 
     try:
         settings_window = config_gui.ConfigApp()
+        if get_config().general.check_for_update_on_startup:
+            settings_window.window.after(0, settings_window.check_update)
         settings_window.add_save_hook(update_icon)
         settings_window.window.mainloop()
     except KeyboardInterrupt:

GameSentenceMiner/package_updater.py

@@ -0,0 +1,46 @@
+import os
+from importlib import metadata
+import sys
+import requests
+
+from .configuration import logger, get_app_directory
+
+PACKAGE_NAME = "GameSentenceMiner"
+VERSION_FILE_PATH = os.path.join(get_app_directory(), 'version.txt')
+
+def get_current_version():
+    try:
+        version = metadata.version(PACKAGE_NAME)
+        return version
+    except metadata.PackageNotFoundError:
+        return None
+
+def get_latest_version():
+    try:
+        response = requests.get(f"https://pypi.org/pypi/{PACKAGE_NAME}/json")
+        latest_version = response.json()["info"]["version"]
+        return latest_version
+    except Exception as e:
+        logger.error(f"Error fetching latest version: {e}")
+        return None
+
+def check_for_updates(force=False):
+    try:
+        installed_version = get_current_version()
+        latest_version = get_latest_version()
+
+        if installed_version != latest_version or force:
+            logger.info(f"Update available: {installed_version} -> {latest_version}")
+            return True, latest_version
+        else:
+            logger.info("You are already using the latest version.")
+            return False, latest_version
+    except Exception as e:
+        logger.error(f"Error checking for updates: {e}")
+
+def update():
+    try:
+        os.execl(sys.executable, sys.executable, "-m", "pip", "install", "--upgrade", PACKAGE_NAME)
+    except Exception as e:
+        logger.error(f"Error updating {PACKAGE_NAME}: {e}")
+    return False

{GameSentenceMiner-2.0.1.post2.dist-info → GameSentenceMiner-2.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: GameSentenceMiner
-Version: 2.0.1.post2
+Version: 2.1.1
 Summary: A tool for mining sentences from games.
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{GameSentenceMiner-2.0.1.post2.dist-info → GameSentenceMiner-2.1.1.dist-info}/RECORD

@@ -1,20 +1,21 @@
 GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/anki.py,sha256=3UT6K5PxzJMDoiXyOULrkeCoJ0KMq7JvBw6XhcLCirE,9114
-GameSentenceMiner/config_gui.py,sha256=s03e8F2pEPj0iG31RxFqWGfm2GLb8JoGQR7QhCMFu3M,45581
-GameSentenceMiner/configuration.py,sha256=G3EGjCk2U4Ak9aRVU_nuLarCOy8fHyPfRp2hRVrwu9g,13983
+GameSentenceMiner/config_gui.py,sha256=QqhjFlQvh4W2h18n3xirQfgil3dFW7rigk8vIH29aCM,48927
+GameSentenceMiner/configuration.py,sha256=CSg67qIzEdj_w-dS-NEls9syyTeJD3rfPrwSZLomFcU,14029
 GameSentenceMiner/ffmpeg.py,sha256=hdKimzkpAKsE-17qEAQg4uHy4-TtdFywYx48Skn9cPs,10418
 GameSentenceMiner/gametext.py,sha256=GpR9P8h3GmmKH46Dw13kJPx66n3jGjFCiV8Fcrqn9E8,3999
-GameSentenceMiner/gsm.py,sha256=Lnj59KHV4l5eEgffkswBlRCONgYB_Id3L0pTajUzsvI,14937
+GameSentenceMiner/gsm.py,sha256=GqMNcb8w117clJfFiNLhDbZ8eOFQTyVhejrjHvsBJXo,15072
 GameSentenceMiner/model.py,sha256=oh8VVT8T1UKekbmP6MGNgQ8jIuQ_7Rg4GPzDCn2kJo8,1999
 GameSentenceMiner/notification.py,sha256=sWgIIXhaB9WV1K_oQGf5-IR6q3dakae_QS-RuIvbcEs,1939
 GameSentenceMiner/obs.py,sha256=gutnRk30jIxuvrpEosR9jw2h_tll36wgtAZkUF-vWDY,5256
+GameSentenceMiner/package_updater.py,sha256=s1OVFZbWcuRz6_vDYRtingDpOGCJNepqXiXa_-klh-I,1470
 GameSentenceMiner/util.py,sha256=OYg0j_rT9F7v3aJRwWnHvdWMYyxGlimrvw7U2C9ifeY,4441
 GameSentenceMiner/vad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/vad/silero_trim.py,sha256=r7bZYEj-NUXGKgD2UIhLrbTPyq0rau97qGtrMZcRK4A,1517
 GameSentenceMiner/vad/vosk_helper.py,sha256=lWmlGMhmg_0QoWeCHrXwz9wDKPqY37BckHCekGVtJUI,5794
 GameSentenceMiner/vad/whisper_helper.py,sha256=9kmPeSs6jRcKSVxYY-vtyTcqVUDORR4q1nl8fqxHHn4,3379
-GameSentenceMiner-2.0.1.post2.dist-info/METADATA,sha256=Hs8Xypb_1o0HKl74PXczECS9uAUE0N3w6xsa5H2a2Ts,13541
-GameSentenceMiner-2.0.1.post2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-GameSentenceMiner-2.0.1.post2.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-GameSentenceMiner-2.0.1.post2.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-GameSentenceMiner-2.0.1.post2.dist-info/RECORD,,
+GameSentenceMiner-2.1.1.dist-info/METADATA,sha256=aWK654nAZfRBJ07cX0FDLQ2qPqm9_n1sbGDj2vQT3pE,13535
+GameSentenceMiner-2.1.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+GameSentenceMiner-2.1.1.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+GameSentenceMiner-2.1.1.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+GameSentenceMiner-2.1.1.dist-info/RECORD,,