GameSentenceMiner 2.5.12__py3-none-any.whl → 2.5.14__py3-none-any.whl

GameSentenceMiner/anki.py

@@ -32,8 +32,9 @@ def update_anki_card(last_note: AnkiCard, note=None, audio_path='', video_path='
     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)
-    update_picture = (get_config().anki.picture_field and get_config().anki.overwrite_picture) or not \
-    last_note.get_field(get_config().anki.picture_field)
+    update_picture = (get_config().anki.picture_field and get_config().screenshot.enabled
+                      and (get_config().anki.overwrite_picture or not last_note.get_field(get_config().anki.picture_field)))
+
 
     if not reuse_audio:
         if update_audio:
@@ -54,11 +55,13 @@ def update_anki_card(last_note: AnkiCard, note=None, audio_path='', video_path='
 
     # note = {'id': last_note.noteId, 'fields': {}}
 
-    if update_audio:
+    if update_audio and audio_in_anki:
         note['fields'][get_config().anki.sentence_audio_field] = audio_html
 
-    if update_picture:
+    if update_picture and screenshot_in_anki:
         note['fields'][get_config().anki.picture_field] = image_html
+    if not get_config().screenshot.enabled:
+        logger.info("Skipping Adding Screenshot to Anki, Screenshot is disabled in settings")
 
     if prev_screenshot_in_anki:
         note['fields'][get_config().anki.previous_image_field] = prev_screenshot_html
@@ -82,7 +85,7 @@ def update_anki_card(last_note: AnkiCard, note=None, audio_path='', video_path='
     if get_config().features.open_anki_edit:
         notification.open_anki_card(last_note.noteId)
 
-    if get_config().audio.external_tool:
+    if get_config().audio.external_tool and get_config().audio.external_tool_enabled and update_audio:
         open_audio_in_external(f"{get_config().audio.anki_media_collection}/{audio_in_anki}")
 
 

GameSentenceMiner/communication/websocket.py

@@ -3,6 +3,7 @@ import os.path
 
 import websockets
 import json
+from enum import Enum
 
 from websocket import WebSocket
 
@@ -13,6 +14,14 @@ CONFIG_FILE = os.path.join(get_app_directory(), "shared_config.json")
 websocket: WebSocket = None
 handle_websocket_message = None
 
+
+class FunctionName(Enum):
+    QUIT = "quit"
+    START = "start"
+    STOP = "stop"
+    QUIT_OBS = "quit_obs"
+    START_OBS = "start_obs"
+
 async def do_websocket_connection(port):
     """
     Connects to the WebSocket server running in the Electron app.

GameSentenceMiner/config_gui.py

@@ -147,6 +147,7 @@ class ConfigApp:
                 backfill_audio=self.backfill_audio.get()
             ),
             screenshot=Screenshot(
+                enabled=self.screenshot_enabled.get(),
                 width=self.screenshot_width.get(),
                 height=self.screenshot_height.get(),
                 quality=self.screenshot_quality.get(),
@@ -157,12 +158,14 @@ class ConfigApp:
                 use_beginning_of_line_as_screenshot=self.use_beginning_of_line_as_screenshot.get()
             ),
             audio=Audio(
+                enabled=self.audio_enabled.get(),
                 extension=self.audio_extension.get(),
                 beginning_offset=float(self.beginning_offset.get()),
                 end_offset=float(self.end_offset.get()),
                 ffmpeg_reencode_options=self.ffmpeg_reencode_options.get(),
                 external_tool = self.external_tool.get(),
                 anki_media_collection=self.anki_media_collection.get(),
+                external_tool_enabled=self.external_tool_enabled.get(),
             ),
             obs=OBS(
                 enabled=self.obs_enabled.get(),
@@ -171,7 +174,6 @@ class ConfigApp:
                 host=self.obs_host.get(),
                 port=int(self.obs_port.get()),
                 password=self.obs_password.get(),
-                start_buffer=self.obs_start_buffer.get(),
                 get_game_from_scene=self.get_game_from_scene_name.get(),
                 minimum_replay_size=int(self.minimum_replay_size.get())
             ),
@@ -679,6 +681,11 @@ class ConfigApp:
         screenshot_frame = ttk.Frame(self.notebook)
         self.notebook.add(screenshot_frame, text='Screenshot')
 
+        ttk.Label(screenshot_frame, text="Enabled:").grid(row=self.current_row, column=0, sticky='W')
+        self.screenshot_enabled = tk.BooleanVar(value=self.settings.screenshot.enabled)
+        ttk.Checkbutton(screenshot_frame, variable=self.screenshot_enabled).grid(row=self.current_row, column=1, sticky='W')
+        self.add_label_and_increment_row(screenshot_frame, "Enable or disable screenshot processing.", row=self.current_row, column=2)
+
         ttk.Label(screenshot_frame, text="Width:").grid(row=self.current_row, column=0, sticky='W')
         self.screenshot_width = ttk.Entry(screenshot_frame)
         self.screenshot_width.insert(0, str(self.settings.screenshot.width))
@@ -737,6 +744,11 @@ class ConfigApp:
         audio_frame = ttk.Frame(self.notebook)
         self.notebook.add(audio_frame, text='Audio')
 
+        ttk.Label(audio_frame, text="Enabled:").grid(row=self.current_row, column=0, sticky='W')
+        self.audio_enabled = tk.BooleanVar(value=self.settings.audio.enabled)
+        ttk.Checkbutton(audio_frame, variable=self.audio_enabled).grid(row=self.current_row, column=1, sticky='W')
+        self.add_label_and_increment_row(audio_frame, "Enable or disable audio processing.", row=self.current_row, column=2)
+
         ttk.Label(audio_frame, text="Audio Extension:").grid(row=self.current_row, column=0, sticky='W')
         self.audio_extension = ttk.Combobox(audio_frame, values=['opus', 'mp3', 'ogg', 'aac', 'm4a'])
         self.audio_extension.insert(0, self.settings.audio.extension)
@@ -777,10 +789,13 @@ class ConfigApp:
         self.external_tool = ttk.Entry(audio_frame)
         self.external_tool.insert(0, self.settings.audio.external_tool)
         self.external_tool.grid(row=self.current_row, column=1)
+        ttk.Label(audio_frame, text="Enabled:").grid(row=self.current_row, column=2, sticky='W')
+        self.external_tool_enabled = tk.BooleanVar(value=self.settings.audio.external_tool_enabled)
+        ttk.Checkbutton(audio_frame, variable=self.external_tool_enabled).grid(row=self.current_row, column=3, sticky='W')
         self.add_label_and_increment_row(audio_frame,
                                          "Path to External tool that opens the audio up for manual trimming. I recommend OcenAudio for in-place Editing.",
                                          row=self.current_row,
-                                         column=2)
+                                         column=4)
 
         ttk.Button(audio_frame, text="Install Ocenaudio", command=self.download_and_install_ocen).grid(
             row=self.current_row, column=0, pady=5)

GameSentenceMiner/configuration.py

@@ -98,6 +98,7 @@ class Features:
 @dataclass_json
 @dataclass
 class Screenshot:
+    enabled: bool = True
     width: str = 0
     height: str = 0
     quality: str = 85
@@ -111,12 +112,14 @@ class Screenshot:
 @dataclass_json
 @dataclass
 class Audio:
+    enabled: bool = True
     extension: str = 'opus'
     beginning_offset: float = 0.0
     end_offset: float = 0.5
     ffmpeg_reencode_options: str = ''
     external_tool: str = ""
     anki_media_collection: str = ""
+    external_tool_enabled: bool = True
 
 
 @dataclass_json
@@ -309,9 +312,6 @@ class Config:
             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")
@@ -337,6 +337,7 @@ class Config:
 
         return self
 
+
     def sync_shared_field(self, config, config2, field_name):
         try:
             config_value = getattr(config, field_name, None)

GameSentenceMiner/gsm.py

@@ -23,7 +23,8 @@ from GameSentenceMiner import obs
 from GameSentenceMiner import util
 from GameSentenceMiner.communication import Message
 from GameSentenceMiner.communication.send import send_restart_signal
-from GameSentenceMiner.communication.websocket import connect_websocket, register_websocket_message_handler
+from GameSentenceMiner.communication.websocket import connect_websocket, register_websocket_message_handler, \
+    FunctionName
 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
@@ -125,7 +126,7 @@ class VideoToAudioHandler(FileSystemEventHandler):
                 tango = last_note.get_field(get_config().anki.word_field) if last_note else ''
                 get_utility_window().reset_checkboxes()
 
-                if get_config().anki.sentence_audio_field:
+                if get_config().anki.sentence_audio_field and get_config().audio.enabled:
                     logger.debug("Attempting to get audio from video")
                     final_audio_output, should_update_audio, vad_trimmed_audio = VideoToAudioHandler.get_audio(
                         start_line,
@@ -135,7 +136,10 @@ class VideoToAudioHandler(FileSystemEventHandler):
                     final_audio_output = ""
                     should_update_audio = False
                     vad_trimmed_audio = ""
-                    logger.info("No SentenceAudio Field in config, skipping audio processing!")
+                    if not get_config().audio.enabled:
+                        logger.info("Audio is disabled in config, skipping audio processing!")
+                    elif not get_config().anki.sentence_audio_field:
+                        logger.info("No SentenceAudio Field in config, skipping audio processing!")
                 if get_config().anki.update_anki and last_note:
                     anki.update_anki_card(last_note, note, audio_path=final_audio_output, video_path=video_path,
                                           tango=tango,
@@ -442,6 +446,7 @@ def run_tray():
 #                 proc.wait()
 
 def close_obs():
+    obs.disconnect_from_obs()
     if obs.obs_process:
         try:
             subprocess.run(["taskkill", "/PID", str(obs.obs_process.pid), "/F"], check=True, capture_output=True, text=True)
@@ -550,12 +555,16 @@ def post_init():
 
     util.run_new_thread(do_post_init)
 
-
 def handle_websocket_message(message: Message):
-    match message.function:
-        case "quit":
+    match FunctionName(message.function):
+        case FunctionName.QUIT:
             cleanup()
             sys.exit(0)
+        case FunctionName.QUIT_OBS:
+            close_obs()
+        case FunctionName.START_OBS:
+            obs.start_obs()
+            obs.connect_to_obs()
         case _:
             logger.debug(f"unknown message from electron websocket: {message.to_json()}")
 

{gamesentenceminer-2.5.12.dist-info → gamesentenceminer-2.5.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.5.12
+Version: 2.5.14
 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.12.dist-info → gamesentenceminer-2.5.14.dist-info}/RECORD

@@ -1,10 +1,10 @@
 GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/anki.py,sha256=kMl-VvBkT_VtEjfTjliIHLGZwrJhHzTT1lRQ6qCdtYw,13062
-GameSentenceMiner/config_gui.py,sha256=9w7qXuGwt2lMTo4xXwuZKZyaLCoXBvzIDxSMrJzsUi8,60787
-GameSentenceMiner/configuration.py,sha256=u6Jm-Ox7PSZ1Cf5_AkV6hvQInayq7jXjLduf1eMK7Rc,20119
+GameSentenceMiner/anki.py,sha256=FHm76i7WYEs--szhzZjz0B6DW4JuDQopmjR3RjYBogs,13358
+GameSentenceMiner/config_gui.py,sha256=WVSN239lyVm5GwKzE1HXiCSCu2CNpkcDm8TGKlTJpMc,62093
+GameSentenceMiner/configuration.py,sha256=obBhz7aAFkhQAhIqrocv2jRTOqIJ0tFEI_saUCyMAMc,19924
 GameSentenceMiner/ffmpeg.py,sha256=fzOxrn-a4KqFdUY2oove164CTDOSsdPQtzqRW5f1P7c,12002
 GameSentenceMiner/gametext.py,sha256=LORVdE2WEo1CDI8gonc7qxrhbS4KFKXFQVKjhlkpLbc,7368
-GameSentenceMiner/gsm.py,sha256=H6kG2HerHhY37jXWGoQCLWjtzOoxAU_tAJ4RY9pAWbc,23970
+GameSentenceMiner/gsm.py,sha256=ZdYVJKilDFEGdC3g5V5pjSr4G2JkNNDIt7BQX6yc28A,24456
 GameSentenceMiner/model.py,sha256=JdnkT4VoPOXmOpRgFdvERZ09c9wLN6tUJxdrKlGZcqo,5305
 GameSentenceMiner/notification.py,sha256=FY39ChSRK0Y8TQ6lBGsLnpZUFPtFpSy2tweeXVoV7kc,2809
 GameSentenceMiner/obs.py,sha256=MlxRToq5wALPI1XrD8rxEU-N8mWII91cNJWY7rUa5uI,7642
@@ -13,7 +13,7 @@ GameSentenceMiner/util.py,sha256=Awhy57vX4NgQzygqKaGQn2EJ75T0uiXlhmINFOWlQkU,682
 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/communication/websocket.py,sha256=pTcUe_ZZRp9REdSU4qalhPmbT_1DKa7w18j6RfFLELA,3074
 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
@@ -21,9 +21,9 @@ GameSentenceMiner/vad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 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.12.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.5.12.dist-info/METADATA,sha256=iibLRrqHFjwy-4U4_j1JhHB3USB-W8CR0AMpW_JneF0,5433
-gamesentenceminer-2.5.12.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-gamesentenceminer-2.5.12.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.5.12.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.5.12.dist-info/RECORD,,
+gamesentenceminer-2.5.14.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.5.14.dist-info/METADATA,sha256=sm1RIt4O0bGoTOY3gMeVxcj7qbm_whFLk_6Jgf_blVk,5433
+gamesentenceminer-2.5.14.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+gamesentenceminer-2.5.14.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.5.14.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.5.14.dist-info/RECORD,,