GameSentenceMiner 2.3.0__py3-none-any.whl → 2.3.1__py3-none-any.whl

GameSentenceMiner/anki.py

@@ -12,6 +12,7 @@ from GameSentenceMiner.configuration import *
 from GameSentenceMiner.configuration import get_config
 from GameSentenceMiner.gametext import get_last_two_sentences
 from GameSentenceMiner.obs import get_current_game
+from util import remove_html_tags
 
 audio_in_anki = None
 screenshot_in_anki = None
@@ -69,6 +70,8 @@ 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}")
 
@@ -110,12 +113,9 @@ def get_initial_card_info(last_note, selected_lines):
     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
 
     if get_config().audio.mining_from_history_grab_all_audio and get_config().anki.multi_overwrites_sentence:
         lines = gametext.get_line_and_future_lines(last_note)
-        logger.info(lines)
-        logger.info("".join(lines))
         if lines:
             note['fields'][get_config().anki.sentence_field] = "".join(lines)
 
@@ -212,11 +212,11 @@ def update_new_card():
     if not check_tags_for_should_update(last_card):
         return
 
-    use_prev_audio = util.use_previous_audio
     if util.lock.locked():
         logger.info("Audio still being Trimmed, Card Queued!")
-        use_prev_audio = True
     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()
@@ -226,6 +226,13 @@ def update_new_card():
             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():
+        return False
+    return remove_html_tags(get_sentence(last_card)) == remove_html_tags(util.get_last_mined_line())
+
+def get_sentence(card):
+    return card['fields'][get_config().anki.sentence_field]['value']
 
 def check_tags_for_should_update(last_card):
     if get_config().anki.tags_to_check:

GameSentenceMiner/config_gui.py

