GameSentenceMiner 2.9.7__py3-none-any.whl → 2.9.8__py3-none-any.whl

GameSentenceMiner/anki.py

@@ -82,10 +82,7 @@ def update_anki_card(last_note: AnkiCard, note=None, audio_path='', video_path='
         for key, value in get_config().anki.anki_custom_fields.items():
             note['fields'][key] = str(value)
 
-    selected_notes = invoke("guiSelectedNotes")
-    if last_note.noteId in selected_notes:
-        notification.open_browser_window(1)
-    invoke("updateNoteFields", note=note)
+
     tags = []
     if get_config().anki.custom_tags:
         tags.extend(get_config().anki.custom_tags)
@@ -94,19 +91,26 @@ def update_anki_card(last_note: AnkiCard, note=None, audio_path='', video_path='
     if tags:
         tag_string = " ".join(tags)
         invoke("addTags", tags=tag_string, notes=[last_note.noteId])
-    logger.info(f"UPDATED ANKI CARD FOR {last_note.noteId}")
+
+    check_and_update_note(last_note, note, tags)
+
     if get_config().features.notify_on_update:
         notification.send_note_updated(tango)
+    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}")
+
+def check_and_update_note(last_note, note, tags=[]):
+    selected_notes = invoke("guiSelectedNotes")
+    if last_note.noteId in selected_notes:
+        notification.open_browser_window(1)
+    invoke("updateNoteFields", note=note)
+
+    logger.info(f"UPDATED ANKI CARD FOR {last_note.noteId}")
     if last_note.noteId in selected_notes or get_config().features.open_anki_in_browser:
         notification.open_browser_window(last_note.noteId, get_config().features.browser_query)
     if get_config().features.open_anki_edit:
         notification.open_anki_card(last_note.noteId)
 
-
-    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}")
-
-
 def open_audio_in_external(fileabspath, shell=False):
     logger.info(f"Opening audio in external program...")
     if shell:
@@ -131,7 +135,7 @@ def add_image_to_card(last_note: AnkiCard, image_path):
     if update_picture:
         note['fields'][get_config().anki.picture_field] = image_html
 
-    invoke("updateNoteFields", note=note)
+    check_and_update_note(last_note, note)
 
     logger.info(f"UPDATED IMAGE FOR ANKI CARD {last_note.noteId}")
 

GameSentenceMiner/gsm.py

@@ -32,7 +32,7 @@ try:
     from GameSentenceMiner.util.configuration import *
     from GameSentenceMiner.util.ffmpeg import get_audio_and_trim, get_video_timings
     from GameSentenceMiner.obs import check_obs_folder_is_correct
-    from GameSentenceMiner.util.text_log import GameLine, get_text_event, get_mined_line, get_all_lines
+    from GameSentenceMiner.util.text_log import GameLine, get_text_event, get_mined_line, get_all_lines, game_log
     from GameSentenceMiner.util import *
     from GameSentenceMiner.web import texthooking_page
     from GameSentenceMiner.web.texthooking_page import run_text_hooker_page
@@ -197,7 +197,24 @@ class VideoToAudioHandler(FileSystemEventHandler):
                 gsm_state.line_for_screenshot = None
                 gsm_state.previous_line_for_screenshot = line
                 screenshot = ffmpeg.get_screenshot_for_line(video_path, line, True)
-                os.startfile(screenshot)
+                if gsm_state.anki_note_for_screenshot:
+                    gsm_state.anki_note_for_screenshot = None
+                    encoded_image = ffmpeg.process_image(screenshot)
+                    if get_config().anki.update_anki and get_config().screenshot.screenshot_hotkey_updates_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 last_note:
+                            anki.add_image_to_card(last_note, encoded_image)
+                            notification.send_screenshot_updated(last_note.get_field(get_config().anki.word_field))
+                            if get_config().features.open_anki_edit:
+                                notification.open_anki_card(last_note.noteId)
+                        else:
+                            notification.send_screenshot_saved(encoded_image)
+                    else:
+                        notification.send_screenshot_saved(encoded_image)
+                else:
+                    os.startfile(screenshot)
                 return
         except Exception as e:
             logger.error(f"Error Playing Audio/Video: {e}")
@@ -303,27 +320,30 @@ def register_hotkeys():
 
 
 def get_screenshot():
