GameSentenceMiner 2.4.1.dev1__py3-none-any.whl → 2.4.3__py3-none-any.whl

GameSentenceMiner/config_gui.py

@@ -4,9 +4,9 @@ from tkinter import filedialog, messagebox, simpledialog
 import pyperclip
 import ttkbootstrap as ttk
 
-from GameSentenceMiner.package_updater import check_for_updates, get_latest_version, get_current_version
 from GameSentenceMiner import obs, configuration
 from GameSentenceMiner.configuration import *
+from GameSentenceMiner.package import get_current_version, get_latest_version
 
 settings_saved = False
 on_save = []
@@ -95,25 +95,6 @@ class ConfigApp:
         if self.window is not None:
             self.window.withdraw()
 
-    def update_now(self):
-        update_available, version = check_for_updates()
-        if update_available:
-            messagebox.showinfo("Update", "GSM Will Copy the Update Command to your clipboard, please run it in a terminal.")
-            pyperclip.copy("pip install --upgrade GameSentenceMiner")
-            self.on_exit(None, None)
-        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 save_settings(self, profile_change=False):
         global settings_saved
 
@@ -123,7 +104,6 @@ class ConfigApp:
                 use_websocket=self.websocket_enabled.get(),
                 websocket_uri=self.websocket_uri.get(),
                 open_config_on_startup=self.open_config_on_startup.get(),
-                check_for_update_on_startup=self.check_for_update_on_startup.get(),
                 texthook_replacement_regex=self.texthook_replacement_regex.get()
             ),
             paths=Paths(
@@ -295,13 +275,6 @@ 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)
@@ -314,13 +287,6 @@ class ConfigApp:
         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

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

GameSentenceMiner/downloader/download_tools.py

@@ -67,37 +67,37 @@ def download_obs_if_needed():
         with zipfile.ZipFile(obs_installer, 'r') as zip_ref:
             zip_ref.extractall(obs_path)
         open(os.path.join(obs_path, "portable_mode"), 'a').close()
-        websocket_config_path = os.path.join(obs_path, 'config', 'obs-studio')
-        if not copy_obs_settings(os.path.join(os.getenv('APPDATA'), 'obs-studio'), websocket_config_path):
-            websocket_config_path = os.path.join(obs_path, 'config', 'obs-studio', 'plugin_config', 'obs-websocket')
-            os.makedirs(websocket_config_path, exist_ok=True)
-
-            websocket_config = {
-                "alerts_enabled": False,
-                "auth_required": False,
-                "first_load": False,
-                "server_enabled": True,
-                "server_password": secrets.token_urlsafe(16),
-                "server_port": 7274
-            }
-            with open(os.path.join(websocket_config_path, 'config.json'), 'w') as config_file:
-                json.dump(websocket_config, config_file, indent=4)
-            basic_ini_path = os.path.join(obs_path, 'config', 'obs-studio', 'basic', 'profiles', 'Untitled')
-            os.makedirs(basic_ini_path, exist_ok=True)
-            with open(os.path.join(basic_ini_path, 'basic.ini'), 'w') as basic_ini_file:
-                basic_ini_file.write(
-                    "[SimpleOutput]\n"
-                    f"FilePath={os.path.expanduser('~')}/Videos/GSM\n"
-                    "RecRB=true\n"
-                    "RecRBTime=60\n"
-                    "RecRBSize=512\n"
-                    "RecRBPrefix=GSM\n"
-                    "RecAudioEncoder=opus\n"
-                )
-            scene_json_path = os.path.join(obs_path, 'config', 'obs-studio', 'basic', 'scenes')
-            os.makedirs(scene_json_path, exist_ok=True)
-            with open(os.path.join(scene_json_path, 'Untitled.json'), 'w') as scene_file:
-                scene_file.write(scenes)
+        # websocket_config_path = os.path.join(obs_path, 'config', 'obs-studio')
+        # if not copy_obs_settings(os.path.join(os.getenv('APPDATA'), 'obs-studio'), websocket_config_path):
+        websocket_config_path = os.path.join(obs_path, 'config', 'obs-studio', 'plugin_config', 'obs-websocket')
+        os.makedirs(websocket_config_path, exist_ok=True)
+
+        websocket_config = {
+            "alerts_enabled": False,
+            "auth_required": False,
+            "first_load": False,
+            "server_enabled": True,
+            "server_password": secrets.token_urlsafe(16),
+            "server_port": 7274
+        }
+        with open(os.path.join(websocket_config_path, 'config.json'), 'w') as config_file:
+            json.dump(websocket_config, config_file, indent=4)
+        basic_ini_path = os.path.join(obs_path, 'config', 'obs-studio', 'basic', 'profiles', 'Untitled')
+        os.makedirs(basic_ini_path, exist_ok=True)
+        with open(os.path.join(basic_ini_path, 'basic.ini'), 'w') as basic_ini_file:
+            basic_ini_file.write(
+                "[SimpleOutput]\n"
+                f"FilePath={os.path.expanduser('~')}/Videos/GSM\n"
+                "RecRB=true\n"
+                "RecRBTime=60\n"
+                "RecRBSize=512\n"
+                "RecRBPrefix=GSM\n"
+                "RecAudioEncoder=opus\n"
+            )
+        scene_json_path = os.path.join(obs_path, 'config', 'obs-studio', 'basic', 'scenes')
+        os.makedirs(scene_json_path, exist_ok=True)
+        with open(os.path.join(scene_json_path, 'Untitled.json'), 'w') as scene_file:
+            scene_file.write(scenes)
         logger.info(f"OBS extracted to {obs_path}.")
     else:
         logger.error(f"Please install OBS manually from {obs_installer}")

