GameSentenceMiner 2.10.13__py3-none-any.whl → 2.10.14__py3-none-any.whl

GameSentenceMiner/obs.py

@@ -135,7 +135,7 @@ def get_obs_websocket_config_values():
         full_config.save()
         reload_config()
 
-async def connect_to_obs(retry_count=0):
+async def connect_to_obs(retry=5):
     global client, obs_connection_manager, event_client, connecting
     if not get_config().obs.enabled:
         return
@@ -166,11 +166,18 @@ async def connect_to_obs(retry_count=0):
             update_current_game()
             break  # Exit the loop once connected
         except Exception as e:
+            if retry <= 0:
+                gsm_status.obs_connected = False
+                logger.error(f"Failed to connect to OBS WebSocket: {e}")
+                client = None
+                event_client = None
+                connecting = False
+                break
             await asyncio.sleep(1)
-            retry_count += 1
+            retry -= 1
     connecting = False
 
-def connect_to_obs_sync(retry_count=0):
+def connect_to_obs_sync(retry=2):
     global client, obs_connection_manager, event_client
     if not get_config().obs.enabled or client:
         return
@@ -198,8 +205,15 @@ def connect_to_obs_sync(retry_count=0):
             update_current_game()
             break  # Exit the loop once connected
         except Exception as e:
+            if retry <= 0:
+                gsm_status.obs_connected = False
+                logger.error(f"Failed to connect to OBS WebSocket: {e}")
+                client = None
+                event_client = None
+                connecting = False
+                break
             time.sleep(1)
-            retry_count += 1
+            retry -= 1
 
 
 def disconnect_from_obs():

GameSentenceMiner/ocr/owocr_area_selector.py

@@ -34,7 +34,7 @@ COORD_SYSTEM_PERCENTAGE = "percentage"
 
 
 class ScreenSelector:
-    def __init__(self, result, window_name):
+    def __init__(self, result, window_name, use_window_as_config):
         if not selector_available or not gw:
             raise RuntimeError("tkinter or pygetwindow is not available.")
         if not window_name:
@@ -60,6 +60,8 @@ class ScreenSelector:
         # ---
 
         self.root = None
+        self.scene = ''
+        self.use_window_as_config = use_window_as_config
         self.result = result
         self.rectangles = []  # Internal storage is ALWAYS absolute pixels for drawing
         self.drawn_rect_ids = []
@@ -94,11 +96,14 @@ class ScreenSelector:
         ocr_config_dir = app_dir / "ocr_config"
         ocr_config_dir.mkdir(parents=True, exist_ok=True)
         try:
-            scene = sanitize_filename(obs.get_current_scene() or "default_scene")
+            if self.use_window_as_config:
+                self.scene = sanitize_filename(self.window_name)
+            else:
+                self.scene = sanitize_filename(obs.get_current_scene() or "")
         except Exception as e:
             print(f"Error getting OBS scene: {e}. Using default config name.")
-            scene = "default_scene"
-        return ocr_config_dir / f"{scene}.json"
+            self.scene = ""
+        return ocr_config_dir / f"{self.scene}.json"
 
     def load_existing_rectangles(self):
         """Loads rectangles from config, converting from percentage to absolute pixels for use."""
