GameSentenceMiner 2.5.9__py3-none-any.whl → 2.5.10__py3-none-any.whl

GameSentenceMiner/anki.py

@@ -28,7 +28,7 @@ card_queue = []
 
 
 def update_anki_card(last_note: AnkiCard, note=None, audio_path='', video_path='', tango='', reuse_audio=False,
-                     should_update_audio=True, ss_time=0, game_line=None):
+                     should_update_audio=True, ss_time=0, game_line=None, selected_lines=None):
     global audio_in_anki, screenshot_in_anki, prev_screenshot_in_anki
     update_audio = should_update_audio and (get_config().anki.sentence_audio_field and not
     last_note.get_field(get_config().anki.sentence_audio_field) or get_config().anki.overwrite_audio)
@@ -44,7 +44,7 @@ def update_anki_card(last_note: AnkiCard, note=None, audio_path='', video_path='
             if get_config().paths.remove_screenshot:
                 os.remove(screenshot)
         if get_config().anki.previous_image_field:
-            prev_screenshot = ffmpeg.get_screenshot(video_path, ffmpeg.get_screenshot_time(video_path, game_line.prev))
+            prev_screenshot = ffmpeg.get_screenshot(video_path, ffmpeg.get_screenshot_time(video_path, selected_lines[0].prev if selected_lines else game_line.prev))
             prev_screenshot_in_anki = store_media_file(prev_screenshot)
             if get_config().paths.remove_screenshot:
                 os.remove(prev_screenshot)
@@ -158,7 +158,10 @@ def get_initial_card_info(last_note: AnkiCard, selected_lines):
             last_note.get_field(get_config().anki.previous_sentence_field):
         logger.debug(
             f"Adding Previous Sentence: {get_config().anki.previous_sentence_field and game_line.prev.text and not last_note.get_field(get_config().anki.previous_sentence_field)}")
-        note['fields'][get_config().anki.previous_sentence_field] = game_line.prev.text
+        if selected_lines:
+            note['fields'][get_config().anki.previous_sentence_field] = selected_lines[0].prev.text
+        else:
+            note['fields'][get_config().anki.previous_sentence_field] = game_line.prev.text
     return note
 
 

GameSentenceMiner/config_gui.py

@@ -216,6 +216,8 @@ class ConfigApp:
             self.master_config.current_profile = current_profile
             self.master_config.set_config_for_profile(current_profile, config)
 
+        self.master_config = self.master_config.sync_shared_fields()
+
         # Serialize the config instance to JSON
         with open(get_config_path(), 'w') as file:
             file.write(self.master_config.to_json(indent=4))
@@ -225,6 +227,7 @@ class ConfigApp:
         if self.master_config.get_config().restart_required(prev_config):
             logger.info("Restart Required for some settings to take affect!")
             send_restart_signal()
+
         settings_saved = True
         configuration.reload_config()
         self.settings = get_config()

GameSentenceMiner/configuration.py

@@ -303,6 +303,58 @@ class Config:
     def get_default_config(self):
         return self.configs[DEFAULT_CONFIG]
 
+    def sync_shared_fields(self):
+        config = self.get_config()
+        for profile in self.configs.values():
+            self.sync_shared_field(config.hotkeys, profile.hotkeys, "reset_line")
+            self.sync_shared_field(config.hotkeys, profile.hotkeys, "take_screenshot")
+            self.sync_shared_field(config.hotkeys, profile.hotkeys, "open_utility")
+            self.sync_shared_field(config.hotkeys, profile.hotkeys, "play_latest_audio")
+            # self.sync_shared_field(config.advanced, profile.advanced, "audio_player_path")
+            # self.sync_shared_field(config.advanced, profile.advanced, "video_player_path")
+            # self.sync_shared_field(config.advanced, profile.advanced, "show_screenshot_buttons")
+            self.sync_shared_field(config.anki, profile.anki, "url")
+            self.sync_shared_field(config.anki, profile.anki, "sentence_field")
+            self.sync_shared_field(config.anki, profile.anki, "sentence_audio_field")
+            self.sync_shared_field(config.anki, profile.anki, "picture_field")
+            self.sync_shared_field(config.anki, profile.anki, "word_field")
+            self.sync_shared_field(config.anki, profile.anki, "previous_sentence_field")
+            self.sync_shared_field(config.anki, profile.anki, "previous_image_field")
+            self.sync_shared_field(config.anki, profile.anki, "tags_to_check")
+            self.sync_shared_field(config.anki, profile.anki, "add_game_tag")
+            self.sync_shared_field(config.anki, profile.anki, "polling_rate")
+            self.sync_shared_field(config.anki, profile.anki, "overwrite_audio")
+            self.sync_shared_field(config.anki, profile.anki, "overwrite_picture")
+            self.sync_shared_field(config.anki, profile.anki, "multi_overwrites_sentence")
+            self.sync_shared_field(config.anki, profile.anki, "anki_custom_fields")
+            self.sync_shared_field(config.general, profile.general, "open_config_on_startup")
+            self.sync_shared_field(config.general, profile.general, "open_multimine_on_startup")
+            self.sync_shared_field(config.general, profile.general, "websocket_uri")
+            self.sync_shared_field(config.audio, profile.audio, "external_tool")
+            self.sync_shared_field(config.audio, profile.audio, "anki_media_collection")
+            self.sync_shared_field(config, profile, "advanced")
+            self.sync_shared_field(config, profile, "paths")
+            self.sync_shared_field(config, profile, "obs")
+
+        return self
+
+    def sync_shared_field(self, config, config2, field_name):
+        try:
+            config_value = getattr(config, field_name, None)
+            config2_value = getattr(config2, field_name, None)
+
+            if config_value != config2_value:  # Check if values are different.
+                if config_value is not None:
+                    logging.info(f"Syncing shared field '{field_name}' to other profile.")
+                    setattr(config2, field_name, config_value)
+                elif config2_value is not None:
+                    logging.info(f"Syncing shared field '{field_name}' to current profile.")
+                    setattr(config, field_name, config2_value)
+        except AttributeError as e:
+            logging.error(f"AttributeError during sync of '{field_name}': {e}")
+        except Exception as e:
+            logging.error(f"An unexpected error occurred during sync of '{field_name}': {e}")
+
 
 def get_default_anki_path():
     if platform == 'win32':  # Windows

GameSentenceMiner/ffmpeg.py

@@ -191,7 +191,7 @@ def trim_audio_based_on_last_line(untrimmed_audio, video_path, game_line, next_l
 
     ffmpeg_command = ffmpeg_base_command_list + [
         "-i", untrimmed_audio,
-        "-ss", start_trim_time]
+        "-ss", str(start_trim_time)]
     if next_line and next_line > game_line.time:
         end_total_seconds = total_seconds + (next_line - game_line.time).total_seconds() + 1
         hours, remainder = divmod(end_total_seconds, 3600)
@@ -222,7 +222,8 @@ def get_video_timings(video_path, game_line):
     total_seconds = file_length - time_delta.total_seconds()
     total_seconds_after_offset = total_seconds + get_config().audio.beginning_offset
     if total_seconds < 0 or total_seconds >= file_length:
-        logger.info(f"0 seconds trimmed off of beginning")
+        logger.error("Line mined is outside of the replay buffer! Defaulting to the beginning of the replay buffer. ")
+        logger.info("Recommend either increasing replay buffer length in OBS Settings or mining faster.")
         return 0, 0, 0
 
     hours, remainder = divmod(total_seconds_after_offset, 3600)

GameSentenceMiner/gsm.py

@@ -25,6 +25,7 @@ from GameSentenceMiner.configuration import *
 from GameSentenceMiner.downloader.download_tools import download_obs_if_needed, download_ffmpeg_if_needed
 from GameSentenceMiner.ffmpeg import get_audio_and_trim, get_video_timings
 from GameSentenceMiner.gametext import get_text_event, get_mined_line, GameLine
+from GameSentenceMiner.obs import check_obs_folder_is_correct
 from GameSentenceMiner.util import *
 from GameSentenceMiner.utility_gui import init_utility_window, get_utility_window
 from GameSentenceMiner.vad import silero_trim, whisper_helper, vosk_helper
@@ -128,8 +129,8 @@ class VideoToAudioHandler(FileSystemEventHandler):
                     ss_timing = ffmpeg.get_screenshot_time(video_path, mined_line)
                 if last_note:
                     logger.debug(last_note.to_json())
-
-                note = anki.get_initial_card_info(last_note, get_utility_window().get_selected_lines())
+                selected_lines = get_utility_window().get_selected_lines()
+                note = anki.get_initial_card_info(last_note, selected_lines)
                 tango = last_note.get_field(get_config().anki.word_field) if last_note else ''
                 get_utility_window().reset_checkboxes()
 
@@ -149,7 +150,8 @@ class VideoToAudioHandler(FileSystemEventHandler):
                                           tango=tango,
                                           should_update_audio=should_update_audio,
                                           ss_time=ss_timing,
-                                          game_line=start_line)
+                                          game_line=start_line,
+                                          selected_lines=selected_lines)
                 elif get_config().features.notify_on_update and should_update_audio:
                     notification.send_audio_generated_notification(vad_trimmed_audio)
         except Exception as e:
@@ -535,7 +537,8 @@ def initialize_async():
     if get_config().obs.enabled:
         if get_config().obs.open_obs:
             tasks.append(obs.start_obs)
-        tasks.append(obs.connect_to_obs)
+        else:
+            tasks.append(obs.connect_to_obs)
         tasks.append(anki.start_monitoring_anki)
     if get_config().vad.do_vad_postprocessing:
         if VOSK in (get_config().vad.backup_vad_model, get_config().vad.selected_vad_model):
@@ -571,6 +574,7 @@ def main(reloading=False):
     init_utility_window(root)
     initialize(reloading)
     initialize_async()
+    check_obs_folder_is_correct()
     observer = Observer()
     observer.schedule(VideoToAudioHandler(), get_config().paths.folder_to_watch, recursive=False)
     observer.start()

GameSentenceMiner/model.py

@@ -77,6 +77,12 @@ class SceneItemsResponse:
     # def __init__(self, **kwargs):
     #     self.sceneItems = [SceneItem(**item) for item in kwargs['sceneItems']]
 
+
+@dataclass_json
+@dataclass
+class RecordDirectory:
+    recordDirectory: str
+
 #
 # @dataclass_json
 # @dataclass

GameSentenceMiner/notification.py

@@ -6,9 +6,17 @@ from win10toast import ToastNotifier
 
 from GameSentenceMiner.configuration import logger
 