GameSentenceMiner/gsm.py

@@ -463,8 +463,6 @@ def main(reloading=False, do_config_input=True):
         win32api.SetConsoleCtrlHandler(handle_exit())
 
     try:
-        if get_config().general.check_for_update_on_startup:
-            root.after(0, settings_window.check_update)
         if get_config().general.open_config_on_startup:
             root.after(0, settings_window.show)
         settings_window.add_save_hook(update_icon)

GameSentenceMiner/{package_updater.py → package.py}

@@ -1,8 +1,6 @@
 import os
 from importlib import metadata
-import sys
 
-import pyperclip
 import requests
 
 from GameSentenceMiner.configuration import logger, get_app_directory

GameSentenceMiner/vad/vosk_helper.py

@@ -19,12 +19,12 @@ vosk_model = None
 # Function to download and cache the Vosk model
 def download_and_cache_vosk_model(model_dir="vosk_model_cache"):
     # Ensure the cache directory exists
-    if not os.path.exists(model_dir):
-        os.makedirs(model_dir)
+    if not os.path.exists(os.path.join(get_app_directory(), model_dir)):
+        os.makedirs(os.path.join(get_app_directory(), model_dir))
 
     # Extract the model name from the URL
     model_filename = get_config().vad.vosk_url.split("/")[-1]
-    model_path = os.path.join(model_dir, model_filename)
+    model_path = os.path.join(get_app_directory(), model_dir, model_filename)
 
     # If the model is already downloaded, skip the download
     if not os.path.exists(model_path):
@@ -38,7 +38,7 @@ def download_and_cache_vosk_model(model_dir="vosk_model_cache"):
         logger.info("Download complete.")
 
     # Extract the model if it's a zip or tar file
-    model_extract_path = os.path.join(model_dir, "vosk_model")
+    model_extract_path = os.path.join(get_app_directory(), model_dir, "vosk_model")
     if not os.path.exists(model_extract_path):
         logger.info("Extracting the Vosk model...")
         if model_filename.endswith(".zip"):

{gamesentenceminer-2.4.1.dev1.dist-info → gamesentenceminer-2.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: GameSentenceMiner
-Version: 2.4.1.dev1
+Version: 2.4.3
 Summary: A tool for mining sentences from games. Update: Multi-Line Mining! Fixed!
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.4.1.dev1.dist-info → gamesentenceminer-2.4.3.dist-info}/RECORD

@@ -1,26 +1,26 @@
 GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/anki.py,sha256=QBrA-WVQfK4KjKB2Wm1WDW7BlVy8MF6-1ByTApVzPVA,10576
