GameSentenceMiner 2.17.6__py3-none-any.whl → 2.18.0__py3-none-any.whl

GameSentenceMiner/gametext.py

@@ -9,10 +9,11 @@ import websockets
 from websockets import InvalidStatus
 from rapidfuzz import fuzz
 
-from GameSentenceMiner.util.configuration import get_config, gsm_status, logger, gsm_state
+from GameSentenceMiner.util.configuration import get_config, gsm_status, logger, gsm_state, is_dev
 from GameSentenceMiner.util.db import GameLinesTable
 from GameSentenceMiner.util.gsm_utils import do_text_replacements, TEXT_REPLACEMENTS_FILE, run_new_thread
 from GameSentenceMiner import obs
+from GameSentenceMiner.util.gsm_utils import add_srt_line
 from GameSentenceMiner.util.text_log import add_line, get_text_log
 from GameSentenceMiner.web.texthooking_page import add_event_to_texthooker, overlay_server_thread
 
@@ -87,7 +88,8 @@ async def listen_websockets():
                         message_received_time = datetime.now()
                         if not message:
                             continue
-                        logger.debug(message)
+                        if is_dev:
+                            logger.debug(message)
                         try:
                             data = json.loads(message)
                             if "sentence" in data:
@@ -183,6 +185,7 @@ async def handle_new_text_event(current_clipboard, line_time=None):
                 
 async def add_line_to_text_log(line, line_time=None):
     global overlay_processor
+    
     if get_config().general.texthook_replacement_regex:
         current_line_after_regex = re.sub(get_config().general.texthook_replacement_regex, '', line)
     else:
@@ -191,7 +194,7 @@ async def add_line_to_text_log(line, line_time=None):
     logger.info(f"Line Received: {current_line_after_regex}")
     current_line_time = line_time if line_time else datetime.now()
     gsm_status.last_line_received = current_line_time.strftime("%Y-%m-%d %H:%M:%S")
-    add_line(current_line_after_regex, line_time if line_time else datetime.now())
+    new_line = add_line(current_line_after_regex, line_time if line_time else datetime.now())
     if len(get_text_log().values) > 0:
         await add_event_to_texthooker(get_text_log()[-1])
     if get_config().overlay.websocket_port and overlay_server_thread.has_clients():
@@ -199,9 +202,9 @@ async def add_line_to_text_log(line, line_time=None):
             overlay_processor = OverlayProcessor()
         if overlay_processor.ready:
             await overlay_processor.find_box_and_send_to_overlay(current_line_after_regex)
+    add_srt_line(line_time, new_line)
     GameLinesTable.add_line(get_text_log()[-1])
 
-
 def reset_line_hotkey_pressed():
     global current_line_time
     logger.info("LINE RESET HOTKEY PRESSED")

GameSentenceMiner/gsm.py

@@ -1,3 +1,7 @@
+# There should be no imports here, as any error will crash the program.
+# All imports should be done in the try/except block below.
+
+
 def handle_error_in_initialization(e):
     """Handle errors that occur during initialization."""
     logger.exception(e, exc_info=True)
@@ -24,6 +28,7 @@ try:
     import requests
     import os.path
     import signal
+    import datetime
     from subprocess import Popen
     os.environ.pop('TCL_LIBRARY', None)
 
@@ -36,13 +41,17 @@ try:
     import psutil
 
     start_time = time.time()
+    import GameSentenceMiner.util.configuration
     from GameSentenceMiner.util.configuration import logger, gsm_state, get_config, anki_results, AnkiUpdateResult, \
     get_temporary_directory, get_log_path, get_master_config, switch_profile_and_save, get_app_directory, gsm_status, \
-    is_windows, is_linux
-    from GameSentenceMiner.util.get_overlay_coords import OverlayThread
-    from GameSentenceMiner.util.gsm_utils import remove_html_and_cloze_tags
+    is_windows, is_linux, get_ffmpeg_path
 
     logger.debug(f"[Import] configuration: {time.time() - start_time:.3f}s")
+    
+    start_time = time.time()
+    from GameSentenceMiner.util.get_overlay_coords import OverlayThread
+    from GameSentenceMiner.util.gsm_utils import remove_html_and_cloze_tags, add_srt_line
+    logger.debug(f"[Import] get_overlay_coords (OverlayThread, remove_html_and_cloze_tags): {time.time() - start_time:.3f}s")
 
     start_time = time.time()
     from GameSentenceMiner.util.model import VADResult
@@ -72,7 +81,7 @@ try:
     logger.debug(f"[Import] anki: {time.time() - start_time:.3f}s")
 
     start_time = time.time()
-    from GameSentenceMiner import config_gui
+    from GameSentenceMiner.ui import config_gui
     logger.debug(f"[Import] config_gui: {time.time() - start_time:.3f}s")
 
     start_time = time.time()
