GameSentenceMiner 2.2.2.post2__py3-none-any.whl → 2.2.4__py3-none-any.whl

GameSentenceMiner/anki.py

@@ -107,7 +107,7 @@ def get_initial_card_info(last_note):
     note = {'id': last_note['noteId'], 'fields': {}}
     if not last_note:
         return note
-    current_line, previous_line = get_last_two_sentences()
+    current_line, previous_line = get_last_two_sentences(last_note)
     logger.debug(f"Previous Sentence {previous_line}")
     logger.debug(f"Current Sentence {current_line}")
     util.use_previous_audio = True
@@ -200,7 +200,6 @@ def check_for_new_cards():
 def update_new_card():
     last_card = get_last_anki_card()
     if not check_tags_for_should_update(last_card):
-        logger.info("Card not tagged properly! Not updating!")
         return
 
     use_prev_audio = util.use_previous_audio
@@ -222,11 +221,11 @@ def check_tags_for_should_update(last_card):
     if get_config().anki.tags_to_check:
         found = False
         for tag in last_card['tags']:
-            logger.info(tag)
-            logger.info(get_config().anki.tags_to_check)
             if tag.lower() in get_config().anki.tags_to_check:
                 found = True
                 break
+        if not found:
+            logger.info(f"Card not tagged properly! Not updating! Note Tags: {last_card['tags']}, Tags_To_Check {get_config().anki.tags_to_check}")
         return found
     else:
         return True

GameSentenceMiner/config_gui.py

@@ -1,14 +1,16 @@
 import tkinter as tk
 from tkinter import filedialog, messagebox, simpledialog
 
+import pyperclip
 import ttkbootstrap as ttk
 
-from GameSentenceMiner.package_updater import check_for_updates, get_latest_version, update, get_current_version
+from GameSentenceMiner.package_updater import check_for_updates, get_latest_version, get_current_version
 from GameSentenceMiner import obs, configuration
 from GameSentenceMiner.configuration import *
 
 settings_saved = False
 on_save = []
+exit_func = None
 
 
 def new_tab(func):
@@ -45,6 +47,7 @@ class HoverInfoWidget:
             self.tooltip = None
 
 
+
 class ConfigApp:
     def __init__(self):
         self.window = ttk.Window(themename='darkly')
@@ -75,7 +78,12 @@ class ConfigApp:
 
         self.window.withdraw()
 
+    def add_save_hook(self, func):
+        on_save.append(func)
 
+    def add_exit_hook(self, func):
+        global exit_func
+        exit_func = func
 
     def show(self):
         obs.update_current_game()
@@ -93,9 +101,8 @@ class ConfigApp:
         update_available, version = check_for_updates()
         if update_available:
             messagebox.showinfo("Update", "GSM Will Copy the Update Command to your clipboard, please run it in a terminal.")
-            success = update()
-            if not success:
-                messagebox.showinfo("Update Unsuccessful", "Couldn't Start Update, please update manually.")
+            pyperclip.copy("pip install --upgrade GameSentenceMiner")
+            exit_func(None, None)
         else:
             messagebox.showinfo("No Update Found", "No update found.")
 
@@ -109,9 +116,6 @@ class ConfigApp:
         elif show_no_update:
             messagebox.showinfo("No Update Found", "No update found.")
 
-    def add_save_hook(self, func):
-        on_save.append(func)
-
     def save_settings(self, profile_change=False):
         global settings_saved
 
@@ -139,6 +143,7 @@ class ConfigApp:
                 picture_field=self.picture_field.get(),
                 word_field=self.word_field.get(),
                 previous_sentence_field=self.previous_sentence_field.get(),
+                previous_image_field=self.previous_image_field.get(),
                 custom_tags=[tag.strip() for tag in self.custom_tags.get().split(',') if tag.strip()],
                 tags_to_check=[tag.strip().lower() for tag in self.tags_to_check.get().split(',') if tag.strip()],
                 add_game_tag=self.add_game_tag.get(),