-    try:
-        image = obs.get_screenshot()
-        wait_for_stable_file(image, timeout=3)
-        if not image:
-            raise Exception("Failed to get Screenshot from OBS")
-        encoded_image = ffmpeg.process_image(image)
-        if get_config().anki.update_anki and get_config().screenshot.screenshot_hotkey_updates_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 last_note:
-                anki.add_image_to_card(last_note, encoded_image)
-                notification.send_screenshot_updated(last_note.get_field(get_config().anki.word_field))
-                if get_config().features.open_anki_edit:
-                    notification.open_anki_card(last_note.noteId)
-            else:
-                notification.send_screenshot_saved(encoded_image)
-        else:
-            notification.send_screenshot_saved(encoded_image)
-    except Exception as e:
-        logger.error(f"Failed to get Screenshot: {e}")
+    # try:
+    gsm_state.line_for_screenshot = game_log.get_last_line()
+    gsm_state.anki_note_for_screenshot = anki.get_last_anki_card()
+    obs.save_replay_buffer()
+    #     image = obs.get_screenshot()
+    #     wait_for_stable_file(image, timeout=3)
+    #     if not image:
+    #         raise Exception("Failed to get Screenshot from OBS")
+    #     encoded_image = ffmpeg.process_image(image)
+    #     if get_config().anki.update_anki and get_config().screenshot.screenshot_hotkey_updates_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 last_note:
+    #             anki.add_image_to_card(last_note, encoded_image)
+    #             notification.send_screenshot_updated(last_note.get_field(get_config().anki.word_field))
+    #             if get_config().features.open_anki_edit:
+    #                 notification.open_anki_card(last_note.noteId)
+    #         else:
+    #             notification.send_screenshot_saved(encoded_image)
+    #     else:
+    #         notification.send_screenshot_saved(encoded_image)
+    # except Exception as e:
+    #     logger.error(f"Failed to get Screenshot: {e}")
 
 
 # def create_image():

GameSentenceMiner/util/configuration.py

@@ -641,6 +641,7 @@ class GsmAppState:
     def __init__(self):
         self.line_for_audio = None
         self.line_for_screenshot = None
+        self.anki_note_for_screenshot = None
         self.previous_line_for_audio = None
         self.previous_line_for_screenshot = None
         self.previous_audio = None

GameSentenceMiner/util/ss_selector.py

@@ -75,7 +75,7 @@ def display_images(image_paths, golden_frame):
 
     for i, path in enumerate(image_paths):
         img = Image.open(path)
-        img.thumbnail((450, 450))
+        img.thumbnail((img.width / 8, img.height / 8))
         img_tk = ImageTk.PhotoImage(img)
         if golden_frame and path == golden_frame:
             label = tk.Label(window, image=img_tk, borderwidth=5, relief="solid")

GameSentenceMiner/util/text_log.py

@@ -90,8 +90,13 @@ class GameText:
                 return True
         return False
 
+    def get_last_line(self):
+        if self.values:
+            return self.values[-1]
+        return None
+
 
-text_log = GameText()
+game_log = GameText()
 
 
 def similar(a, b):
@@ -109,7 +114,7 @@ def lines_match(a, b):
 
 
 def get_text_event(last_note) -> GameLine:
-    lines = text_log.values
+    lines = game_log.values
 
     if not lines:
         raise Exception("No lines in history. Text is required from either clipboard or websocket for GSM to work. Please check your setup/config.")
@@ -137,7 +142,7 @@ def get_line_and_future_lines(last_note):
     found_lines = []
     if sentence:
         found = False
-        for line in text_log.values:
+        for line in game_log.values:
             if found:
                 found_lines.append(line.text)
             if lines_match(line.text, remove_html_and_cloze_tags(sentence)):  # 80% similarity threshold
@@ -160,18 +165,18 @@ def get_mined_line(last_note: AnkiCard, lines):
 
 
 def get_time_of_line(line):
-    return text_log.get_time(line)
+    return game_log.get_time(line)
 
 
 def get_all_lines():
-    return text_log.values
+    return game_log.values
 
 
 def get_text_log() -> GameText:
-    return text_log
+    return game_log
 
 def add_line(current_line_after_regex, line_time):
-    text_log.add_line(current_line_after_regex, line_time)
+    game_log.add_line(current_line_after_regex, line_time)
 
 def get_line_by_id(line_id: str) -> Optional[GameLine]:
     """
@@ -183,4 +188,4 @@ def get_line_by_id(line_id: str) -> Optional[GameLine]:
     Returns:
         Optional[GameLine]: The GameLine object if found, otherwise None.
     """
-    return text_log.get_by_id(line_id)
+    return game_log.get_by_id(line_id)

{gamesentenceminer-2.9.7.dist-info → gamesentenceminer-2.9.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.9.7
+Version: 2.9.8
 Summary: A tool for mining sentences from games.
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.9.7.dist-info → gamesentenceminer-2.9.8.dist-info}/RECORD

@@ -1,8 +1,8 @@
 GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/anki.py,sha256=CuzVqzuFtZnbMbU2Zk-sxNGwSgyCpv5RLL7lOOX0Meg,14972
+GameSentenceMiner/anki.py,sha256=OPamV4p5mSEkfrUdflauzDJ4Uh2rLYtHq9F7D1aMyhY,15077
 GameSentenceMiner/config_gui.py,sha256=r-ASCXVNS4Io6Ej3svwC8aJEWc9Rc7u-pzfsAwD4ru8,82079
 GameSentenceMiner/gametext.py,sha256=mM-gw1d7c2EEvMUznaAevTQFLswNZavCuxMXhA9pV4g,6251