@@ -98,7 +107,7 @@ try:
         f"[Import] websocket (connect_websocket, register_websocket_message_handler, FunctionName): {time.time() - start_time:.3f}s")
 
     start_time = time.time()
-    from GameSentenceMiner.util.ffmpeg import get_audio_and_trim, get_video_timings, get_ffmpeg_path
+    from GameSentenceMiner.util.ffmpeg import get_audio_and_trim, get_video_timings
     logger.debug(
         f"[Import] util.ffmpeg (get_audio_and_trim, get_video_timings, get_ffmpeg_path): {time.time() - start_time:.3f}s")
 
@@ -145,15 +154,28 @@ class VideoToAudioHandler(FileSystemEventHandler):
         super().__init__()
 
     def on_created(self, event):
-        if event.is_directory or ("Replay" not in event.src_path and "GSM" not in event.src_path):
+        file_name = os.path.basename(event.src_path)
+        if event.is_directory or ("Replay" not in file_name and "GSM" not in file_name):
+            # This shows up as soon as recording starts, so it's kinda hard to use...
+            # if get_config().features.generate_longplay and event.src_path.endswith(".mkv") or event.src_path.endswith(".mp4"):
+            #     add_srt_line(datetime.datetime.now(), get_all_lines()[-1])
+            #     logger.info(f"Recording {event.src_path} FOUND, RUNNING LOGIC")
+            #     wait_for_stable_file(event.src_path)
+            #     current_srt = gsm_state.current_srt
+            #     srt_name = os.path.splitext(os.path.basename(event.src_path))[0] + ".srt"
+            #     srt_path = os.path.join(os.path.dirname(event.src_path), srt_name)
+            #     shutil.move(current_srt, srt_path)
+            #     gsm_state.current_srt = None
+            #     # self.process_replay(event.src_path)
             return
         # Adjust based on your OBS output format
-        if event.src_path.endswith(".mkv") or event.src_path.endswith(".mp4"):
+        if file_name.endswith(".mkv") or file_name.endswith(".mp4"):
             logger.info(f"MKV {event.src_path} FOUND, RUNNING LOGIC")
             wait_for_stable_file(event.src_path)
             self.process_replay(event.src_path)
 
     def process_replay(self, video_path):
+        gsm_state.current_replay = video_path
         vad_trimmed_audio = ''
         final_audio_output = ''
         skip_delete = False
@@ -194,6 +216,7 @@ class VideoToAudioHandler(FileSystemEventHandler):
             # Get Info of line mined
             line_cutoff = None
             start_line = None
+            full_text = ''
             if selected_lines:
                 start_line = selected_lines[0]
                 mined_line = get_mined_line(last_note, selected_lines)
@@ -300,7 +323,7 @@ class VideoToAudioHandler(FileSystemEventHandler):
                                                                 f"{obs.get_current_game(sanitize=True)}.{get_config().audio.extension}"))
 
         vad_result = vad_processor.trim_audio_with_vad(
-            trimmed_audio, vad_trimmed_audio, game_line)
+            trimmed_audio, vad_trimmed_audio, game_line, full_text)
         if timing_only:
             return vad_result
 
@@ -337,7 +360,7 @@ class VideoToAudioHandler(FileSystemEventHandler):
 
 def initial_checks():
     try:
-        subprocess.run(ffmpeg.ffmpeg_base_command_list)
+        subprocess.run(GameSentenceMiner.util.configuration.ffmpeg_base_command_list)
         logger.debug("FFMPEG is installed and accessible.")
     except FileNotFoundError:
         logger.error(
@@ -465,6 +488,13 @@ class GSMTray(threading.Thread):
         self.run_tray()
 
     def run_tray(self):
+        def run_anki_confirmation_window():
+            settings_window.show_anki_confirmation_dialog(expression="こんにちは",
+                sentence="こんにちは、世界！元気ですか？",
+                screenshot_path="test_image.png",
+                audio_path="C:/path/to/my/audio.mp3",
+                translation="Hello world! How are you?")
+
         self.profile_menu = Menu(
             *[MenuItem(("Active: " if profile == get_master_config().current_profile else "") + profile, self.switch_profile) for
               profile in
@@ -478,9 +508,10 @@ class GSMTray(threading.Thread):
             MenuItem("Toggle Replay Buffer", self.play_pause),
             MenuItem("Restart OBS", restart_obs),
             MenuItem("Switch Profile", self.profile_menu),
+            MenuItem("Run Test Code", run_anki_confirmation_window),
             MenuItem("Exit", exit_program)
         )
-
+        
         self.icon = Icon("TrayApp", create_image(), "GameSentenceMiner", menu)
         self.icon.run()
 
@@ -574,6 +605,8 @@ def restart_obs():
 
 def cleanup():
     try:
+        if gsm_state.current_srt and len(get_all_lines()) > 0:
+            add_srt_line(datetime.datetime.now(), get_all_lines()[-1])
         logger.info("Performing cleanup...")
         gsm_state.keep_running = False
 
@@ -794,6 +827,7 @@ async def async_main(reloading=False):
         root = ttk.Window(themename='darkly')
         start_time = time.time()
         settings_window = config_gui.ConfigApp(root)
+        gsm_state.config_app = settings_window
         initialize_async()
         observer = Observer()
         observer.schedule(VideoToAudioHandler(),
@@ -823,6 +857,11 @@ async def async_main(reloading=False):
             if get_config().general.open_config_on_startup:
                 root.after(50, settings_window.show)
             root.after(50, gsm_tray.start)
+            # root.after(100, settings_window.show_anki_confirmation_dialog(expression="こんにちは",
+            #     sentence="こんにちは、世界！元気ですか？",
+            #     screenshot_path="test_image.png",
+            #     audio_path="C:/path/to/my/audio.mp3",
+            #     translation="Hello world! How are you?"))
             settings_window.add_save_hook(gsm_tray.update_icon)
             settings_window.on_exit = exit_program
             root.mainloop()

GameSentenceMiner/locales/en_us.json

@@ -154,6 +154,10 @@
             "label": "Update Anki:",
             "tooltip": "Automatically update Anki with new data."
           },
+          "show_update_confirmation_dialog": {
+            "label": "Show Update Confirmation Dialog:",
+            "tooltip": "Show a confirmation dialog before updating Anki cards."
+          },
           "url": {
             "label": "Anki URL:",
             "tooltip": "The URL to connect to your Anki instance."
@@ -440,9 +444,9 @@
             "label": "Minimum Replay Size (KB):",
             "tooltip": "Minimum Replay Size for OBS Replays in KB. If Replay is Under this, Audio/Screenshot Will not be grabbed."
           },
-          "turn_off_output_check": {
-            "label": "Turn Off Output Check:",
-            "tooltip": "Disable the video output Replay Buffer Check."
+          "turn_off_replay_buffer_management": {
+            "label": "Turn off Replay Buffer Management:",
+            "tooltip": "Disable OBS Replay Buffer Management. This is useful if you want to manually manage the replay buffer in OBS."
           }
         },
         "profiles": {

GameSentenceMiner/locales/ja_jp.json

@@ -153,6 +153,10 @@
             "label": "Ankiを更新:",
             "tooltip": "自動的にAnkiを更新します。"
           },
+          "show_update_confirmation_dialog": {
+            "label": "更新確認ダイアログを表示:",
+            "tooltip": "Ankiカードを更新する前に確認ダイアログを表示します。"
+          },
           "url": {
             "label": "Anki URL:",
             "tooltip": "AnkiConnectの接続URL。"
@@ -439,10 +443,10 @@
             "label": "最小リプレイサイズ (KB):",
             "tooltip": "このサイズ未満のリプレイは処理しません。"
           },
-          "turn_off_output_check": {
-            "label": "出力チェックを無効化:",
-            "tooltip": "動画出力のリプレイバッファチェックを無効化します。"
-          }
+            "turn_off_replay_buffer_management": {
+            "label": "リプレイバッファ管理を無効化:",
+            "tooltip": "OBSリプレイバッファの管理を無効化します。OBSでリプレイバッファを手動で管理したい場合に便利です。"
+            }
         },
         "profiles": {
           "title": "プロファイル",

GameSentenceMiner/locales/zh_cn.json

@@ -154,6 +154,10 @@
             "label": "更新 Anki:",
             "tooltip": "使用新数据自动更新 Anki。"
           },
+          "show_update_confirmation_dialog": {
+            "label": "显示更新确认对话框:",
+            "tooltip": "在更新 Anki 卡片之前显示确认对话框。"
+          },
           "url": {
             "label": "Anki URL:",
             "tooltip": "连接到您的 Anki 实例的 URL。"
@@ -440,10 +444,10 @@
             "label": "最小回放大小 (KB):",
             "tooltip": "OBS 录像回放的最小大小（KB）。如果回放小于此大小，将不抓取音频/截图。"
           },
-          "turn_off_output_check": {
-            "label": "关闭输出检查:",
-            "tooltip": "禁用视频输出的回放缓冲区检查。"
-          }
+            "turn_off_replay_buffer_management": {
+            "label": "关闭回放缓冲区管理:",
+            "tooltip": "禁用 OBS 回放缓冲区管理。如果您想在 OBS 中手动管理回放缓冲区，这将很有用。"
+            }
         },
         "profiles": {
           "title": "配置文件",