@@ -476,6 +481,15 @@ class ConfigApp:
                                          row=self.current_row,
                                          column=2)
 
+        ttk.Label(anki_frame, text="Previous Image Field:").grid(row=self.current_row, column=0, sticky='W')
+        self.previous_image_field = ttk.Entry(anki_frame)
+        self.previous_image_field.insert(0, self.settings.anki.previous_image_field)
+        self.previous_image_field.grid(row=self.current_row, column=1)
+        self.add_label_and_increment_row(anki_frame,
+                                         "Field in Anki for the image line of previous Image. If Empty, will not populate",
+                                         row=self.current_row,
+                                         column=2)
+
         ttk.Label(anki_frame, text="Custom Tags:").grid(row=self.current_row, column=0, sticky='W')
         self.custom_tags = ttk.Entry(anki_frame)
         self.custom_tags.insert(0, ', '.join(self.settings.anki.custom_tags))
@@ -813,7 +827,7 @@ class ConfigApp:
     def add_profile(self):
         new_profile_name = simpledialog.askstring("Input", "Enter new profile name:")
         if new_profile_name:
-            self.master_config.configs[new_profile_name] = self.master_config.default_config
+            self.master_config.configs[new_profile_name] = self.master_config.get_default_config()
             self.profile_combobox['values'] = list(self.master_config.configs.keys())
             self.profile_combobox.set(new_profile_name)
             self.save_settings()

GameSentenceMiner/configuration.py

@@ -64,6 +64,7 @@ class Anki:
     picture_field: str = "Picture"
     word_field: str = 'Word'
     previous_sentence_field: str = ''
+    previous_image_field: str = ''
     custom_tags: List[str] = None  # Initialize to None and set it in __post_init__
     tags_to_check: List[str] = None
     add_game_tag: bool = True
@@ -249,6 +250,9 @@ class Config:
     def get_all_profile_names(self):
         return list(self.configs.keys())
 
+    def get_default_config(self):
+        return self.configs[DEFAULT_CONFIG]
+
 
 def get_app_directory():
     if platform == 'win32':  # Windows

GameSentenceMiner/gametext.py

@@ -112,7 +112,7 @@ def get_line_timing(last_note):
         if sentence:
             for i, (line, clip_time) in enumerate(reversed(line_history.items())):
                 similarity = similar(remove_html_tags(sentence), line)
-                if similarity >= 0.60:  # 80% similarity threshold
+                if similarity >= 0.60 or line in remove_html_tags(sentence):  # 80% similarity threshold
                     line_time = clip_time
                     next_line = prev_clip_time
                     break
@@ -123,6 +123,35 @@ def get_line_timing(last_note):
     return line_time, next_line
 
 
-def get_last_two_sentences():
+def get_last_two_sentences(last_note):
+    def similar(a, b):
+        return SequenceMatcher(None, a, b).ratio()
     lines = list(line_history.items())
-    return lines[-1][0] if lines else '', lines[-2][0] if len(lines) > 1 else ''
+
+    if not last_note:
+        return lines[-1][0] if lines else '', lines[-2][0] if len(lines) > 1 else ''
+
+    current_line = ""
+    prev_line = ""
+
+    sentence = last_note['fields'][get_config().anki.sentence_field]['value']
+    if sentence:
+        found = False
+        for i, (line, clip_time) in enumerate(reversed(lines)):
+            similarity = similar(remove_html_tags(sentence), line)
+            logger.debug(f"Comparing: {remove_html_tags(sentence)} with {line} - Similarity: {similarity}")
+            if found:
+                prev_line = line
+                break
+            if similarity >= 0.60 or line in remove_html_tags(sentence):  # 80% similarity threshold
+                found = True
+                current_line = line
+
+    logger.debug(f"Current Line: {current_line}")
+    logger.debug(f"Previous Line: {prev_line}")
+
+    if not current_line or not prev_line:
+        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