@@ -170,7 +175,7 @@ class ScreenSelector:
             })
 
         save_data = {
-            "scene": obs.get_current_scene() or "default_scene",
+            "scene": self.scene or "",
             "window": self.window_name,
             "coordinate_system": COORD_SYSTEM_PERCENTAGE,  # Always save as percentage
             "window_geometry": win_geom,  # Save the geometry used for conversion
@@ -397,9 +402,9 @@ class ScreenSelector:
         self.root = None
 
 
-def run_screen_selector(result_dict, window_name):
+def run_screen_selector(result_dict, window_name, use_window_as_config):
     try:
-        selector = ScreenSelector(result_dict, window_name)
+        selector = ScreenSelector(result_dict, window_name, use_window_as_config)
         selector.start()
     except Exception as e:
         print(f"Error in selector process: {e}", file=sys.stderr)
@@ -408,7 +413,7 @@ def run_screen_selector(result_dict, window_name):
         result_dict['error'] = str(e)
 
 
-def get_screen_selection(window_name):
+def get_screen_selection(window_name, use_window_as_config=False):
     if not selector_available or not gw: return None
     if not window_name:
         print("Error: A target window name must be provided.", file=sys.stderr)
@@ -416,7 +421,7 @@ def get_screen_selection(window_name):
 
     with Manager() as manager:
         result_data = manager.dict()
-        process = Process(target=run_screen_selector, args=(result_data, window_name))
+        process = Process(target=run_screen_selector, args=(result_data, window_name, use_window_as_config))
         print(f"Starting ScreenSelector process...")
         process.start()
         process.join()
@@ -434,11 +439,15 @@ def get_screen_selection(window_name):
 
 if __name__ == "__main__":
     set_dpi_awareness()
-    target_window_title = "Windowed Projector (Preview)"  # Default
+    target_window_title = "YouTube - JP"
+    use_window_as_config = False
     if len(sys.argv) > 1:
         target_window_title = sys.argv[1]
+    if len(sys.argv) > 2:
+        use_window_as_config = True
+        target_window_title = sys.argv[1]
 
-    selection_result = get_screen_selection(target_window_title)
+    selection_result = get_screen_selection(target_window_title, use_window_as_config)
 
     if selection_result is None:
         print("\n--- Screen selection failed. ---")

GameSentenceMiner/ocr/owocr_helper.py

@@ -47,13 +47,16 @@ console_handler.setFormatter(formatter)
 logger.addHandler(console_handler)
 
 
-def get_ocr_config(window=None) -> OCRConfig:
+def get_ocr_config(window=None, use_window_for_config=False) -> OCRConfig:
     """Loads and updates screen capture areas from the corresponding JSON file."""
     app_dir = Path.home() / "AppData" / "Roaming" / "GameSentenceMiner"
     ocr_config_dir = app_dir / "ocr_config"
     os.makedirs(ocr_config_dir, exist_ok=True)
-    obs.connect_to_obs_sync()
-    scene = sanitize_filename(obs.get_current_scene())
+    obs.connect_to_obs_sync(retry=0)
+    if use_window_for_config and window:
+        scene = sanitize_filename(window)
+    else:
+        scene = sanitize_filename(obs.get_current_scene())
     config_path = ocr_config_dir / f"{scene}.json"
     if not config_path.exists():
         ocr_config = OCRConfig(scene=scene, window=window, rectangles=[], coordinate_system="percentage")
@@ -401,7 +404,7 @@ def set_force_stable_hotkey():
 
 if __name__ == "__main__":
     try:
-        global ocr1, ocr2, twopassocr, language, ss_clipboard, ss, ocr_config, furigana_filter_sensitivity, area_select_ocr_hotkey, window, optimize_second_scan
+        global ocr1, ocr2, twopassocr, language, ss_clipboard, ss, ocr_config, furigana_filter_sensitivity, area_select_ocr_hotkey, window, optimize_second_scan, use_window_for_config
         import sys
 
         import argparse
@@ -423,6 +426,8 @@ if __name__ == "__main__":
                             help="Hotkey for area selection OCR (default: ctrl+shift+o)")
         parser.add_argument("--optimize_second_scan", action="store_true",
                             help="Optimize second scan by cropping based on first scan results")
+        parser.add_argument("--use_window_for_config", action="store_true",
+                            help="Use the specified window for loading OCR configuration")
 
         args = parser.parse_args()
 
@@ -440,11 +445,12 @@ if __name__ == "__main__":
             "alt", "<alt>") if args.manual_ocr_hotkey else None
         clipboard_output = args.clipboard_output
         optimize_second_scan = args.optimize_second_scan
+        use_window_for_config = args.use_window_for_config
 
         window = None
         logger.info(f"Received arguments: {vars(args)}")
         # set_force_stable_hotkey()
-        ocr_config: OCRConfig = get_ocr_config(window=window_name)
+        ocr_config: OCRConfig = get_ocr_config(window=window_name, use_window_for_config=use_window_for_config)
         if ocr_config:
             if ocr_config.window:
                 start_time = time.time()

{gamesentenceminer-2.10.13.dist-info → gamesentenceminer-2.10.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.10.13
+Version: 2.10.14
 Summary: A tool for mining sentences from games. Update: Full UI Re-design
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.10.13.dist-info → gamesentenceminer-2.10.14.dist-info}/RECORD

