GameSentenceMiner 2.3.2__py3-none-any.whl → 2.3.4__py3-none-any.whl

GameSentenceMiner/anki.py

@@ -1,4 +1,5 @@
 import base64
+import queue
 import subprocess
 import threading
 import time
@@ -20,6 +21,7 @@ screenshot_in_anki = None
 # Global variables to track state
 previous_note_ids = set()
 first_run = True
+card_queue = []
 
 
 def update_anki_card(last_note, note=None, audio_path='', video_path='', tango='', reuse_audio=False,
@@ -40,6 +42,7 @@ def update_anki_card(last_note, note=None, audio_path='', video_path='', tango='
             screenshot_in_anki = store_media_file(screenshot)
             if get_config().paths.remove_screenshot:
                 os.remove(screenshot)
+        util.set_last_mined_line(get_sentence(last_note))
     audio_html = f"[sound:{audio_in_anki}]"
     image_html = f"<img src=\"{screenshot_in_anki}\">"
 
@@ -70,8 +73,6 @@ def update_anki_card(last_note, note=None, audio_path='', video_path='', tango='
     if get_config().features.open_anki_edit:
         notification.open_anki_card(last_note['noteId'])
 
-    util.set_last_mined_line(get_sentence(last_note))
-
     if get_config().audio.external_tool:
         open_audio_in_external(f"{get_config().audio.anki_media_collection}/{audio_in_anki}")
 
@@ -211,20 +212,18 @@ def update_new_card():
     last_card = get_last_anki_card()
     if not check_tags_for_should_update(last_card):
         return
+    use_prev_audio = sentence_is_same_as_previous(last_card)
+    logger.info(f"last mined line: {util.get_last_mined_line()}, current sentence: {get_sentence(last_card)}")
+    logger.info(f"use previous audio: {use_prev_audio}")
+    if get_config().obs.get_game_from_scene:
+        obs.update_current_game()
+    if use_prev_audio:
+        update_anki_card(last_card, note=get_initial_card_info(last_card, []), reuse_audio=True)
+    else:
+        logger.info("New card(s) detected! Added to Processing Queue!")
+        card_queue.append(last_card)
+        obs.save_replay_buffer()
 
-    if util.lock.locked():
-        logger.info("Audio still being Trimmed, Card Queued!")
-    with util.lock:
-        use_prev_audio = sentence_is_same_as_previous(last_card)
-        logger.info(f"last mined line: {util.get_last_mined_line()}, current sentence: {get_sentence(last_card)}")
-        logger.info(f"use previous audio: {use_prev_audio}")
-        if get_config().obs.get_game_from_scene:
-            obs.update_current_game()
-        if use_prev_audio:
-            update_anki_card(last_card, note=get_initial_card_info(last_card, []), reuse_audio=True)
-        else:
-            logger.info("New card(s) detected!")
-            obs.save_replay_buffer()
 
 def sentence_is_same_as_previous(last_card):
     if not util.get_last_mined_line():
@@ -276,3 +275,4 @@ def start_monitoring_anki():
         obs_thread = threading.Thread(target=monitor_anki)
         obs_thread.daemon = True  # Ensures the thread will exit when the main program exits
         obs_thread.start()
+

GameSentenceMiner/config_gui.py

@@ -171,7 +171,8 @@ class ConfigApp:
                 extension=self.screenshot_extension.get(),
                 custom_ffmpeg_settings=self.screenshot_custom_ffmpeg_settings.get(),
                 screenshot_hotkey_updates_anki=self.screenshot_hotkey_update_anki.get(),
-                seconds_after_line = self.seconds_after_line.get()
+                seconds_after_line = self.seconds_after_line.get(),
+                use_beginning_of_line_as_screenshot=self.use_beginning_of_line_as_screenshot.get()
             ),
             audio=Audio(
                 extension=self.audio_extension.get(),
@@ -700,6 +701,11 @@ class ConfigApp:
         self.add_label_and_increment_row(screenshot_frame, "This is only used for mining from lines from history (not current line)", row=self.current_row,
                                          column=2)
 
+        ttk.Label(screenshot_frame, text="Use Beginning of Line as Screenshot:").grid(row=self.current_row, column=0, sticky='W')
+        self.use_beginning_of_line_as_screenshot = tk.BooleanVar(value=self.settings.screenshot.use_beginning_of_line_as_screenshot)
+        ttk.Checkbutton(screenshot_frame, variable=self.use_beginning_of_line_as_screenshot).grid(row=self.current_row, column=1, sticky='W')
+        self.add_label_and_increment_row(screenshot_frame, "Enable to use the beginning of the line as the screenshot point. Adjust the above setting to fine-tine timing.", row=self.current_row, column=2)
+
     @new_tab
     def create_audio_tab(self):
         audio_frame = ttk.Frame(self.notebook)

GameSentenceMiner/configuration.py

@@ -102,7 +102,8 @@ class Screenshot:
     extension: str = "webp"
     custom_ffmpeg_settings: str = ''
     screenshot_hotkey_updates_anki: bool = False
-    seconds_after_line: int = 1
+    seconds_after_line: float = 1.0
+    use_beginning_of_line_as_screenshot: bool = True
 
 
 @dataclass_json

GameSentenceMiner/gametext.py

@@ -9,6 +9,7 @@ from typing import Callable
 import pyperclip
 import websockets
 
+import util
 from GameSentenceMiner.configuration import *
 from GameSentenceMiner.configuration import get_config, logger
 from GameSentenceMiner.util import remove_html_tags
@@ -88,6 +89,7 @@ def reset_line_hotkey_pressed():
     logger.info("LINE RESET HOTKEY PRESSED")
     current_line_time = datetime.now()
     line_history[current_line_after_regex] = current_line_time
+    util.set_last_mined_line("")
 
 
 def run_websocket_listener():
@@ -139,8 +141,8 @@ def get_last_two_sentences(last_note):
     if not last_note:
         return lines[-1][0] if lines else '', lines[-2][0] if len(lines) > 1 else ''
 
-    current_line = ""
-    prev_line = ""
+    current = ""
+    previous = ""
 
     sentence = last_note['fields'][get_config().anki.sentence_field]['value']
     if sentence:
@@ -149,20 +151,20 @@ def get_last_two_sentences(last_note):
             similarity = similar(remove_html_tags(sentence), line)
             logger.debug(f"Comparing: {remove_html_tags(sentence)} with {line} - Similarity: {similarity}")
             if found:
-                prev_line = line
+                previous = line
                 break
             if similarity >= 0.60 or line in remove_html_tags(sentence):  # 80% similarity threshold
                 found = True
-                current_line = line
+                current = line
 
-    logger.debug(f"Current Line: {current_line}")
-    logger.debug(f"Previous Line: {prev_line}")
+    logger.debug(f"Current Line: {current}")
+    logger.debug(f"Previous Line: {previous}")
 
-    if not current_line or not prev_line:
+    if not current or not previous:
         logger.debug("Couldn't find lines in history, using last two lines")
         return lines[-1][0] if lines else '', lines[-2][0] if len(lines) > 1 else ''
 
-    return current_line, prev_line
+    return current, previous
 
 
 def get_line_and_future_lines(last_note):

GameSentenceMiner/gsm.py

@@ -31,7 +31,7 @@ from GameSentenceMiner.util import *
 if is_windows():
     import win32api
 
-obs_process: Popen = None
+obs_process = None
 procs_to_close = []
 settings_window: config_gui.ConfigApp = None
 utility_window: utility_gui.UtilityApp = None
@@ -54,6 +54,8 @@ class VideoToAudioHandler(FileSystemEventHandler):
     def convert_to_audio(video_path):
         try:
             with util.lock:
+                if anki.card_queue and len(anki.card_queue) > 0:
+                    last_note = anki.card_queue.pop(0)
                 if os.path.exists(video_path) and os.access(video_path, os.R_OK):
                     logger.debug(f"Video found and is readable: {video_path}")
 
@@ -64,17 +66,17 @@ class VideoToAudioHandler(FileSystemEventHandler):
                     logger.error(
                         f"Video was unusually small, potentially empty! Check OBS for Correct Scene Settings! Path: {video_path}")
                     return
-                last_note = None
-                logger.debug("Attempting to get last anki card")
-                if get_config().anki.update_anki:
-                    last_note = anki.get_last_anki_card()
-                if get_config().features.backfill_audio:
-                    last_note = anki.get_cards_by_sentence(gametext.current_line)
+                if not last_note:
+                    logger.debug("Attempting to get last anki card")
+                    if get_config().anki.update_anki:
+                        last_note = anki.get_last_anki_card()
+                    if get_config().features.backfill_audio:
+                        last_note = anki.get_cards_by_sentence(gametext.current_line)
                 line_time, next_line_time = get_line_timing(last_note)
                 if utility_window.lines_selected():
                     line_time, next_line_time = utility_window.get_selected_times()
                 ss_timing = 0
-                if line_time and next_line_time:
+                if line_time and next_line_time or line_time and get_config().screenshot.use_beginning_of_line_as_screenshot:
                     ss_timing = ffmpeg.get_screenshot_time(video_path, line_time)
                 if last_note:
                     logger.debug(json.dumps(last_note))
@@ -322,11 +324,33 @@ def run_tray():
     icon = Icon("TrayApp", create_image(), "Game Sentence Miner", menu)
     icon.run()
 
+# def close_obs():
+#     if obs_process:
+#         logger.info("Closing OBS")
+#         proc = None
+#         if obs_process:
+#             try:
+#                 logger.info("Closing OBS")
+#                 proc = psutil.Process(obs_process)
+#                 proc.send_signal(signal.CTRL_BREAK_EVENT)
+#                 proc.wait(timeout=5)
+#                 logger.info("Process closed gracefully.")
+#             except psutil.NoSuchProcess:
+#                 logger.info("PID already closed.")
+#             except psutil.TimeoutExpired:
+#                 logger.info("Process did not close gracefully, terminating.")
+#                 proc.terminate()
+#                 proc.wait()
+
 def close_obs():
     if obs_process:
-        logger.info("Closing OBS")
-        obs_process.terminate()
-        obs_process.wait()
+        try:
+            subprocess.run(["taskkill", "/PID", str(obs_process), "/F"], check=True, capture_output=True, text=True)
+            print(f"OBS (PID {obs_process}) has been terminated.")
+        except subprocess.CalledProcessError as e:
+            print(f"Error terminating OBS: {e.stderr}")
+    else:
+        print("OBS is not running.")
 
 def restart_obs():
     global obs_process

GameSentenceMiner/obs.py

@@ -1,6 +1,7 @@
 import subprocess
 import time
 
+import psutil
 from obswebsocket import obsws, requests
 
 from GameSentenceMiner import util, configuration
@@ -22,15 +23,25 @@ def start_obs():
         return None
 
     try:
-        # process = subprocess.Popen([obs_path], cwd=os.path.dirname(obs_path))
-        # process = subprocess.Popen([obs_path, '--minimize-to-tray'], cwd=os.path.dirname(obs_path))
-        process = subprocess.Popen([obs_path, '--disable-shutdown-check'], cwd=os.path.dirname(obs_path))
+        obs_pid = is_obs_running(obs_path)
+        if obs_pid:
+            return obs_pid
+        process = subprocess.Popen([obs_path, '--disable-shutdown-check', '--portable'], cwd=os.path.dirname(obs_path))
         logger.info("OBS launched")
-        return process
+        return process.pid
     except Exception as e:
         logger.error(f"Error launching OBS: {e}")
         return None
 
+def is_obs_running(obs_path):
+    obs_path = os.path.abspath(obs_path)  # Normalize path
+    for process in psutil.process_iter(['exe']):
+        try:
+            if process.info['exe'] and os.path.abspath(process.info['exe']) == obs_path:
+                return process.pid
+        except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
+            continue
+    return False
 
 def get_obs_websocket_config_values():
     config_path = os.path.join(get_app_directory(), 'obs-studio', 'config', 'obs-studio', 'plugin_config', 'obs-websocket', 'config.json')

GameSentenceMiner/utility_gui.py

@@ -46,10 +46,10 @@ class UtilityApp:
             var = tk.BooleanVar()
             self.items.append((text, var, time))
 
-            # Remove the first checkbox if there are more than 10
             if len(self.items) > 10:
-                self.checkboxes[0].destroy()
-                self.checkboxes.pop(0)
+                if self.checkboxes:
+                    self.checkboxes[0].destroy()
+                    self.checkboxes.pop(0)
                 self.items.pop(0)
 
             if self.multi_mine_window and tk.Toplevel.winfo_exists(self.multi_mine_window):

{GameSentenceMiner-2.3.2.dist-info → GameSentenceMiner-2.3.4.dist-info}/METADATA

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

{GameSentenceMiner-2.3.2.dist-info → GameSentenceMiner-2.3.4.dist-info}/RECORD

@@ -1,16 +1,16 @@
 GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/anki.py,sha256=2uq7lJjvLAEa92K8YOH5LMTgYCUt9bzdz4QPGdlreIk,10169
-GameSentenceMiner/config_gui.py,sha256=B37GPeGtGNTJgFTor3M01Tw2iZYRRtHLYck6Q83-JRg,53460
-GameSentenceMiner/configuration.py,sha256=x50-InaGl70dHpWhdOAZJTIKj84EtVfTqEmIFCnDcvw,14348
+GameSentenceMiner/anki.py,sha256=OHtzFSwfO3GNPFNfxOyPtOy9ATuM6IpeqPPIJX1x7j8,10116
+GameSentenceMiner/config_gui.py,sha256=10VaSYc2OGdRT219HLrNkBpUONMUtQG5DKAQf1phano,54171
+GameSentenceMiner/configuration.py,sha256=_nS-9sWNn97Zdv2V4Ypt_hf4PL6oLa5oK2Z7rWrqEmc,14405
 GameSentenceMiner/ffmpeg.py,sha256=VExJYWSFhYuWukIXgOiHufsoSROEDA8LnVQFG8srRGc,10924
-GameSentenceMiner/gametext.py,sha256=ckZGOHpGuvFE2zDNdaASSaMYi4JCFsyG2kYKCbZIQPo,6463
-GameSentenceMiner/gsm.py,sha256=l92vu9P06v5crBfka-TGjlSyqM7WG2ND4ZzWQVTY7ws,17103
+GameSentenceMiner/gametext.py,sha256=peP_1psoOF1SkcPqhYJkz8MLM-8XyEj8Yd3wU0sCwSs,6478
+GameSentenceMiner/gsm.py,sha256=X93WBDGn6Tj1PeHjUm1QNrb6E91MdylbCYsrUe1posU,18259
 GameSentenceMiner/model.py,sha256=oh8VVT8T1UKekbmP6MGNgQ8jIuQ_7Rg4GPzDCn2kJo8,1999
 GameSentenceMiner/notification.py,sha256=WBaQWoPNhW4XqdPBUmxPBgjk0ngzH_4v9zMQ-XQAKC8,2010
-GameSentenceMiner/obs.py,sha256=3Flcjxy812VpF78EPI7sxlGx6yyM3GfqzlinW17SK20,6231
+GameSentenceMiner/obs.py,sha256=8ImXAVUWa4JdzwcBOEFShlZRZzh1dCvdpD1aEGhQfbU,6566
 GameSentenceMiner/package_updater.py,sha256=0uaLAp0WrWqostNTBWRS0laITjI9aN9Yt_6GXosS4NQ,1278
 GameSentenceMiner/util.py,sha256=MITweiFYaefWQF5nR8tZ9yE6vd_b-fLuP0MP1Y1U4K0,4720
-GameSentenceMiner/utility_gui.py,sha256=-T5b14Nx6KvNnBEmdVz0mWkXoYi-bZzHIce6ADwfVEQ,4701
+GameSentenceMiner/utility_gui.py,sha256=Wa1YLitHzjbzkvvOtt3HbmFnplfajKR3N4aB2fTOlnM,4679
 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
@@ -18,8 +18,8 @@ GameSentenceMiner/vad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 GameSentenceMiner/vad/silero_trim.py,sha256=syDJX_KbFmdyFFtnQqYTD0tICsUCJizYhs-atPgXtxA,1549
 GameSentenceMiner/vad/vosk_helper.py,sha256=-AAwK0cgOC5rK3_gL0sQgrPJ75E49g_PxZR4d5ckwc4,5826
 GameSentenceMiner/vad/whisper_helper.py,sha256=bpR1HVnJRn9H5u8XaHBqBJ6JwIjzqn-Fajps8QmQ4zc,3411
-GameSentenceMiner-2.3.2.dist-info/METADATA,sha256=fgxgfYWXo8j96jN8f240I6tq8jg1JddSs_e8YQ6rUhQ,10120
-GameSentenceMiner-2.3.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-GameSentenceMiner-2.3.2.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-GameSentenceMiner-2.3.2.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-GameSentenceMiner-2.3.2.dist-info/RECORD,,
+GameSentenceMiner-2.3.4.dist-info/METADATA,sha256=MU-wVhAYAf5j6zzfCJosoxrxv9QF-oKZv90eWoH0Frs,10120
+GameSentenceMiner-2.3.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+GameSentenceMiner-2.3.4.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+GameSentenceMiner-2.3.4.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+GameSentenceMiner-2.3.4.dist-info/RECORD,,