GameSentenceMiner/gsm.py

@@ -29,7 +29,7 @@ from GameSentenceMiner.util import *
 if is_windows():
     import win32api
 
-obs_process: Popen
+obs_process: Popen = None
 procs_to_close = []
 settings_window: config_gui.ConfigApp = None
 obs_paused = False
@@ -89,22 +89,19 @@ class VideoToAudioHandler(FileSystemEventHandler):
                     should_update_audio = False
                     vad_trimmed_audio = ""
                     logger.info("No SentenceAudio Field in config, skipping audio processing!")
-                try:
                     # Only update sentenceaudio if it's not present. Want to avoid accidentally overwriting sentence audio
-                    try:
-                        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,
-                                                  should_update_audio=should_update_audio,
-                                                  ss_time=ss_timing)
-                        elif get_config().features.notify_on_update and should_update_audio:
-                            notification.send_audio_generated_notification(vad_trimmed_audio)
-                    except Exception as e:
-                        logger.error(f"Card failed to update! Maybe it was removed? {e}")
-                except FileNotFoundError as f:
-                    logger.error("Something went wrong with processing, anki card not updated")
+                try:
+                    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,
+                                              should_update_audio=should_update_audio,
+                                              ss_time=ss_timing)
+                    elif get_config().features.notify_on_update and should_update_audio:
+                        notification.send_audio_generated_notification(vad_trimmed_audio)
+                except Exception as e:
+                    logger.exception(f"Card failed to update! Maybe it was removed? {e}")
         except Exception as e:
-            logger.error(f"Some error was hit catching to allow further work to be done: {e}", exc_info=1)
+            logger.exception(f"Some error was hit catching to allow further work to be done: {e}")
         if get_config().paths.remove_video and os.path.exists(video_path):
             os.remove(video_path)  # Optionally remove the video after conversion
         if get_config().paths.remove_audio and os.path.exists(vad_trimmed_audio):
@@ -320,10 +317,11 @@ def close_obs():
 
 def restart_obs():
     global obs_process
-    close_obs()
-    time.sleep(2)
-    obs_process = obs.start_obs()
-    obs.connect_to_obs(start_replay=True)
+    if obs_process:
+        close_obs()
+        time.sleep(2)
+        obs_process = obs.start_obs()
+        obs.connect_to_obs(start_replay=True)
 
 def cleanup():
     logger.info("Performing cleanup...")
@@ -393,6 +391,7 @@ def main(reloading=False, do_config_input=True):
         if get_config().general.open_config_on_startup:
             settings_window.window.after(0, settings_window.show)
         settings_window.add_save_hook(update_icon)
+        settings_window.on_exit = exit_program
         settings_window.window.mainloop()
     except KeyboardInterrupt:
         cleanup()

GameSentenceMiner/package_updater.py

@@ -39,11 +39,3 @@ def check_for_updates(force=False):
             return False, latest_version
     except Exception as e:
         logger.error(f"Error checking for updates: {e}")
-
-def update():
-    try:
-        pyperclip.copy("pip install --upgrade GameSentenceMiner")
-        exit()
-    except Exception as e:
-        logger.error(f"Error updating {PACKAGE_NAME}: {e}")
-    return False

