GameSentenceMiner 2.4.4__py3-none-any.whl → 2.4.5__py3-none-any.whl

GameSentenceMiner/anki.py

@@ -3,6 +3,7 @@ import subprocess
 import threading
 import time
 import urllib.request
+from datetime import datetime, timedelta
 
 import requests as req
 
@@ -197,15 +198,18 @@ def get_cards_by_sentence(sentence):
 
     return last_notes
 
+last_connection_error = datetime.now()
 
 # Check for new Anki cards and save replay buffer if detected
 def check_for_new_cards():
-    global previous_note_ids, first_run
+    global previous_note_ids, first_run, last_connection_error
     current_note_ids = set()
     try:
         current_note_ids = get_note_ids()
     except Exception as e:
-        logger.error(f"Error fetching Anki notes: {e}")
+        if datetime.now() - last_connection_error > timedelta(seconds=10):
+            logger.error(f"Error fetching Anki notes, Make sure Anki is running, ankiconnect add-on is installed, and url/port is configured correctly in GSM Settings")
+            last_connection_error = datetime.now()
         return
     new_card_ids = current_note_ids - previous_note_ids
     if new_card_ids and not first_run:

GameSentenceMiner/config_gui.py

@@ -6,6 +6,7 @@ import ttkbootstrap as ttk
 
 from GameSentenceMiner import obs, configuration
 from GameSentenceMiner.configuration import *
+from GameSentenceMiner.electron_messaging import signal_restart_settings_change
 from GameSentenceMiner.package import get_current_version, get_latest_version
 
 settings_saved = False
@@ -187,7 +188,7 @@ class ConfigApp:
         )
 
         current_profile = self.profile_combobox.get()
-
+        prev_config = self.master_config.get_config()
         if profile_change:
             self.master_config.current_profile = current_profile
         else:
@@ -198,7 +199,11 @@ class ConfigApp:
         with open(get_config_path(), 'w') as file:
             file.write(self.master_config.to_json(indent=4))
 
-        print("Settings saved successfully!")
+        logger.info("Settings saved successfully!")
+
+        if self.master_config.get_config().restart_required(prev_config):
+            logger.info("Restart Required for some settings to take affect!")
+            signal_restart_settings_change()
         settings_saved = True
         configuration.reload_config()
         for func in on_save:

GameSentenceMiner/configuration.py

@@ -233,6 +233,19 @@ class ProfileConfig:
 
         return self
 
+    def restart_required(self, previous):
+        previous: ProfileConfig
+        if any([previous.general.use_websocket != self.general.use_websocket,
+                previous.general.websocket_uri != self.general.websocket_uri,
+                previous.paths.folder_to_watch != self.paths.folder_to_watch,
+                previous.obs.open_obs != self.obs.open_obs,
+                previous.obs.host != self.obs.host,
+                previous.obs.port != self.obs.port
+                ]):
+            return True
+        return False
+
+
 @dataclass_json
 @dataclass
 class Config:

GameSentenceMiner/downloader/download_tools.py

@@ -8,6 +8,8 @@ import zipfile
 
 from GameSentenceMiner.downloader.Untitled_json import scenes
 from GameSentenceMiner.configuration import get_app_directory, logger
+from GameSentenceMiner.ffmpeg import get_ffmpeg_path, get_ffprobe_path
+from GameSentenceMiner.obs import get_obs_path
 
 script_dir = os.path.dirname(os.path.abspath(__file__))
 
@@ -29,11 +31,15 @@ def copy_obs_settings(src, dest):
 
 def download_obs_if_needed():
     obs_path = os.path.join(get_app_directory(), 'obs-studio')
-    if os.path.exists(obs_path):
+    obs_exe_path = get_obs_path()
+    if os.path.exists(obs_path) and os.path.exists(obs_exe_path):
         logger.debug(f"OBS already installed at {obs_path}.")
         return
 
-    os.makedirs(obs_path, exist_ok=True)
+    if os.path.exists(obs_path) and not os.path.exists(obs_exe_path):
+        logger.info("OBS directory exists but executable is missing. Re-downloading OBS...")
+        shutil.rmtree(obs_path)
+
     latest_release_url = "https://api.github.com/repos/obsproject/obs-studio/releases/latest"
     with urllib.request.urlopen(latest_release_url) as response:
         latest_release = json.load(response)
@@ -54,11 +60,10 @@ def download_obs_if_needed():
     os.makedirs(download_dir, exist_ok=True)
     obs_installer = os.path.join(download_dir, "OBS.zip")
 