-GameSentenceMiner/config_gui.py,sha256=nk0-aFTrqtygbLOqnQMSUqHQFda4bRhFG18Tz3Ansn4,54215
-GameSentenceMiner/configuration.py,sha256=zj3Oi1oRN0oxV_Y1xVbtGdxo0966am13j-cmKS7ezLs,14509
+GameSentenceMiner/config_gui.py,sha256=RCZJwg5FQpx_J-8jS7v54ivKPBkjicHKpmzN2zh9yAA,51975
+GameSentenceMiner/configuration.py,sha256=fQNBQjmJn2ViBSYMFNuyC5CSklBk0xgMDSXC47CwDe0,14463
 GameSentenceMiner/ffmpeg.py,sha256=4nyl_kdXi_trzDyhhjSmszN0BlFF-McAFyOghvCyl34,11142
 GameSentenceMiner/gametext.py,sha256=AkK77s_orZrWYEZEDDN9V8vvwiyt_YKAlWS4hhYXUx4,8928
-GameSentenceMiner/gsm.py,sha256=nJa1FdPZOBOWvKRAmkoDcoMKsIVqg9DsjAp6N17Fb80,19448
+GameSentenceMiner/gsm.py,sha256=t6hGJZKfMgiwgYUy7zWHlfmwyyLD-_eOEBeiTPpMFxk,19331
 GameSentenceMiner/model.py,sha256=oh8VVT8T1UKekbmP6MGNgQ8jIuQ_7Rg4GPzDCn2kJo8,1999
 GameSentenceMiner/notification.py,sha256=WBaQWoPNhW4XqdPBUmxPBgjk0ngzH_4v9zMQ-XQAKC8,2010
 GameSentenceMiner/obs.py,sha256=8ImXAVUWa4JdzwcBOEFShlZRZzh1dCvdpD1aEGhQfbU,6566
-GameSentenceMiner/package_updater.py,sha256=0uaLAp0WrWqostNTBWRS0laITjI9aN9Yt_6GXosS4NQ,1278
+GameSentenceMiner/package.py,sha256=YlS6QRMuVlm6mdXx0rlXv9_3erTGS21jaP3PNNWfAH0,1250
 GameSentenceMiner/util.py,sha256=MITweiFYaefWQF5nR8tZ9yE6vd_b-fLuP0MP1Y1U4K0,4720
 GameSentenceMiner/utility_gui.py,sha256=EtQUnCgTTdzKJE0iCJiHjjc_c6tc7JtI09LRg4_iy8Y,4555
 GameSentenceMiner/downloader/Untitled_json.py,sha256=RUUl2bbbCpUDUUS0fP0tdvf5FngZ7ILdA_J5TFYAXUQ,15272
 GameSentenceMiner/downloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/downloader/download_tools.py,sha256=M7vLo6_0QMuk1Ji4CsZqk1C2g7Bq6PyM29r7XNoP6Rw,6406
+GameSentenceMiner/downloader/download_tools.py,sha256=584QVsv-btpJowMRrqSbWpKDCMhInQM0iGe-Yw0Q2p0,6298
 GameSentenceMiner/vad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/vad/silero_trim.py,sha256=syDJX_KbFmdyFFtnQqYTD0tICsUCJizYhs-atPgXtxA,1549
-GameSentenceMiner/vad/vosk_helper.py,sha256=-AAwK0cgOC5rK3_gL0sQgrPJ75E49g_PxZR4d5ckwc4,5826
+GameSentenceMiner/vad/vosk_helper.py,sha256=HifeXKbEMrs81ZuuGxS67yAghu8TMXUP6Oan9i9dTxw,5938
 GameSentenceMiner/vad/whisper_helper.py,sha256=bpR1HVnJRn9H5u8XaHBqBJ6JwIjzqn-Fajps8QmQ4zc,3411
-gamesentenceminer-2.4.1.dev1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.4.1.dev1.dist-info/METADATA,sha256=JsOXN8xdga2-9UK5l73MtXnU9-qb8m1HJUE41zrSCwI,10400
-gamesentenceminer-2.4.1.dev1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-gamesentenceminer-2.4.1.dev1.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.4.1.dev1.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.4.1.dev1.dist-info/RECORD,,
+gamesentenceminer-2.4.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.4.3.dist-info/METADATA,sha256=66Gl-pWPnznGHiLO23WIcsxwj7xdtONTsaQZ_E-Kltc,10395
+gamesentenceminer-2.4.3.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+gamesentenceminer-2.4.3.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.4.3.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.4.3.dist-info/RECORD,,