+class MyToastNotifier(ToastNotifier):
+    def __init__(self):
+        super().__init__()
+
+    def on_destroy(self, hwnd, msg, wparam, lparam):
+        super().on_destroy(hwnd, msg, wparam, lparam)
+        return 0
+
 system = platform.system()
 if system == "Windows":
-    notifier = ToastNotifier()
+    notifier = MyToastNotifier()
 else:
     notifier = notification
 

GameSentenceMiner/obs.py

@@ -1,4 +1,5 @@
 import logging
+import os.path
 import subprocess
 import time
 
@@ -32,11 +33,21 @@ def start_obs():
             return obs_pid
         obs_process = subprocess.Popen([obs_path, '--disable-shutdown-check', '--portable'], cwd=os.path.dirname(obs_path))
         logger.info("OBS launched")
+        connect_to_obs()
         return obs_process.pid
     except Exception as e:
         logger.error(f"Error launching OBS: {e}")
         return None
 
+def check_obs_folder_is_correct():
+    obs_record_directory = get_record_directory()
+    if obs_record_directory and os.path.normpath(obs_record_directory) != os.path.normpath(
+            get_config().paths.folder_to_watch):
+        logger.info("OBS Path Setting wrong, OBS Recording folder in GSM Config")
+        get_config().paths.folder_to_watch = os.path.normpath(obs_record_directory)
+        get_master_config().sync_shared_fields()
+        save_full_config(get_master_config())
+
 def is_obs_running(obs_path):
     obs_path = os.path.abspath(obs_path)  # Normalize path
     for process in psutil.process_iter(['exe']):
@@ -114,7 +125,7 @@ def disconnect_from_obs():
         client = None
         logger.info("Disconnected from OBS WebSocket.")
 
-def do_obs_call(request, from_dict = None, retry=5):
+def do_obs_call(request, from_dict = None, retry=10):
     try:
         response = client.call(request)
         if not response.status and retry > 0:
@@ -163,14 +174,13 @@ def stop_replay_buffer():
     except Exception as e:
         logger.error(f"Error stopping replay buffer: {e}")
 
-
 # Save the current replay buffer
 def save_replay_buffer():
     try:
         replay_buffer_started = client.call(requests.GetReplayBufferStatus()).datain['outputActive']
         if replay_buffer_started:
             client.call(requests.SaveReplayBuffer())
-            logger.info("Replay buffer saved.")
+            logger.info("Replay buffer saved. If your log stops bere, make sure your obs output path matches \"Path To Watch\" in GSM settings.")
         else:
             logger.error("Replay Buffer is not active, could not save Replay Buffer!")
     except Exception as e:
@@ -192,6 +202,13 @@ def get_source_from_scene(scene_name):
         logger.error(f"Error getting source from scene: {e}")
         return ''
 
+def get_record_directory():
+    try:
+        return do_obs_call(requests.GetRecordDirectory(), RecordDirectory.from_dict).recordDirectory
+    except Exception as e:
+        logger.error(f"Error getting recording folder: {e}")
+        return ''
+
 
 def get_screenshot():
     try:

GameSentenceMiner/utility_gui.py

@@ -78,8 +78,12 @@ class UtilityApp:
 
     def add_text(self, line):
         if line.text:
-            var = tk.BooleanVar()
-            self.items.append((line, var))
+            try:
+                var = tk.BooleanVar()
+                self.items.append((line, var))
+            except Exception as e:
+                logger.error(f"NOT AN ERROR: Attempted to add text to multi-mine window, before it was initialized: {e}")
+                return
 
             if len(self.items) > 10:
                 if self.checkboxes:

{gamesentenceminer-2.5.9.dist-info → gamesentenceminer-2.5.10.dist-info}/METADATA

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

gamesentenceminer-2.5.10.dist-info/RECORD

@@ -0,0 +1,29 @@
+GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+GameSentenceMiner/anki.py,sha256=xeWU1jX1ZK6tZVnDPqhBzetkCxdbPUWG1LkUy0sfHVg,13089
+GameSentenceMiner/config_gui.py,sha256=v4XRxGqRddqCrdv1UHu4Gnp7aMjL-CCCHBFlTy1Y2v0,61265
+GameSentenceMiner/configuration.py,sha256=DXlwEV4A7X3yzVV6UomY2jmmYAZx_jjMRxZeweoCtRE,20149
+GameSentenceMiner/ffmpeg.py,sha256=fzOxrn-a4KqFdUY2oove164CTDOSsdPQtzqRW5f1P7c,12002
+GameSentenceMiner/gametext.py,sha256=LORVdE2WEo1CDI8gonc7qxrhbS4KFKXFQVKjhlkpLbc,7368
+GameSentenceMiner/gsm.py,sha256=KKlI-wrk39XWfPEa9yqAlBwiusm6b-V5aITPFZCRWUs,24707
+GameSentenceMiner/model.py,sha256=JdnkT4VoPOXmOpRgFdvERZ09c9wLN6tUJxdrKlGZcqo,5305
+GameSentenceMiner/notification.py,sha256=FY39ChSRK0Y8TQ6lBGsLnpZUFPtFpSy2tweeXVoV7kc,2809
+GameSentenceMiner/obs.py,sha256=EcgQ0VdeYXGeXCyvk8mBiHBL-HHai037BoCXomH9ge4,8239
+GameSentenceMiner/package.py,sha256=YlS6QRMuVlm6mdXx0rlXv9_3erTGS21jaP3PNNWfAH0,1250
+GameSentenceMiner/util.py,sha256=tkaoU1bj8iPMTNwUCWUzFLAnT44Ot92D1tYwQMEnARw,7336
+GameSentenceMiner/utility_gui.py,sha256=H4aOddlsrVR768RwbMzYScCziuOz1JeySUigNrPlaac,7692
+GameSentenceMiner/communication/__init__.py,sha256=_jGn9PJxtOAOPtJ2rI-Qu9hEHVZVpIvWlxKvqk91_zI,638
+GameSentenceMiner/communication/send.py,sha256=oOJdCS6-LNX90amkRn5FL2xqx6THGm56zHR2ntVIFTE,229
+GameSentenceMiner/communication/websocket.py,sha256=vrZ9KwRUyZOepjayJkxZZTsNIbHGcDLgDRO9dNDwizM,2914
+GameSentenceMiner/downloader/Untitled_json.py,sha256=RUUl2bbbCpUDUUS0fP0tdvf5FngZ7ILdA_J5TFYAXUQ,15272
+GameSentenceMiner/downloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+GameSentenceMiner/downloader/download_tools.py,sha256=mI1u_FGBmBqDIpCH3jOv8DOoZ3obgP5pIf9o9SVfX2Q,8131
+GameSentenceMiner/vad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+GameSentenceMiner/vad/silero_trim.py,sha256=-thDIZLuTLra3YBj7WR16Z6JeDgSpge2YuahprBvD8I,1585
+GameSentenceMiner/vad/vosk_helper.py,sha256=BI_mg_qyrjNbuEJjXSUDoV0FWEtQtEOAPmrrNixnZ_8,5974
+GameSentenceMiner/vad/whisper_helper.py,sha256=OF4J8TPPoKPJR1uFwrWAZ2Q7v0HJkVvNGmF8l1tACX0,3447
+gamesentenceminer-2.5.10.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.5.10.dist-info/METADATA,sha256=foslJf1hVD8xY5LLltn7GUYapOOXXszAJyxfXS1bqIM,5436
+gamesentenceminer-2.5.10.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+gamesentenceminer-2.5.10.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.5.10.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.5.10.dist-info/RECORD,,