@@ -184,6 +184,8 @@ class ConfigApp:
             ),
             obs=OBS(
                 enabled=self.obs_enabled.get(),
+                open_obs=self.open_obs.get(),
+                close_obs=self.close_obs.get(),
                 host=self.obs_host.get(),
                 port=int(self.obs_port.get()),
                 password=self.obs_password.get(),
@@ -766,6 +768,18 @@ class ConfigApp:
         self.add_label_and_increment_row(obs_frame, "Enable or disable OBS integration.", row=self.current_row,
                                          column=2)
 
+        ttk.Label(obs_frame, text="Open OBS:").grid(row=self.current_row, column=0, sticky='W')
+        self.open_obs = tk.BooleanVar(value=self.settings.obs.open_obs)
+        ttk.Checkbutton(obs_frame, variable=self.open_obs).grid(row=self.current_row, column=1, sticky='W')
+        self.add_label_and_increment_row(obs_frame, "Open OBS when the GSM starts.", row=self.current_row,
+                                         column=2)
+
+        ttk.Label(obs_frame, text="Close OBS:").grid(row=self.current_row, column=0, sticky='W')
+        self.close_obs = tk.BooleanVar(value=self.settings.obs.close_obs)
+        ttk.Checkbutton(obs_frame, variable=self.close_obs).grid(row=self.current_row, column=1, sticky='W')
+        self.add_label_and_increment_row(obs_frame, "Close OBS when the GSM closes.", row=self.current_row,
+                                         column=2)
+
         ttk.Label(obs_frame, text="Host:").grid(row=self.current_row, column=0, sticky='W')
         self.obs_host = ttk.Entry(obs_frame)
         self.obs_host.insert(0, self.settings.obs.host)

GameSentenceMiner/configuration.py

@@ -121,6 +121,8 @@ class Audio:
 @dataclass
 class OBS:
     enabled: bool = True
+    open_obs: bool = True
+    close_obs: bool = False
     host: str = "localhost"
     port: int = 4455
     password: str = "your_password"

GameSentenceMiner/gametext.py

@@ -9,7 +9,6 @@ from typing import Callable
 import pyperclip
 import websockets
 
-from GameSentenceMiner import util
 from GameSentenceMiner.configuration import *
 from GameSentenceMiner.configuration import get_config, logger
 from GameSentenceMiner.util import remove_html_tags
@@ -80,7 +79,6 @@ def handle_new_text_event(current_clipboard):
         current_line_after_regex = current_line
     current_line_time = datetime.now()
     line_history[current_line_after_regex] = current_line_time
-    util.use_previous_audio = False
     multi_mine_event_bus(current_line_after_regex, current_line_time)
     logger.debug(f"New Line: {current_clipboard}")
 
@@ -90,7 +88,6 @@ 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.use_previous_audio = False
 
 
 def run_websocket_listener():

GameSentenceMiner/gsm.py

@@ -64,7 +64,6 @@ class VideoToAudioHandler(FileSystemEventHandler):
                     logger.error(
                         f"Video was unusually small, potentially empty! Check OBS for Correct Scene Settings! Path: {video_path}")
                     return
-                util.use_previous_audio = True
                 last_note = None
                 logger.debug("Attempting to get last anki card")
                 if get_config().anki.update_anki:
@@ -157,7 +156,8 @@ def initialize(reloading=False):
             download_obs_if_needed()
             download_ffmpeg_if_needed()
         if get_config().obs.enabled:
-            obs_process = obs.start_obs()
+            if get_config().obs.open_obs:
+                obs_process = obs.start_obs()
             obs.connect_to_obs(start_replay=True)
             anki.start_monitoring_anki()
         gametext.start_text_monitor(utility_window.add_text)
@@ -344,7 +344,8 @@ def cleanup():
         if get_config().obs.start_buffer:
             obs.stop_replay_buffer()
     obs.disconnect_from_obs()
-    close_obs()
+    if get_config().obs.close_obs:
+        close_obs()
 
     proc: Popen
     for proc in procs_to_close:

GameSentenceMiner/util.py

@@ -14,10 +14,16 @@ from GameSentenceMiner.configuration import logger
 SCRIPTS_DIR = r"E:\Japanese Stuff\agent-v0.1.4-win32-x64\data\scripts"
 
 # Global variables to control script execution
-use_previous_audio = False
 keep_running = True
 lock = threading.Lock()
+last_mined_line = None
 
+def get_last_mined_line():
+    return last_mined_line
+
+def set_last_mined_line(line):
+    global last_mined_line
+    last_mined_line = line
 
 def run_new_thread(func):
     thread = threading.Thread(target=func, daemon=True)

{GameSentenceMiner-2.3.0.dist-info → GameSentenceMiner-2.3.1.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.2
 Name: GameSentenceMiner
-Version: 2.3.0
-Summary: A tool for mining sentences from games. Update: Multi-Line Mining!
+Version: 2.3.1
+Summary: A tool for mining sentences from games. Update: Multi-Line Mining! Fixed!
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License
 Project-URL: Homepage, https://github.com/bpwhelan/GameSentenceMiner

{GameSentenceMiner-2.3.0.dist-info → GameSentenceMiner-2.3.1.dist-info}/RECORD

@@ -1,15 +1,15 @@
 GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/anki.py,sha256=895FTnqZCn2AmfUqxWKsSOkzumFoPRNhwPRf00mB7OI,9755
-GameSentenceMiner/config_gui.py,sha256=IYM_qZV22Hn_eGbXIqrQx2r7UGlTFDLBa0bqu3HqFl0,52491
-GameSentenceMiner/configuration.py,sha256=X61ks7iuzf0Wu7U4QuhggUGB9-1KLka-V4cduoEOddA,14294
+GameSentenceMiner/anki.py,sha256=gpd_af7zrwuGyIfMAPvunZW1I0mVG2MBemVnikTVp5c,10151
+GameSentenceMiner/config_gui.py,sha256=B37GPeGtGNTJgFTor3M01Tw2iZYRRtHLYck6Q83-JRg,53460
+GameSentenceMiner/configuration.py,sha256=x50-InaGl70dHpWhdOAZJTIKj84EtVfTqEmIFCnDcvw,14348
 GameSentenceMiner/ffmpeg.py,sha256=VExJYWSFhYuWukIXgOiHufsoSROEDA8LnVQFG8srRGc,10924
-GameSentenceMiner/gametext.py,sha256=ci1ZTwObi-5pxFWHcXp1cDWMrCz_zaPtUsWvTO_jwRU,6570
-GameSentenceMiner/gsm.py,sha256=GY9T3h2dwY-XofXqESiyZpezRvlfaZrhzo0PDuuE87g,17065
+GameSentenceMiner/gametext.py,sha256=ckZGOHpGuvFE2zDNdaASSaMYi4JCFsyG2kYKCbZIQPo,6463
+GameSentenceMiner/gsm.py,sha256=l92vu9P06v5crBfka-TGjlSyqM7WG2ND4ZzWQVTY7ws,17103
 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=0uaLAp0WrWqostNTBWRS0laITjI9aN9Yt_6GXosS4NQ,1278
-GameSentenceMiner/util.py,sha256=cgKpPfRpouWI6tjE_35MWp8nXqRzXs3LvsYXWm5_DOg,4584
+GameSentenceMiner/util.py,sha256=MITweiFYaefWQF5nR8tZ9yE6vd_b-fLuP0MP1Y1U4K0,4720
 GameSentenceMiner/utility_gui.py,sha256=-T5b14Nx6KvNnBEmdVz0mWkXoYi-bZzHIce6ADwfVEQ,4701
 GameSentenceMiner/downloader/Untitled_json.py,sha256=RUUl2bbbCpUDUUS0fP0tdvf5FngZ7ILdA_J5TFYAXUQ,15272
 GameSentenceMiner/downloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.0.dist-info/METADATA,sha256=isZtUWBqPSC2Q-MG3HbL9aUT4uAbjHIiXhJFSYSR4mg,10113
-GameSentenceMiner-2.3.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-GameSentenceMiner-2.3.0.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-GameSentenceMiner-2.3.0.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-GameSentenceMiner-2.3.0.dist-info/RECORD,,
+GameSentenceMiner-2.3.1.dist-info/METADATA,sha256=UN9Pn6JrUpTuIeMRBT3CAizAUNmVM9aTKw6DCBwxTOg,10120
+GameSentenceMiner-2.3.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+GameSentenceMiner-2.3.1.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+GameSentenceMiner-2.3.1.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+GameSentenceMiner-2.3.1.dist-info/RECORD,,