-    if os.path.exists(obs_installer):
-        logger.debug("OBS installer already exists. Skipping download.")
-    else:
-        logger.info(f"Downloading OBS from {obs_url}...")
-        urllib.request.urlretrieve(obs_url, obs_installer)
+    logger.info(f"Downloading OBS from {obs_url}...")
+    urllib.request.urlretrieve(obs_url, obs_installer)
+
+    os.makedirs(obs_path, exist_ok=True)
 
     if platform.system() == "Windows":
 
@@ -103,13 +108,17 @@ def download_obs_if_needed():
         logger.error(f"Please install OBS manually from {obs_installer}")
 
 def download_ffmpeg_if_needed():
-    ffmpeg_path = os.path.join(get_app_directory(), 'ffmpeg')
+    ffmpeg_dir = os.path.join(get_app_directory(), 'ffmpeg')
+    ffmpeg_exe_path = get_ffmpeg_path()
+    ffprobe_exe_path = get_ffprobe_path()
 
-    if os.path.exists(ffmpeg_path):
-        logger.debug(f"FFmpeg already installed at {ffmpeg_path}.")
+    if os.path.exists(ffmpeg_dir) and os.path.exists(ffmpeg_exe_path) and os.path.exists(ffprobe_exe_path):
+        logger.debug(f"FFmpeg already installed at {ffmpeg_dir}.")
         return
 
