GameSentenceMiner 2.4.10__py3-none-any.whl → 2.4.12__py3-none-any.whl

GameSentenceMiner/config_gui.py

@@ -103,6 +103,7 @@ class ConfigApp:
         config = ProfileConfig(
             general=General(
                 use_websocket=self.websocket_enabled.get(),
+                use_clipboard=self.clipboard_enabled.get(),
                 websocket_uri=self.websocket_uri.get(),
                 open_config_on_startup=self.open_config_on_startup.get(),
                 texthook_replacement_regex=self.texthook_replacement_regex.get()
@@ -191,6 +192,10 @@ class ConfigApp:
             messagebox.showerror("Configuration Error", "Cannot have Full Auto and Backfill mode on at the same time! Note: Backfill is a very niche workflow.")
             return
 
+        if not config.general.use_websocket and not config.general.use_clipboard:
+            messagebox.showerror("Configuration Error", "Cannot have both Clipboard and Websocket Disabled.")
+            return
+
         current_profile = self.profile_combobox.get()
         prev_config = self.master_config.get_config()
         if profile_change:
@@ -256,13 +261,20 @@ class ConfigApp:
         general_frame = ttk.Frame(self.notebook)
         self.notebook.add(general_frame, text='General')
 
-        ttk.Label(general_frame, text="Websocket Enabled (Clipboard Disabled):").grid(row=self.current_row, column=0, sticky='W')
+        ttk.Label(general_frame, text="Websocket Enabled:").grid(row=self.current_row, column=0, sticky='W')
         self.websocket_enabled = tk.BooleanVar(value=self.settings.general.use_websocket)
         ttk.Checkbutton(general_frame, variable=self.websocket_enabled).grid(row=self.current_row, column=1,
                                                                              sticky='W')
         self.add_label_and_increment_row(general_frame, "Enable or disable WebSocket communication. Enabling this will disable the clipboard monitor. RESTART REQUIRED.",
                                          row=self.current_row, column=2)
 
+        ttk.Label(general_frame, text="Clipboard Enabled:").grid(row=self.current_row, column=0, sticky='W')
+        self.clipboard_enabled = tk.BooleanVar(value=self.settings.general.use_clipboard)
+        ttk.Checkbutton(general_frame, variable=self.clipboard_enabled).grid(row=self.current_row, column=1,
+                                                                             sticky='W')
+        self.add_label_and_increment_row(general_frame, "Enable to allow GSM to see clipboard for text and line timing.",
+                                         row=self.current_row, column=2)
+
         ttk.Label(general_frame, text="Websocket URI:").grid(row=self.current_row, column=0, sticky='W')
         self.websocket_uri = ttk.Entry(general_frame)
         self.websocket_uri.insert(0, self.settings.general.websocket_uri)

GameSentenceMiner/configuration.py

@@ -39,6 +39,7 @@ current_game = ''
 @dataclass
 class General:
     use_websocket: bool = True
+    use_clipboard: bool = True
     websocket_uri: str = 'localhost:6677'
     open_config_on_startup: bool = False
     texthook_replacement_regex: str = ""
@@ -63,7 +64,7 @@ class Anki:
     sentence_field: str = "Sentence"
     sentence_audio_field: str = "SentenceAudio"
     picture_field: str = "Picture"
-    word_field: str = 'Word'
+    word_field: str = 'Expression'
     previous_sentence_field: str = ''
     previous_image_field: str = ''
     custom_tags: List[str] = None  # Initialize to None and set it in __post_init__
@@ -236,6 +237,7 @@ class ProfileConfig:
     def restart_required(self, previous):
         previous: ProfileConfig
         if any([previous.general.use_websocket != self.general.use_websocket,
+                previous.general.use_clipboard != self.general.use_clipboard,
                 previous.general.websocket_uri != self.general.websocket_uri,
                 previous.paths.folder_to_watch != self.paths.folder_to_watch,
                 previous.obs.open_obs != self.obs.open_obs,

GameSentenceMiner/gametext.py

@@ -21,6 +21,7 @@ current_line_after_regex = ''
 current_line_time = datetime.now()
 
 reconnecting = False
+websocket_connected = False
 multi_mine_event_bus: Callable[[str, datetime], None] = None
 
 @dataclass
@@ -89,6 +90,9 @@ class ClipboardMonitor(threading.Thread):
         current_line = pyperclip.paste()
 
         while True:
+            if websocket_connected:
+                time.sleep(1)
+                continue
             current_clipboard = pyperclip.paste()
 
             if current_clipboard != current_line:
@@ -98,13 +102,14 @@ class ClipboardMonitor(threading.Thread):
 
 
 async def listen_websocket():
-    global current_line, current_line_time, line_history, reconnecting
+    global current_line, current_line_time, line_history, reconnecting, websocket_connected
     while True:
         try:
             async with websockets.connect(f'ws://{get_config().general.websocket_uri}', ping_interval=None) as websocket:
                 if reconnecting:
-                    logger.info(f"Texthooker WebSocket connected Successfully!")
+                    logger.info(f"Texthooker WebSocket connected Successfully!" + " Disabling Clipboard Monitor." if get_config().general.use_clipboard else "")
                     reconnecting = False
+                websocket_connected = True
                 while True:
                     message = await websocket.recv()
 
@@ -117,8 +122,9 @@ async def listen_websocket():
                     if current_clipboard != current_line:
                         handle_new_text_event(current_clipboard)
         except (websockets.ConnectionClosed, ConnectionError) as e:
+            websocket_connected = False
             if not reconnecting:
-                logger.warning(f"Texthooker WebSocket connection lost: {e}. IF USING CLIPBOARD, WEBSOCKET NEEDS TO BE TURNED OFF IN SETTINGS. Attempting to Reconnect...")
+                logger.warning(f"Texthooker WebSocket connection lost, Defaulting to clipboard if enabled. Attempting to Reconnect...")
             reconnecting = True
             await asyncio.sleep(5)
 
@@ -150,15 +156,19 @@ def start_text_monitor(send_to_mine_event_bus):
     global multi_mine_event_bus
     multi_mine_event_bus = send_to_mine_event_bus
     if get_config().general.use_websocket:
-        text_thread = threading.Thread(target=run_websocket_listener, daemon=True)
-    else:
-        text_thread = ClipboardMonitor()
-    text_thread.start()
+        threading.Thread(target=run_websocket_listener, daemon=True).start()
+    if get_config().general.use_clipboard:
+        if get_config().general.use_websocket:
+            logger.info("Both WebSocket and Clipboard monitoring are enabled. WebSocket will take precedence if connected.")
+        ClipboardMonitor().start()
 
 
 def similar(a, b):
     return SequenceMatcher(None, a, b).ratio()
 
+def one_contains_the_other(a, b):
+    return a in b or b in a
+
 
 def get_text_event(last_note) -> GameLine:
     lines = line_history.values
@@ -166,6 +176,9 @@ def get_text_event(last_note) -> GameLine:
     if not last_note:
         return lines[-1]
 
+    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.")
+
     sentence = last_note['fields'][get_config().anki.sentence_field]['value']
     if not sentence:
         return lines[-1]
@@ -173,7 +186,7 @@ def get_text_event(last_note) -> GameLine:
     for line in reversed(lines):
         similarity = similar(remove_html_tags(sentence), line.text)
         logger.debug(f"Comparing: {remove_html_tags(sentence)} with {line.text} - Similarity: {similarity}")
-        if similarity >= 0.60 or line.text in remove_html_tags(sentence):
+        if similarity >= 0.60 or one_contains_the_other(line.text, remove_html_tags(sentence)):
             return line
 
     logger.debug("Couldn't find a match in history, using last event")
@@ -193,21 +206,21 @@ def get_line_and_future_lines(last_note):
             logger.debug(f"Comparing: {remove_html_tags(sentence)} with {line.text} - Similarity: {similarity}")
             if found:
                 found_lines.append(line.text)
-            if similarity >= 0.60 or line.text in remove_html_tags(sentence):  # 80% similarity threshold
+            if similarity >= 0.60 or one_contains_the_other(line.text, remove_html_tags(sentence)):  # 80% similarity threshold
                 found = True
                 found_lines.append(line.text)
     return found_lines
 
 def get_mined_line(last_note, lines):
     if not last_note:
-        return lines[0]
+        return lines[-1]
 
     sentence = last_note['fields'][get_config().anki.sentence_field]['value']
-    for line2 in lines:
-        similarity = similar(remove_html_tags(sentence), line2.text)
-        if similarity >= 0.60 or line2.text in remove_html_tags(sentence):
-            return line2
-    return lines[0]
+    for line in lines:
+        similarity = similar(remove_html_tags(sentence), line.text)
+        if similarity >= 0.60 or one_contains_the_other(line.text, remove_html_tags(sentence)):
+            return line
+    return lines[-1]
 
 
 def get_time_of_line(line):

{gamesentenceminer-2.4.10.dist-info → gamesentenceminer-2.4.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: GameSentenceMiner
-Version: 2.4.10
+Version: 2.4.12
 Summary: A tool for mining sentences from games. Update: Multi-Line Mining! Fixed!
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.4.10.dist-info → gamesentenceminer-2.4.12.dist-info}/RECORD

@@ -1,10 +1,10 @@
 GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/anki.py,sha256=YSz5gUTsKOdbogwHKtgFM7v7pREjdAwl7A0Wa_CXnKg,10918
-GameSentenceMiner/config_gui.py,sha256=5qsYlPHxDABbBRHJjIWMRsiDPLFTmKNMVUnxQO9YLYc,52612
-GameSentenceMiner/configuration.py,sha256=qTXZnk0TMPKnSPSkRg4HpDXYFCXBkD43to31Uaf1NZs,15071
+GameSentenceMiner/config_gui.py,sha256=s0U0Sj_WvrJ8GecSyj33tWMh-OyOcZ5yY1ddEc1cgwg,53456
+GameSentenceMiner/configuration.py,sha256=_VxzRHCJPW2iJTW6gheD1d6-oaUbUQQnLsIiHjgjNcY,15186
 GameSentenceMiner/electron_messaging.py,sha256=fBk9Ipo0jg2OZwYaKe1Qsm05P2ftrdTRGgFYob7ZA-k,139
 GameSentenceMiner/ffmpeg.py,sha256=vkRvhsuXCL8-tGynobdLBnw4qNHUhTC33ITCCnjfZLM,11468
-GameSentenceMiner/gametext.py,sha256=VjWNdjHwWXWIwNOfYxud7EwIyg7t6zZ3IkmMhh8Vc0c,6819
+GameSentenceMiner/gametext.py,sha256=YXjaZF130lkzU-I2dpZ5HoNrj3GSCG-7X9B04IFnetI,7551
 GameSentenceMiner/gsm.py,sha256=E9Hpbyzrv8FEFGBs-4Hf60m3sk0ps3OQdvB1n42AhRU,20164
 GameSentenceMiner/model.py,sha256=oh8VVT8T1UKekbmP6MGNgQ8jIuQ_7Rg4GPzDCn2kJo8,1999
 GameSentenceMiner/notification.py,sha256=WBaQWoPNhW4XqdPBUmxPBgjk0ngzH_4v9zMQ-XQAKC8,2010
@@ -19,9 +19,9 @@ GameSentenceMiner/vad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 GameSentenceMiner/vad/silero_trim.py,sha256=syDJX_KbFmdyFFtnQqYTD0tICsUCJizYhs-atPgXtxA,1549
 GameSentenceMiner/vad/vosk_helper.py,sha256=HifeXKbEMrs81ZuuGxS67yAghu8TMXUP6Oan9i9dTxw,5938
 GameSentenceMiner/vad/whisper_helper.py,sha256=bpR1HVnJRn9H5u8XaHBqBJ6JwIjzqn-Fajps8QmQ4zc,3411
-gamesentenceminer-2.4.10.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.4.10.dist-info/METADATA,sha256=b2hnaSPPzfNT_WmHqWZouxpa0rHuqpB3h-D0eMcAMmc,5388
-gamesentenceminer-2.4.10.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-gamesentenceminer-2.4.10.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.4.10.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.4.10.dist-info/RECORD,,
+gamesentenceminer-2.4.12.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.4.12.dist-info/METADATA,sha256=fqK1YCT402ptWC4idyZaIqjbCQ38jGDAZGJCuVJ1TAE,5388
+gamesentenceminer-2.4.12.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+gamesentenceminer-2.4.12.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.4.12.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.4.12.dist-info/RECORD,,