-GameSentenceMiner/gsm.py,sha256=SHvT3JZlYpZgKeJnVXrtk8ve4ubiM7YPv-9FDF7rVM4,27724
+GameSentenceMiner/gsm.py,sha256=QYc2AovzwlhVGtPmwWkNKHgo6CsFdT37ACXMbsmPAu8,29061
 GameSentenceMiner/obs.py,sha256=O9NYOGu7kwp4flq8LLXp8YJQg0JTZ8qBqiQNQ6u4ku4,14724
 GameSentenceMiner/vad.py,sha256=Gk_VthD7mDp3-wM_S6bEv8ykGmqzCDbbcRiaEBzAE_o,14835
 GameSentenceMiner/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -28,15 +28,15 @@ GameSentenceMiner/owocr/owocr/ocr.py,sha256=y8RHHaJw8M4BG4CbbtIw0DrV8KP9RjbJNJxj
 GameSentenceMiner/owocr/owocr/run.py,sha256=jFN7gYYriHgfqORJiBTz8mPkQsDJ6ZugA0_ATWUxk-U,54750
 GameSentenceMiner/owocr/owocr/screen_coordinate_picker.py,sha256=Na6XStbQBtpQUSdbN3QhEswtKuU1JjReFk_K8t5ezQE,3395
 GameSentenceMiner/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/util/configuration.py,sha256=Qk5V4HA2FJbdMTa9jYZfNVQ_4rzvjbUtJgPejwQ3vwk,25856
+GameSentenceMiner/util/configuration.py,sha256=VCIDRjulbWu-xgU2B_k2i8POVrP-Lw5dN3ghatDcxGs,25901
 GameSentenceMiner/util/electron_config.py,sha256=ZZf54QifdNHbII-JDsMZmdT8nTyrq-7gVvalyLRecfw,9792
 GameSentenceMiner/util/ffmpeg.py,sha256=qaCXkfK2fd-1NRqbm7burrdBYgnGx07kBuyenee8Mtk,18697
 GameSentenceMiner/util/gsm_utils.py,sha256=RoOTvWCVpmfYA7fLDdIPcgH1c6TZK4jDZq98BectPhg,8272
 GameSentenceMiner/util/model.py,sha256=iDtLTfR6D-ZC0gCiDqYno6-gA6Z07PZTM4B5MAA6xZI,5704
 GameSentenceMiner/util/notification.py,sha256=euTnnNDJm0izr0Z5AhZGV2wrrioCASeKUtm5aZFO5zU,3462
 GameSentenceMiner/util/package.py,sha256=u1ym5z869lw5EHvIviC9h9uH97bzUXSXXA8KIn8rUvk,1157
-GameSentenceMiner/util/ss_selector.py,sha256=ATgwDXi4-TLv0hB21NV79FZnXgidiM0z7TgvO7eBnhw,4472
-GameSentenceMiner/util/text_log.py,sha256=XOq8tpJUpNa-mKJPui40P5aUTX2yzMHPnHgJ2obagw0,5201
+GameSentenceMiner/util/ss_selector.py,sha256=oCzmDbpEGvVselF-oDPIrBcQktGIZT0Zt16uDLDAHMQ,4493
+GameSentenceMiner/util/text_log.py,sha256=JQS0JpcdaTvcdKgfKs3lWskG4dk6NPjqjMJpm2--37I,5310
 GameSentenceMiner/util/communication/__init__.py,sha256=xh__yn2MhzXi9eLi89PeZWlJPn-cbBSjskhi1BRraXg,643
 GameSentenceMiner/util/communication/send.py,sha256=Wki9qIY2CgYnuHbmnyKVIYkcKAN_oYS4up93XMikBaI,222
 GameSentenceMiner/util/communication/websocket.py,sha256=gPgxA2R2U6QZJjPqbUgODC87gtacPhmuC8lCprIkSmA,3287
@@ -59,9 +59,9 @@ GameSentenceMiner/web/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 GameSentenceMiner/web/templates/index.html,sha256=HZKiIjiGJV8PGQ9T2aLDUNSfJn71qOwbYCjbRuSIjpY,213583
 GameSentenceMiner/web/templates/text_replacements.html,sha256=tV5c8mCaWSt_vKuUpbdbLAzXZ3ATZeDvQ9PnnAfqY0M,8598
 GameSentenceMiner/web/templates/utility.html,sha256=3flZinKNqUJ7pvrZk6xu__v67z44rXnaK7UTZ303R-8,16946
-gamesentenceminer-2.9.7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.9.7.dist-info/METADATA,sha256=yhuKCbDJ0sP8Nd8TSl4UGVYOLGtq7VzrQaaOJti6INw,7250
-gamesentenceminer-2.9.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gamesentenceminer-2.9.7.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.9.7.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.9.7.dist-info/RECORD,,
+gamesentenceminer-2.9.8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.9.8.dist-info/METADATA,sha256=gzdjSH0FVBCWr47uvp9aBkGbHrxrHcmMBmYJky9csO0,7250
+gamesentenceminer-2.9.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gamesentenceminer-2.9.8.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.9.8.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.9.8.dist-info/RECORD,,