{GameSentenceMiner-2.2.2.post2.dist-info → GameSentenceMiner-2.2.4.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.2
 Name: GameSentenceMiner
-Version: 2.2.2.post2
-Summary: A tool for mining sentences from games. Update: Use ffprobe from GSM Directory
+Version: 2.2.4
+Summary: A tool for mining sentences from games. Update: Fix Previous Sentence When Mining from History
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License
 Project-URL: Homepage, https://github.com/bpwhelan/GameSentenceMiner

{GameSentenceMiner-2.2.2.post2.dist-info → GameSentenceMiner-2.2.4.dist-info}/RECORD

@@ -1,14 +1,14 @@
 GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/anki.py,sha256=_yaHQZwOYooQssfJ5hbST5cC6vsffkSEvUIeMouwQZw,9208
-GameSentenceMiner/config_gui.py,sha256=d9bQUUI-QR879FJJsROcQ4Y7gk08h95uPNGN1DWdIuU,49005
-GameSentenceMiner/configuration.py,sha256=Cw5vUF74ZKcSinbciNMiLKpMO8M6sf-0THokHO_31nE,14010
+GameSentenceMiner/anki.py,sha256=urgly10zM7etTXfagK327TKWXVq146jqkpTmewoim7s,9238
+GameSentenceMiner/config_gui.py,sha256=EBl5TuzyqXUovq4YF-UQsl4W7DAzIpdzANI52AiTyoU,49743
+GameSentenceMiner/configuration.py,sha256=Wd4Cozdus_Tl33_Qz4twibBx6p_3_mHMzdZfZ-B1qI4,14124
 GameSentenceMiner/ffmpeg.py,sha256=txTpco-IGWtfF8vIiWUzrtgI5TA1xPVIK-WJWxU02mM,10878
-GameSentenceMiner/gametext.py,sha256=pAovclbBSLigoyJMcdhNrieFDDPLJY3htHBGhjQ2Xk0,4081
-GameSentenceMiner/gsm.py,sha256=6LX3kFhyB1QoXFr5jzGZvONzQa6_PmPn_R7o2AiRRqA,16493
+GameSentenceMiner/gametext.py,sha256=QQbZnV1eZ1DxwJl9fwfn8p6z1UjpSk6JRpxKmJ4CrUw,5210
+GameSentenceMiner/gsm.py,sha256=qDa8Q8bjBNnmVGLDqiEYLTC_ZyBkS3zw2SmP4Tc_h0o,16375
 GameSentenceMiner/model.py,sha256=oh8VVT8T1UKekbmP6MGNgQ8jIuQ_7Rg4GPzDCn2kJo8,1999
 GameSentenceMiner/notification.py,sha256=WBaQWoPNhW4XqdPBUmxPBgjk0ngzH_4v9zMQ-XQAKC8,2010
 GameSentenceMiner/obs.py,sha256=3Flcjxy812VpF78EPI7sxlGx6yyM3GfqzlinW17SK20,6231
-GameSentenceMiner/package_updater.py,sha256=KBJwLrlcAyoGHNNmDSVdPgWawqfWiIWOodcZhYheoms,1486
+GameSentenceMiner/package_updater.py,sha256=0uaLAp0WrWqostNTBWRS0laITjI9aN9Yt_6GXosS4NQ,1278
 GameSentenceMiner/util.py,sha256=cgKpPfRpouWI6tjE_35MWp8nXqRzXs3LvsYXWm5_DOg,4584
 GameSentenceMiner/downloader/Untitled_json.py,sha256=RUUl2bbbCpUDUUS0fP0tdvf5FngZ7ILdA_J5TFYAXUQ,15272
 GameSentenceMiner/downloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -17,8 +17,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.2.2.post2.dist-info/METADATA,sha256=soTcs3hdtc4XGqR1wsuLUV4fPwVEBrzCCW8gy97pcn8,10131
-GameSentenceMiner-2.2.2.post2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-GameSentenceMiner-2.2.2.post2.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-GameSentenceMiner-2.2.2.post2.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-GameSentenceMiner-2.2.2.post2.dist-info/RECORD,,
+GameSentenceMiner-2.2.4.dist-info/METADATA,sha256=-S903oxc3YHCUd7s_F97f0CARKRJgk3E-yZ5AZ2u8pQ,10141
+GameSentenceMiner-2.2.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+GameSentenceMiner-2.2.4.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+GameSentenceMiner-2.2.4.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+GameSentenceMiner-2.2.4.dist-info/RECORD,,