GameSentenceMiner 2.14.15__tar.gz → 2.14.17__tar.gz

{gamesentenceminer-2.14.15 → gamesentenceminer-2.14.17}/GameSentenceMiner/ai/ai_prompting.py

@@ -29,7 +29,7 @@ Translate ONLY the provided line of game dialogue specified below into natural-s
 **Output Requirements:**
 - Provide only the single, best {get_config().general.get_native_language_name()} translation.
 - Use expletives if they are natural for the context and enhance the translation's impact, but do not over-exaggerate.
-- Carryover all HTML tags present in the original text to HTML tags surrounding their corresponding words in the translation. DO NOT CONVERT TO MARKDOWN.
+- Carryover all HTML tags present in the original text to HTML tags surrounding their corresponding translated words in the translation. Look for the equivalent word, not the equivalent location. DO NOT CONVERT TO MARKDOWN.
 - If there are no HTML tags present in the original text, do not add any in the translation whatsoever.
 - Do not include notes, alternatives, explanations, or any other surrounding text. Absolutely nothing but the translated line.
 

{gamesentenceminer-2.14.15 → gamesentenceminer-2.14.17}/GameSentenceMiner/anki.py

@@ -32,7 +32,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, selected_lines=None, prev_ss_timing=0, start_time=None, end_time=None):
+                     should_update_audio=True, ss_time=0, game_line=None, selected_lines=None, prev_ss_timing=0, start_time=None, end_time=None, vad_result=None):
     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().screenshot.enabled