@@ -3,7 +3,7 @@ GameSentenceMiner/anki.py,sha256=kWw3PV_Jj5-lHcttCB3lRXejHlaAbiJ2Ag_NAGX-RI8,166
 GameSentenceMiner/config_gui.py,sha256=Xa_a-sdQzht3kzR-Z9gkLy4qnaPyP1bdVadYTHp5lUQ,91018
 GameSentenceMiner/gametext.py,sha256=6VkjmBeiuZfPk8T6PHFdIAElBH2Y_oLVYvmcafqN7RM,6747
 GameSentenceMiner/gsm.py,sha256=p4DVa_Jx1EOsgUxAAdC7st7VXLKWnP2BLDGT78ToO8w,24864
-GameSentenceMiner/obs.py,sha256=ZV9Vk39hrsJLT-AlIxa3qgncKxXaL3Myl33vVJEDEoA,14670
+GameSentenceMiner/obs.py,sha256=o_I6213VZvXqYkZDdUBgUg2KWi9SbnNZZjjUnKnQkK4,15190
 GameSentenceMiner/vad.py,sha256=G0NkaWFJaIfKQAV7LOFxyKoih7pPNYHDuy4SzeFVCkI,16389
 GameSentenceMiner/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/ai/ai_prompting.py,sha256=0jBAnngNwmc3dqJiVWe_QRy4Syr-muV-ML2rq0FiUtU,10215
@@ -18,8 +18,8 @@ GameSentenceMiner/assets/pickaxe.png,sha256=VfIGyXyIZdzEnVcc4PmG3wszPMO1W4KCT7Q_
 GameSentenceMiner/ocr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/ocr/gsm_ocr_config.py,sha256=jtTzAWtMAx8GuA1XIJ_BmyNn3aYaO3u_c5Q7m5D4gS8,4056
 GameSentenceMiner/ocr/ocrconfig.py,sha256=_tY8mjnzHMJrLS8E5pHqYXZjMuLoGKYgJwdhYgN-ny4,6466
-GameSentenceMiner/ocr/owocr_area_selector.py,sha256=boAqarX17jvFscu-7s6C9rqesjQ54s-kfuW0bjCru-M,19834
-GameSentenceMiner/ocr/owocr_helper.py,sha256=VDcuBfyZ1B7TN6yImJVuNxqWY7pr95R2cRM9jgD5Rk8,21670
+GameSentenceMiner/ocr/owocr_area_selector.py,sha256=lHMVZuEE_-_wICfDr6jDJNSJIyZd2PnF7dIajknaHCU,20255
+GameSentenceMiner/ocr/owocr_helper.py,sha256=Iidu2T6z-eewFC40t3jUlLukankVsQB_HUEhr1L7HCU,22097
 GameSentenceMiner/ocr/ss_picker.py,sha256=0IhxUdaKruFpZyBL-8SpxWg7bPrlGpy3lhTcMMZ5rwo,5224
 GameSentenceMiner/owocr/owocr/__init__.py,sha256=87hfN5u_PbL_onLfMACbc0F5j4KyIK9lKnRCj6oZgR0,49
 GameSentenceMiner/owocr/owocr/__main__.py,sha256=XQaqZY99EKoCpU-gWQjNbTs7Kg17HvBVE7JY8LqIE0o,157
@@ -62,9 +62,9 @@ GameSentenceMiner/web/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 GameSentenceMiner/web/templates/index.html,sha256=n0J-dV8eksj8JXUuaCTIh0fIxIjfgm2EvxGBdQ6gWoM,214113
 GameSentenceMiner/web/templates/text_replacements.html,sha256=tV5c8mCaWSt_vKuUpbdbLAzXZ3ATZeDvQ9PnnAfqY0M,8598
 GameSentenceMiner/web/templates/utility.html,sha256=3flZinKNqUJ7pvrZk6xu__v67z44rXnaK7UTZ303R-8,16946
-gamesentenceminer-2.10.13.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.10.13.dist-info/METADATA,sha256=Uyvm-m_g2V68e571HG8RBqOfbZJmWqAfXlTOM4HuEYg,7355
-gamesentenceminer-2.10.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gamesentenceminer-2.10.13.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.10.13.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.10.13.dist-info/RECORD,,
+gamesentenceminer-2.10.14.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.10.14.dist-info/METADATA,sha256=vnV_Sx7Xcs1DLFjkW4iKpwPNPf_ZFt83yVj7FSYtxAU,7355
+gamesentenceminer-2.10.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gamesentenceminer-2.10.14.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.10.14.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.10.14.dist-info/RECORD,,