gamesentenceminer-2.5.9.dist-info/RECORD

@@ -1,29 +0,0 @@
-GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/anki.py,sha256=YcdNDpUskjdxi8upZ5SLGTyRbO8NlOPcqsV_8akTwuM,12877
-GameSentenceMiner/config_gui.py,sha256=cLKVliB0X61WNduNisOmaEtqSr1mvTO6ZAiv-t2jW-8,61194
-GameSentenceMiner/configuration.py,sha256=-b1wW6EkkOFwF1No1uZLD2nPUV5gfBIzG5a8_ykqyUI,16691
-GameSentenceMiner/ffmpeg.py,sha256=Bvkk0TMHtoQkpEYQls48CbC4TB0-FzrnqQhRNg36hVk,11831
-GameSentenceMiner/gametext.py,sha256=LORVdE2WEo1CDI8gonc7qxrhbS4KFKXFQVKjhlkpLbc,7368
-GameSentenceMiner/gsm.py,sha256=FahSpCMBQGZjbROTfrDFUrELJ09TvOKCsWKFXpeuaIU,24473
-GameSentenceMiner/model.py,sha256=bZm-2vkIw4gQCGLB02eDoTtO1Ymb_dnHk0VDJDFO3y8,5228
-GameSentenceMiner/notification.py,sha256=2d8_8DUxImeC1zY-V4c_PZw1zbvvGZ6KiAnPaSmH9G0,2592
-GameSentenceMiner/obs.py,sha256=N7XoPSzLk9rHi4sgsG_LS2dN06MrqwN2mpSHfjONTjE,7368
-GameSentenceMiner/package.py,sha256=YlS6QRMuVlm6mdXx0rlXv9_3erTGS21jaP3PNNWfAH0,1250
-GameSentenceMiner/util.py,sha256=tkaoU1bj8iPMTNwUCWUzFLAnT44Ot92D1tYwQMEnARw,7336
-GameSentenceMiner/utility_gui.py,sha256=aVdI9zVXADS53g7QtTgmkVK1LumBsXF4Lou3qJzgHN8,7487
-GameSentenceMiner/communication/__init__.py,sha256=_jGn9PJxtOAOPtJ2rI-Qu9hEHVZVpIvWlxKvqk91_zI,638
-GameSentenceMiner/communication/send.py,sha256=oOJdCS6-LNX90amkRn5FL2xqx6THGm56zHR2ntVIFTE,229
-GameSentenceMiner/communication/websocket.py,sha256=vrZ9KwRUyZOepjayJkxZZTsNIbHGcDLgDRO9dNDwizM,2914
-GameSentenceMiner/downloader/Untitled_json.py,sha256=RUUl2bbbCpUDUUS0fP0tdvf5FngZ7ILdA_J5TFYAXUQ,15272
-GameSentenceMiner/downloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/downloader/download_tools.py,sha256=mI1u_FGBmBqDIpCH3jOv8DOoZ3obgP5pIf9o9SVfX2Q,8131
-GameSentenceMiner/vad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/vad/silero_trim.py,sha256=-thDIZLuTLra3YBj7WR16Z6JeDgSpge2YuahprBvD8I,1585
-GameSentenceMiner/vad/vosk_helper.py,sha256=BI_mg_qyrjNbuEJjXSUDoV0FWEtQtEOAPmrrNixnZ_8,5974
-GameSentenceMiner/vad/whisper_helper.py,sha256=OF4J8TPPoKPJR1uFwrWAZ2Q7v0HJkVvNGmF8l1tACX0,3447
-gamesentenceminer-2.5.9.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.5.9.dist-info/METADATA,sha256=tQ1mZZNVR5H06FYNkgokrzWUd7IZW6piZtR6GlPbDDs,5435
-gamesentenceminer-2.5.9.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-gamesentenceminer-2.5.9.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.5.9.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.5.9.dist-info/RECORD,,