@@ -41,14 +41,17 @@ def update_anki_card(last_note: AnkiCard, note=None, audio_path='', video_path='
     audio_in_anki = ''
     screenshot_in_anki = ''
     prev_screenshot_in_anki = ''
+    video_in_anki = ''
+    video = ''
     screenshot = ''
     prev_screenshot = ''
     if reuse_audio:
         logger.info("Reusing Audio from last note")
-        anki_result = anki_results[game_line.id]
+        anki_result: AnkiUpdateResult = anki_results[game_line.id]
         audio_in_anki = anki_result.audio_in_anki
         screenshot_in_anki = anki_result.screenshot_in_anki
         prev_screenshot_in_anki = anki_result.prev_screenshot_in_anki
+        video_in_anki = anki_result.video_in_anki
     else:
         if update_audio:
             audio_in_anki = store_media_file(audio_path)
@@ -56,9 +59,16 @@ def update_anki_card(last_note: AnkiCard, note=None, audio_path='', video_path='
                 open_audio_in_external(f"{get_config().audio.anki_media_collection}/{audio_in_anki}")
         if update_picture:
             logger.info("Getting Screenshot...")
-            screenshot = ffmpeg.get_screenshot(video_path, ss_time, try_selector=get_config().screenshot.use_screenshot_selector)
+            if get_config().screenshot.animated:
+                screenshot = ffmpeg.get_anki_compatible_video(video_path, start_time, vad_result.start, vad_result.end, codec='avif', quality=10, fps=12, audio=False)
+            else:
+                screenshot = ffmpeg.get_screenshot(video_path, ss_time, try_selector=get_config().screenshot.use_screenshot_selector)
             wait_for_stable_file(screenshot)
             screenshot_in_anki = store_media_file(screenshot)
+        if get_config().anki.video_field:
+            if vad_result:
+                video = ffmpeg.get_anki_compatible_video(video_path, start_time, vad_result.start, vad_result.end, codec='avif', quality=10, fps=12, audio=True)
+                video_in_anki = store_media_file(video)
         if get_config().anki.previous_image_field and game_line.prev:
             prev_screenshot = ffmpeg.get_screenshot_for_line(video_path, selected_lines[0].prev if selected_lines else game_line.prev, try_selector=get_config().screenshot.use_screenshot_selector)
             wait_for_stable_file(prev_screenshot)
@@ -68,58 +78,6 @@ def update_anki_card(last_note: AnkiCard, note=None, audio_path='', video_path='
     audio_html = f"[sound:{audio_in_anki}]"
     image_html = f"<img src=\"{screenshot_in_anki}\">"
     prev_screenshot_html = f"<img src=\"{prev_screenshot_in_anki}\">"
-    
-    
-    # Vars for DB update
-    new_audio_path = ''
-    new_screenshot_path = ''
-    new_prev_screenshot_path = ''
-    new_video_path = ''
-    translation = ''
-    anki_audio_path = ''
-    anki_screenshot_path = ''
-    # Move files to output folder if configured
-    if get_config().paths.output_folder and get_config().paths.copy_temp_files_to_output_folder:
-        word_path = os.path.join(get_config().paths.output_folder, sanitize_filename(tango))
-        os.makedirs(word_path, exist_ok=True)
-        
-        if audio_path:
-            audio_filename = Path(audio_path).name
-            new_audio_path = os.path.join(word_path, audio_filename)
-            if os.path.exists(audio_path):
-                shutil.copy(audio_path, new_audio_path)
-        if screenshot:
-            screenshot_filename = Path(screenshot).name
-            new_screenshot_path = os.path.join(word_path, screenshot_filename)
-            if os.path.exists(screenshot):
-                shutil.copy(screenshot, new_screenshot_path)
-        if prev_screenshot:
-            prev_screenshot_filename = Path(prev_screenshot).name
-            new_prev_screenshot_path = os.path.join(word_path, "prev_" + prev_screenshot_filename)
-            if os.path.exists(prev_screenshot):
-                shutil.copy(prev_screenshot, new_prev_screenshot_path)
-                
-        if video_path and get_config().paths.copy_trimmed_replay_to_output_folder:
-            trimmed_video = ffmpeg.trim_replay_for_gameline(video_path, start_time, end_time, accurate=True)
-            new_video_path = os.path.join(word_path, Path(trimmed_video).name)
-            if os.path.exists(trimmed_video):
-                shutil.copy(trimmed_video, new_video_path)
-                
-    if get_config().audio.anki_media_collection:
-        anki_audio_path = os.path.join(get_config().audio.anki_media_collection, audio_in_anki)
-        anki_screenshot_path = os.path.join(get_config().audio.anki_media_collection, screenshot_in_anki)
-
-        # Open to word_path if configured
-        if get_config().paths.open_output_folder_on_card_creation:
-            try:
-                if platform.system() == "Windows":
-                    subprocess.Popen(f'explorer "{word_path}"')
-                elif platform.system() == "Darwin":
-                    subprocess.Popen(["open", word_path])
-                else:
-                    subprocess.Popen(["xdg-open", word_path])
-            except Exception as e:
-                logger.error(f"Error opening output folder: {e}")
 
 
     # note = {'id': last_note.noteId, 'fields': {}}
@@ -129,6 +87,10 @@ def update_anki_card(last_note: AnkiCard, note=None, audio_path='', video_path='
 
     if update_picture and screenshot_in_anki:
         note['fields'][get_config().anki.picture_field] = image_html
+        
+    if video_in_anki:
+        note['fields'][get_config().anki.video_field] = video_in_anki
+        
     if not get_config().screenshot.enabled:
         logger.info("Skipping Adding Screenshot to Anki, Screenshot is disabled in settings")
 
@@ -158,9 +120,9 @@ def update_anki_card(last_note: AnkiCard, note=None, audio_path='', video_path='
         tag_string = " ".join(tags)
         invoke("addTags", tags=tag_string, notes=[last_note.noteId])
         
-    # Update GameLine in DB
+    run_new_thread(lambda: check_and_update_note(last_note, note, tags))
 
-    logger.info(f"Adding {game_line.id} to Anki Results Dict...")
+    word_path = os.path.join(get_config().paths.output_folder, sanitize_filename(tango)) if get_config().paths.output_folder else ''
     if not reuse_audio:
         anki_results[game_line.id] = AnkiUpdateResult(
             success=True,
@@ -168,10 +130,81 @@ def update_anki_card(last_note: AnkiCard, note=None, audio_path='', video_path='
             screenshot_in_anki=screenshot_in_anki,
             prev_screenshot_in_anki=prev_screenshot_in_anki,
             sentence_in_anki=game_line.text if game_line else '',
-            multi_line=bool(selected_lines and len(selected_lines) > 1)
+            multi_line=bool(selected_lines and len(selected_lines) > 1),
+            video_in_anki=video_in_anki or '',
+            word_path=word_path
         )
+    # Update GameLine in DB
+    
+    # Vars for DB update
+    new_audio_path = ''
+    new_screenshot_path = ''
+    new_prev_screenshot_path = ''
+    new_video_path = ''
+    translation = ''
+    anki_audio_path = ''
+    anki_screenshot_path = ''
+    # Move files to output folder if configured
+    if get_config().paths.output_folder and reuse_audio:
+        anki_result: AnkiUpdateResult = anki_results[game_line.id]
+        previous_word_path = anki_result.word_path
+        if previous_word_path and os.path.exists(previous_word_path):
+            os.makedirs(word_path, exist_ok=True)
+            # Copy all files from previous_word_path to word_path
+            for item in os.listdir(previous_word_path):
+                s = os.path.join(previous_word_path, item)
+                d = os.path.join(word_path, item)
+                if os.path.isdir(s):
+                    shutil.copytree(s, d, False, None)
+                else:
+                    shutil.copy2(s, d)
+    elif get_config().paths.output_folder and get_config().paths.copy_temp_files_to_output_folder:
+        os.makedirs(word_path, exist_ok=True)
+        if audio_path:
+            audio_filename = Path(audio_path).name
+            new_audio_path = os.path.join(word_path, audio_filename)
+            if os.path.exists(audio_path):
+                shutil.copy(audio_path, new_audio_path)
+        if screenshot:
+            screenshot_filename = Path(screenshot).name
+            new_screenshot_path = os.path.join(word_path, screenshot_filename)
+            if os.path.exists(screenshot):
+                shutil.copy(screenshot, new_screenshot_path)
+        if prev_screenshot:
+            prev_screenshot_filename = Path(prev_screenshot).name
+            new_prev_screenshot_path = os.path.join(word_path, "prev_" + prev_screenshot_filename)
+            if os.path.exists(prev_screenshot):
+                shutil.copy(prev_screenshot, new_prev_screenshot_path)
+                
+        if video_path and get_config().paths.copy_trimmed_replay_to_output_folder:
+            trimmed_video = ffmpeg.trim_replay_for_gameline(video_path, start_time, end_time, accurate=True)
+            new_video_path = os.path.join(word_path, Path(trimmed_video).name)
+            if os.path.exists(trimmed_video):
+                shutil.copy(trimmed_video, new_video_path)
+                
+        if video:
+            new_video_path = os.path.join(word_path, Path(video).name)
+            if os.path.exists(video):
+                shutil.copy(video, new_video_path)
 
-    run_new_thread(lambda: check_and_update_note(last_note, note, tags))
+    if get_config().audio.anki_media_collection:
+        anki_audio_path = os.path.join(get_config().audio.anki_media_collection, audio_in_anki)
+        anki_screenshot_path = os.path.join(get_config().audio.anki_media_collection, screenshot_in_anki)
+
+    # Open to word_path if configured
+    if get_config().paths.open_output_folder_on_card_creation:
+        try:
+            if platform.system() == "Windows":
+                subprocess.Popen(f'explorer "{word_path}"')
+            elif platform.system() == "Darwin":
+                subprocess.Popen(["open", word_path])
+            else:
+                subprocess.Popen(["xdg-open", word_path])
+        except Exception as e:
+            logger.error(f"Error opening output folder: {e}")
+
+    logger.info(f"Adding {game_line.id} to Anki Results Dict...")
+    
     GameLinesTable.update(line_id=game_line.id, screenshot_path=new_screenshot_path, audio_path=new_audio_path, replay_path=new_video_path, audio_in_anki=anki_audio_path, screenshot_in_anki=anki_screenshot_path, translation=translation)
 
 def check_and_update_note(last_note, note, tags=[]):
@@ -428,6 +461,7 @@ def update_new_card():
         texthooking_page.reset_checked_lines()
     else:
         logger.info("New card(s) detected! Added to Processing Queue!")
+        gsm_state.last_mined_line = game_line
         card_queue.append((last_card, datetime.now(), lines))
         texthooking_page.reset_checked_lines()
         try:
@@ -438,13 +472,26 @@ def update_new_card():
             return
 
 def update_card_from_same_sentence(last_card, lines, game_line):
+    time_elapsed = 0
     while game_line.id not in anki_results:
         time.sleep(0.5)
+        time_elapsed += 0.5
+        if time_elapsed > 15:
+            logger.info(f"Timed out waiting for Anki update for card {last_card.noteId}, retrieving new audio")
+            card_queue.append((last_card, datetime.now(), lines))
+            texthooking_page.reset_checked_lines()
+            try:
+                obs.save_replay_buffer()
+            except Exception as e:
+                card_queue.pop(0)
+                logger.error(f"Error saving replay buffer: {e}")
+                return
     anki_result = anki_results[game_line.id]
     if anki_result.success:
         note, last_card = get_initial_card_info(last_card, lines)
+        tango = last_card.get_field(get_config().anki.word_field)
         update_anki_card(last_card, note=note,
-                         game_line=get_mined_line(last_card, lines), reuse_audio=True)
+                         game_line=get_mined_line(last_card, lines), reuse_audio=True, tango=tango)
     else:
         logger.error(f"Anki update failed for card {last_card.noteId}")
         notification.send_error_no_anki_update()

{gamesentenceminer-2.14.15 → gamesentenceminer-2.14.17}/GameSentenceMiner/config_gui.py

@@ -307,6 +307,7 @@ class ConfigApp:
         self.word_field_value = tk.StringVar(value=self.settings.anki.word_field)
         self.previous_sentence_field_value = tk.StringVar(value=self.settings.anki.previous_sentence_field)
         self.previous_image_field_value = tk.StringVar(value=self.settings.anki.previous_image_field)
+        self.video_field_value = tk.StringVar(value=self.settings.anki.video_field)
         self.custom_tags_value = tk.StringVar(value=', '.join(self.settings.anki.custom_tags))
         self.tags_to_check_value = tk.StringVar(value=', '.join(self.settings.anki.tags_to_check))
         self.add_game_tag_value = tk.BooleanVar(value=self.settings.anki.add_game_tag)
@@ -335,7 +336,8 @@ class ConfigApp:
         self.seconds_after_line_value = tk.StringVar(value=str(self.settings.screenshot.seconds_after_line))
         self.screenshot_timing_value = tk.StringVar(value=self.settings.screenshot.screenshot_timing_setting)
         self.use_screenshot_selector_value = tk.BooleanVar(value=self.settings.screenshot.use_screenshot_selector)
-        
+        self.animated_screenshot_value = tk.BooleanVar(value=self.settings.screenshot.animated)
+
         # Audio Settings
         self.audio_enabled_value = tk.BooleanVar(value=self.settings.audio.enabled)
         self.audio_extension_value = tk.StringVar(value=self.settings.audio.extension)
@@ -522,6 +524,7 @@ class ConfigApp:
                 word_field=self.word_field_value.get(),
                 previous_sentence_field=self.previous_sentence_field_value.get(),
                 previous_image_field=self.previous_image_field_value.get(),
+                video_field=self.video_field_value.get(),
                 custom_tags=[tag.strip() for tag in self.custom_tags_value.get().split(',') if tag.strip()],
                 tags_to_check=[tag.strip().lower() for tag in self.tags_to_check_value.get().split(',') if tag.strip()],
                 add_game_tag=self.add_game_tag_value.get(),
@@ -541,6 +544,7 @@ class ConfigApp:
             ),
             screenshot=Screenshot(
                 enabled=self.screenshot_enabled_value.get(),
+                animated=self.animated_screenshot_value.get(),
                 width=self.screenshot_width_value.get(),
                 height=self.screenshot_height_value.get(),
                 quality=self.screenshot_quality_value.get(),
@@ -1304,6 +1308,13 @@ class ConfigApp:
         ttk.Entry(anki_frame, textvariable=self.previous_image_field_value).grid(row=self.current_row, column=1, sticky='EW', pady=2)
         self.current_row += 1
 
+        video_img_i18n = anki_i18n.get('video_field', {})
+        HoverInfoLabelWidget(anki_frame, text=video_img_i18n.get('label', '...'),
+                             tooltip=video_img_i18n.get('tooltip', '...'),
+                             row=self.current_row, column=0)
+        ttk.Entry(anki_frame, textvariable=self.video_field_value).grid(row=self.current_row, column=1, sticky='EW', pady=2)
+        self.current_row += 1
+
         tags_i18n = anki_i18n.get('custom_tags', {})
         HoverInfoLabelWidget(anki_frame, text=tags_i18n.get('label', '...'), tooltip=tags_i18n.get('tooltip', '...'),
                              row=self.current_row, column=0)
@@ -1469,6 +1480,13 @@ class ConfigApp:
         ttk.Combobox(screenshot_frame, textvariable=self.screenshot_extension_value, values=['webp', 'avif', 'png', 'jpeg'],
                                                  state="readonly").grid(row=self.current_row, column=1, sticky='EW', pady=2)
         self.current_row += 1
+        
+        animated_i18n = ss_i18n.get('animated', {})
+        HoverInfoLabelWidget(screenshot_frame, text=animated_i18n.get('label', '...'), tooltip=animated_i18n.get('tooltip', '...'),
+                             row=self.current_row, column=0)
+        ttk.Checkbutton(screenshot_frame, variable=self.animated_screenshot_value, bootstyle="round-toggle").grid(
+            row=self.current_row, column=1, sticky='W', pady=2)
+        self.current_row += 1
 
         ffmpeg_i18n = ss_i18n.get('ffmpeg_options', {})
         HoverInfoLabelWidget(screenshot_frame, text=ffmpeg_i18n.get('label', '...'),
@@ -1577,10 +1595,10 @@ class ConfigApp:
         preset_options_i18n = ffmpeg_preset_i18n.get('options', {})
         self.ffmpeg_audio_preset_options_map = {
             preset_options_i18n.get('no_reencode', "No Re-encode"): "",
-            preset_options_i18n.get('fade_in', "Simple Fade-in..."): "-c:a {encoder} -f {format} -af \"afade=t=in:d=0.10\"",
-            preset_options_i18n.get('loudness_norm', "Simple loudness..."): "-c:a {encoder} -f {format} -af \"loudnorm=I=-23:TP=-2,afade=t=in:d=0.10\"",
-            preset_options_i18n.get('downmix_norm', "Downmix to mono..."): "-c:a {encoder} -ac 1 -f {format} -af \"loudnorm=I=-23:TP=-2:dual_mono=true,afade=t=in:d=0.10\"",
-            preset_options_i18n.get('downmix_norm_low_bitrate', "Downmix to mono, 30kbps..."): "-c:a {encoder} -b:a 30k -ac 1 -f {format} -af \"loudnorm=I=-23:TP=-2:dual_mono=true,afade=t=in:d=0.10\"",
+            preset_options_i18n.get('fade_in', "Simple Fade-in..."): "-c:a {encoder} -f {format} -af \"afade=t=in:d=0.005\"",
+            preset_options_i18n.get('loudness_norm', "Simple loudness..."): "-c:a {encoder} -f {format} -af \"loudnorm=I=-23:TP=-2,afade=t=in:d=0.005\"",
+            preset_options_i18n.get('downmix_norm', "Downmix to mono..."): "-c:a {encoder} -ac 1 -f {format} -af \"loudnorm=I=-23:TP=-2:dual_mono=true,afade=t=in:d=0.005\"",
+            preset_options_i18n.get('downmix_norm_low_bitrate', "Downmix to mono, 30kbps..."): "-c:a {encoder} -b:a 30k -ac 1 -f {format} -af \"loudnorm=I=-23:TP=-2:dual_mono=true,afade=t=in:d=0.005\"",
             preset_options_i18n.get('custom', "Custom"): get_config().audio.custom_encode_settings,
         }
 
@@ -2107,12 +2125,12 @@ class ConfigApp:
         if ai_models and ai_models.gemini_models and ai_models.groq_models:
             if time.time() - ai_models.last_updated > 3600 * 6:
                 print("AI models are outdated, fetching new ones.")
-                threading.Thread(target=get_models, daemon=True).start()
+                self.window.after(100, get_models)
             self.gemini_model_combobox['values'] = ai_models.gemini_models
             self.groq_models_combobox['values'] = ai_models.groq_models
         else:
             print("No AI models found, fetching new ones.")
-            threading.Thread(target=get_models, daemon=True).start()
+            self.window.after(100, get_models)
             # get_models()
     
     def update_models_element(self, frame, row):

{gamesentenceminer-2.14.15 → gamesentenceminer-2.14.17}/GameSentenceMiner/gsm.py

@@ -247,7 +247,8 @@ class VideoToAudioHandler(FileSystemEventHandler):
                     game_line=mined_line,
                     selected_lines=selected_lines,
                     start_time=start_time,
-                    end_time=end_time
+                    end_time=end_time,
+                    vad_result=vad_result
                 )
             elif get_config().features.notify_on_update and vad_result.success:
                 notification.send_audio_generated_notification(

{gamesentenceminer-2.14.15 → gamesentenceminer-2.14.17}/GameSentenceMiner/locales/en_us.json

@@ -182,6 +182,10 @@
             "label": "Previous VoiceLine SS Field:",
             "tooltip": "Field in Anki for the screenshot of previous line. If Empty, will not populate"
           },
+          "video_field": {
+            "label": "Video Field:",
+            "tooltip": "Field in Anki for associated videos. This will be AV1 encoded video of the VAD Trimmed Voiceline, if no Voice found, this will be empty."
+          },
           "custom_tags": {
             "label": "Add Tags:",
             "tooltip": "Comma-separated custom tags for the Anki cards."
@@ -307,6 +311,10 @@
             "label": "Extension:",
             "tooltip": "File extension for the screenshot format."
           },
+          "animated": {
+            "label": "Animated:",
+            "tooltip": "Enable to create an animated screenshot. Will be a webm file encoded with AV1. All settings under this are not applicable with this ON."
+          },
           "ffmpeg_options": {
             "label": "FFmpeg Reencode Options:",
             "tooltip": "Custom FFmpeg options for re-encoding screenshots."

{gamesentenceminer-2.14.15 → gamesentenceminer-2.14.17}/GameSentenceMiner/locales/ja_jp.json

@@ -181,6 +181,10 @@
             "label": "前の画像フィールド:",
             "tooltip": "前のセリフの画像を保存するフィールド。空欄で無効。"
           },
+          "video_field": {
+            "label": "動画フィールド:",
+            "tooltip": "Ankiの関連動画フィールド。VADトリミングされたボイスラインのAV1エンコード動画です。音声が見つからない場合は空になります。"
+          },
           "custom_tags": {
             "label": "追加タグ:",
             "tooltip": "Ankiカードに追加するカスタムタグ（カンマ区切り）。"
@@ -306,6 +310,10 @@
             "label": "拡張子:",
             "tooltip": "スクリーンショットのファイル形式。"
           },
+          "animated": {
+            "label": "アニメーション:",
+            "tooltip": "アニメーションスクリーンショットを作成する。AV1でエンコードされたwebmファイルになります。この設定がONの場合、以下の設定は適用されません。"
+          },
           "ffmpeg_options": {
             "label": "FFmpeg再エンコード設定:",
             "tooltip": "スクリーンショットの再エンコードに使用するカスタムFFmpegオプション。"

{gamesentenceminer-2.14.15 → gamesentenceminer-2.14.17}/GameSentenceMiner/locales/zh_cn.json

@@ -182,6 +182,10 @@
             "label": "上一句截图字段:",
             "tooltip": "Anki 中用于上一句截图的字段。如果为空，则不填充。"
           },
+          "video_field": {
+            "label": "视频字段:",
+            "tooltip": "Anki 中关联视频的字段。这将是VAD修剪语音线的AV1编码视频，如果未找到语音，此字段将为空。"
+          },
           "custom_tags": {
             "label": "添加标签:",
             "tooltip": "Anki 卡片的自定义标签（以逗号分隔）。"
@@ -307,6 +311,10 @@
             "label": "扩展名:",
             "tooltip": "截图格式的文件扩展名。"
           },
+          "animated": {
+            "label": "动画:",
+            "tooltip": "启用创建动画截图。将是使用AV1编码的webm文件。启用此选项时，以下所有设置均不适用。"
+          },
           "ffmpeg_options": {
             "label": "FFmpeg 重编码选项:",
             "tooltip": "用于重编码截图的自定义 FFmpeg 选项。"

{gamesentenceminer-2.14.15 → gamesentenceminer-2.14.17}/GameSentenceMiner/obs.py

@@ -43,16 +43,21 @@ class OBSConnectionManager(threading.Thread):
                 logger.info(f"OBS WebSocket not connected. Attempting to reconnect... {e}")
                 gsm_status.obs_connected = False
                 asyncio.run(connect_to_obs())
-            if self.counter % 5 == 0 and not get_config().obs.turn_off_output_check and self.check_output:
-                replay_buffer_status = get_replay_buffer_status()
-                if replay_buffer_status and self.said_no_to_replay_buffer:
-                    self.said_no_to_replay_buffer = False
-                    self.counter = 0
-                if gsm_status.obs_connected and not replay_buffer_status and not self.said_no_to_replay_buffer:
-                    try:
-                        self.check_output()
-                    except Exception as e:
-                        pass
+            if self.counter % 5 == 0:
+                try:
+                    set_fit_to_screen_for_scene_items(get_current_scene())
+                    if get_config().obs.turn_off_output_check and self.check_output:
+                        replay_buffer_status = get_replay_buffer_status()
+                        if replay_buffer_status and self.said_no_to_replay_buffer:
+                            self.said_no_to_replay_buffer = False
+                            self.counter = 0
+                        if gsm_status.obs_connected and not replay_buffer_status and not self.said_no_to_replay_buffer:
+                            try:
+                                self.check_output()
+                            except Exception as e:
+                                pass
+                except Exception as e:
+                    logger.error(f"Error when running Extra Utils in OBS Health Check, Keeping ConnectionManager Alive: {e}")
             self.counter += 1
 
     def stop(self):
@@ -463,6 +468,61 @@ def get_current_game(sanitize=False, update=True):
     return gsm_state.current_game
 
 
+
+def set_fit_to_screen_for_scene_items(scene_name: str):
+    """
+    Sets all sources in a given scene to "Fit to Screen" (like Ctrl+F in OBS).
+
+    This function fetches the canvas dimensions, then iterates through all scene
+    items in the specified scene and applies a transform that scales them to
+    fit within the canvas while maintaining aspect ratio and centering them.
+
+    Args:
+        scene_name: The name of the scene to modify.
+    """
+    try:
+        # 1. Get the canvas (base) resolution from OBS video settings
+        video_settings = client.get_video_settings()
+        canvas_width = video_settings.base_width
+        canvas_height = video_settings.base_height
+
+        # 2. Get the list of items in the specified scene
+        scene_items_response = client.get_scene_item_list(scene_name)
+        items = scene_items_response.scene_items if scene_items_response.scene_items else []
+
+        if not items:
+            logger.warning(f"No items found in scene '{scene_name}'.")
+            return
+
+        # 3. Loop through each item and apply the "Fit to Screen" transform
+        for item in items:
+            item_id = item['sceneItemId']
+            source_name = item['sourceName']
+            
+            # This transform object is the equivalent of "Fit to Screen"
+            fit_to_screen_transform = {
+                'boundsType': 'OBS_BOUNDS_SCALE_INNER',
+                'alignment': 5,  # 5 = Center alignment (horizontal and vertical)
+                'boundsWidth': canvas_width,
+                'boundsHeight': canvas_height,
+            }
+
+            try:
+                client.set_scene_item_transform(
+                    scene_name=scene_name,
+                    item_id=item_id,
+                    transform=fit_to_screen_transform
+                )
+            except obs.error.OBSSDKError as e:
+                logger.error(f"Failed to set transform for source '{source_name}': {e}")
+
+    except obs.error.OBSSDKError as e:
+        # This will catch errors like "scene not found"
+        logger.error(f"An OBS error occurred: {e}")
+    except Exception as e:
+        logger.error(f"An unexpected error occurred: {e}")
+
+
 def main():
     start_obs()
     connect_to_obs()
@@ -501,6 +561,8 @@ def main():
 if __name__ == '__main__':
     from mss import mss
     logging.basicConfig(level=logging.INFO)
+    connect_to_obs_sync()
+    set_fit_to_screen_for_scene_items(get_current_scene())
     # main()
     # connect_to_obs_sync()
     # img = get_screenshot_PIL(source_name="Display Capture 2", compression=75, img_format='png', width=1280, height=720)

{gamesentenceminer-2.14.15 → gamesentenceminer-2.14.17}/GameSentenceMiner/util/configuration.py

@@ -436,6 +436,7 @@ class Anki:
     word_field: str = 'Expression'
     previous_sentence_field: str = ''
     previous_image_field: str = ''
+    video_field: str = ''
     # Initialize to None and set it in __post_init__
     custom_tags: List[str] = None
     tags_to_check: List[str] = None
@@ -475,6 +476,7 @@ class Screenshot:
     custom_ffmpeg_settings: str = ''
     custom_ffmpeg_option_selected: str = ''
     screenshot_hotkey_updates_anki: bool = False
+    animated: bool = False
     seconds_after_line: float = 1.0
     use_beginning_of_line_as_screenshot: bool = True
     use_new_screenshot_logic: bool = False
@@ -502,7 +504,7 @@ class Audio:
     beginning_offset: float = -0.5
     end_offset: float = 0.5
     pre_vad_end_offset: float = 0.0
-    ffmpeg_reencode_options: str = '-c:a {encoder} -f {format} -af \"afade=t=in:d=0.10\"' if is_windows() else ''
+    ffmpeg_reencode_options: str = '-c:a {encoder} -f {format} -af \"afade=t=in:d=0.005\"' if is_windows() else ''
     ffmpeg_reencode_options_to_use: str = ''
     external_tool: str = ""
     anki_media_collection: str = ""
@@ -1147,10 +1149,12 @@ class AnkiUpdateResult:
     prev_screenshot_in_anki: str = ''
     sentence_in_anki: str = ''
     multi_line: bool = False
+    video_in_anki: str = ''
+    word_path: str = ''
 
     @staticmethod
     def failure():
-        return AnkiUpdateResult(success=False, audio_in_anki='', screenshot_in_anki='', prev_screenshot_in_anki='', sentence_in_anki='', multi_line=False)
+        return AnkiUpdateResult(success=False, audio_in_anki='', screenshot_in_anki='', prev_screenshot_in_anki='', sentence_in_anki='', multi_line=False, video_in_anki='', word_path='')
 
 
 @dataclass_json
@@ -1197,3 +1201,5 @@ is_beangate = os.path.exists("C:/Users/Beangate")
 
 logger.debug(f"Running in development mode: {is_dev}")
 logger.debug(f"Running on Beangate's PC: {is_beangate}")
+
+logger.info("THE UPDATE WORKED?")