-    os.makedirs(ffmpeg_path, exist_ok=True)
+    if os.path.exists(ffmpeg_dir) and (not os.path.exists(ffmpeg_exe_path) or not os.path.exists(ffprobe_exe_path)):
+        logger.info("FFmpeg directory exists but executables are missing. Re-downloading FFmpeg...")
+        shutil.rmtree(ffmpeg_dir)
 
     ffmpeg_url = {
         "Windows": "https://www.gyan.dev/ffmpeg/builds/ffmpeg-release-essentials.zip",
@@ -125,21 +134,21 @@ def download_ffmpeg_if_needed():
     os.makedirs(download_dir, exist_ok=True)
     ffmpeg_archive = os.path.join(download_dir, "ffmpeg.zip")
 
-    if os.path.exists(ffmpeg_archive):
-        logger.debug("FFmpeg archive already exists. Skipping download.")
-    else:
-        logger.info(f"Downloading FFmpeg from {ffmpeg_url}...")
-        urllib.request.urlretrieve(ffmpeg_url, ffmpeg_archive)
-        logger.info(f"FFmpeg downloaded. Extracting to {ffmpeg_path}...")
+    logger.info(f"Downloading FFmpeg from {ffmpeg_url}...")
+    urllib.request.urlretrieve(ffmpeg_url, ffmpeg_archive)
+    logger.info(f"FFmpeg downloaded. Extracting to {ffmpeg_dir}...")
+
+    os.makedirs(ffmpeg_dir, exist_ok=True)
+
     with zipfile.ZipFile(ffmpeg_archive, 'r') as zip_ref:
         for member in zip_ref.namelist():
             filename = os.path.basename(member)
             if filename:  # Skip directories
                 source = zip_ref.open(member)
-                target = open(os.path.join(ffmpeg_path, filename), "wb")
+                target = open(os.path.join(ffmpeg_dir, filename), "wb")
                 with source, target:
                     shutil.copyfileobj(source, target)
-    logger.info(f"FFmpeg extracted to {ffmpeg_path}.")
+    logger.info(f"FFmpeg extracted to {ffmpeg_dir}.")
 def main():
     # Run dependency checks
     download_obs_if_needed()

GameSentenceMiner/electron_messaging.py

@@ -0,0 +1,6 @@
+from GameSentenceMiner.configuration import logger
+
+
+def signal_restart_settings_change():
+    logger.info("restart_for_settings_change")
+

GameSentenceMiner/gametext.py

@@ -118,7 +118,7 @@ async def listen_websocket():
                         handle_new_text_event(current_clipboard)
         except (websockets.ConnectionClosed, ConnectionError) as e:
             if not reconnecting:
-                logger.warning(f"Texthooker WebSocket connection lost: {e}. Attempting to Reconnect...")
+                logger.warning(f"Texthooker WebSocket connection lost: {e}. IF USING CLIPBOARD, WEBSOCKET NEEDS TO BE TURNED OFF IN SETTINGS. Attempting to Reconnect...")
             reconnecting = True
             await asyncio.sleep(5)
 

GameSentenceMiner/gsm.py

@@ -21,6 +21,7 @@ from GameSentenceMiner import util
 from GameSentenceMiner import utility_gui
 from GameSentenceMiner.configuration import *
 from GameSentenceMiner.downloader.download_tools import download_obs_if_needed, download_ffmpeg_if_needed
+from GameSentenceMiner.electron_messaging import signal_restart_settings_change
 from GameSentenceMiner.ffmpeg import get_audio_and_trim
 from GameSentenceMiner.gametext import get_text_event, get_mined_line
 from GameSentenceMiner.util import *
@@ -321,6 +322,7 @@ def switch_profile(icon, item):
     switch_profile_and_save(item.text)
     settings_window.reload_settings()
     update_icon()
+    signal_restart_settings_change()
 
 
 def run_tray():

{gamesentenceminer-2.4.4.dist-info → gamesentenceminer-2.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: GameSentenceMiner
-Version: 2.4.4
+Version: 2.4.5
 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.4.dist-info → gamesentenceminer-2.4.5.dist-info}/RECORD

@@ -1,10 +1,11 @@
 GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/anki.py,sha256=QBrA-WVQfK4KjKB2Wm1WDW7BlVy8MF6-1ByTApVzPVA,10576
-GameSentenceMiner/config_gui.py,sha256=RCZJwg5FQpx_J-8jS7v54ivKPBkjicHKpmzN2zh9yAA,51975
-GameSentenceMiner/configuration.py,sha256=fQNBQjmJn2ViBSYMFNuyC5CSklBk0xgMDSXC47CwDe0,14463
+GameSentenceMiner/anki.py,sha256=YSz5gUTsKOdbogwHKtgFM7v7pREjdAwl7A0Wa_CXnKg,10918
+GameSentenceMiner/config_gui.py,sha256=-V-GPyHFiN0EI-ZQLXq2yDVfCR_sP7afcjOZKsnGiO8,52312
+GameSentenceMiner/configuration.py,sha256=mbyIs0h9xh85_ZJkuqTgspkdfl7jeifpvlYofu1e0mE,15001
+GameSentenceMiner/electron_messaging.py,sha256=fBk9Ipo0jg2OZwYaKe1Qsm05P2ftrdTRGgFYob7ZA-k,139
 GameSentenceMiner/ffmpeg.py,sha256=P7rTOXYnwg2LWkXqC-pRNhoRIRUEU8EpV8IAfXFcFC4,11215
-GameSentenceMiner/gametext.py,sha256=OA7kLGTYj-GDhumZvzFgzEZ5cDpYHPhTANjUSciOKIY,6753
-GameSentenceMiner/gsm.py,sha256=t6hGJZKfMgiwgYUy7zWHlfmwyyLD-_eOEBeiTPpMFxk,19331
+GameSentenceMiner/gametext.py,sha256=VjWNdjHwWXWIwNOfYxud7EwIyg7t6zZ3IkmMhh8Vc0c,6819
+GameSentenceMiner/gsm.py,sha256=xLzeGYf0S0cNIdGdWN_eU_0JicVbz-yfXK1wyh7OvsA,19448
 GameSentenceMiner/model.py,sha256=oh8VVT8T1UKekbmP6MGNgQ8jIuQ_7Rg4GPzDCn2kJo8,1999
 GameSentenceMiner/notification.py,sha256=WBaQWoPNhW4XqdPBUmxPBgjk0ngzH_4v9zMQ-XQAKC8,2010
 GameSentenceMiner/obs.py,sha256=8ImXAVUWa4JdzwcBOEFShlZRZzh1dCvdpD1aEGhQfbU,6566
@@ -13,14 +14,14 @@ GameSentenceMiner/util.py,sha256=MITweiFYaefWQF5nR8tZ9yE6vd_b-fLuP0MP1Y1U4K0,472
 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=584QVsv-btpJowMRrqSbWpKDCMhInQM0iGe-Yw0Q2p0,6298
+GameSentenceMiner/downloader/download_tools.py,sha256=1x57nzktdlsUruTJxCPNpmHDDlhZ589NwRyAMP0Pq7E,6818
 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=HifeXKbEMrs81ZuuGxS67yAghu8TMXUP6Oan9i9dTxw,5938
 GameSentenceMiner/vad/whisper_helper.py,sha256=bpR1HVnJRn9H5u8XaHBqBJ6JwIjzqn-Fajps8QmQ4zc,3411
-gamesentenceminer-2.4.4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.4.4.dist-info/METADATA,sha256=tjgtg86q80_uZz6ZDFx90kN0r-RfB9PEbENBSEVp8wg,10324
-gamesentenceminer-2.4.4.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-gamesentenceminer-2.4.4.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.4.4.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.4.4.dist-info/RECORD,,
+gamesentenceminer-2.4.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.4.5.dist-info/METADATA,sha256=IApzmOm4iQV-UvU6U5uLFP0pJvVu3coMZlE8LxUfBLU,10324
+gamesentenceminer-2.4.5.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+gamesentenceminer-2.4.5.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.4.5.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.4.5.dist-info/RECORD,,

{gamesentenceminer-2.4.4.dist-info → gamesentenceminer-2.4.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.2)
+Generator: setuptools (76.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any