GameSentenceMiner 2.14.0rc1__tar.gz → 2.14.1__tar.gz

{gamesentenceminer-2.14.0rc1 → gamesentenceminer-2.14.1}/GameSentenceMiner/obs.py

@@ -461,11 +461,12 @@ if __name__ == '__main__':
     from mss import mss
     logging.basicConfig(level=logging.INFO)
     # main()
-    connect_to_obs_sync()
-    
-    while True:
-        print(get_active_source())
-        time.sleep(3)
+    # connect_to_obs_sync()
+    # img = get_screenshot_PIL(source_name="Display Capture 2", compression=75, img_format='png', width=1280, height=720)
+    # img.show()
+    # while True:
+    #     print(get_active_source())
+    #     time.sleep(3)
     # i = 100
     # for i in range(1, 100):
     #     print(f"Getting screenshot {i}")

{gamesentenceminer-2.14.0rc1 → gamesentenceminer-2.14.1}/GameSentenceMiner/owocr/owocr/ocr.py

@@ -280,7 +280,10 @@ class GoogleLens:
             logger.info('Google Lens ready')
 
     def __call__(self, img, furigana_filter_sensitivity=0, return_coords=False):
-        furigana_filter_sensitivity = get_furigana_filter_sensitivity()
+        if furigana_filter_sensitivity != None:
+            furigana_filter_sensitivity = get_furigana_filter_sensitivity()
+        else:
+            furigana_filter_sensitivity = 0
         lang = get_ocr_language()
         img, is_path = input_to_pil_image(img)
         if lang != self.initial_lang:
@@ -863,6 +866,8 @@ class OneOCR:
                 logger.warning('OneOCR is not supported on Windows older than 10!')
             elif 'oneocr' not in sys.modules:
                 logger.warning('oneocr not available, OneOCR will not work!')
+            elif not os.path.exists(os.path.expanduser('~/.config/oneocr/oneocr.dll')):
+                logger.warning('OneOCR DLLs not found, please install OwOCR Dependencies via OCR Tab in GSM.')
             else:
                 try:
                     self.model = oneocr.OcrEngine()
@@ -902,7 +907,10 @@ class OneOCR:
 
     def __call__(self, img, furigana_filter_sensitivity=0, return_coords=False, multiple_crop_coords=False, return_one_box=True):
         lang = get_ocr_language()
-        furigana_filter_sensitivity = get_furigana_filter_sensitivity()
+        if furigana_filter_sensitivity != None:
+            furigana_filter_sensitivity = get_furigana_filter_sensitivity()
+        else:
+            furigana_filter_sensitivity = 0
         if lang != self.initial_lang:
             self.initial_lang = lang
             self.regex = get_regex(lang)

{gamesentenceminer-2.14.0rc1 → gamesentenceminer-2.14.1}/GameSentenceMiner/util/get_overlay_coords.py

@@ -132,33 +132,40 @@ class OverlayProcessor:
         if not full_screenshot:
             logger.warning("Failed to get a screenshot.")
             return []
+        if self.oneocr:
+            # 2. Use OneOCR to find general text areas (fast)
+            _, _, oneocr_results, crop_coords_list = self.oneocr(
+                full_screenshot,
+                return_coords=True,
+                multiple_crop_coords=True,
+                return_one_box=False,
+                furigana_filter_sensitivity=None # Disable furigana filtering
+            )
 
-        # 2. Use OneOCR to find general text areas (fast)
-        _, _, _, crop_coords_list = self.oneocr(
-            full_screenshot,
-            return_coords=True,
-            multiple_crop_coords=True,
-            return_one_box=False,
-            furigana_filter_sensitivity=0
-        )
-
-        # 3. Create a composite image with only the detected text regions
-        composite_image = self._create_composite_image(
-            full_screenshot, 
-            crop_coords_list, 
-            monitor_width, 
-            monitor_height
-        )
+            # 3. Create a composite image with only the detected text regions
+            composite_image = self._create_composite_image(
+                full_screenshot, 
+                crop_coords_list, 
+                monitor_width, 
+                monitor_height
+            )
+        else:
+            composite_image = full_screenshot
         
         # 4. Use Google Lens on the cleaner composite image for higher accuracy
-        res, text, coords = self.lens(
+        res = self.lens(
             composite_image,
             return_coords=True,
-            furigana_filter_sensitivity=0
+            furigana_filter_sensitivity=None # Disable furigana filtering
         )
         
+        if len(res) != 3:
+            return oneocr_results
+        
+        _, _, coords = res
+
         if not res or not coords:
-            return []
+            return oneocr_results
         
         # 5. Process the high-accuracy results into the desired format
         extracted_data = self._extract_text_with_pixel_boxes(

{gamesentenceminer-2.14.0rc1 → gamesentenceminer-2.14.1}/GameSentenceMiner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.14.0rc1
+Version: 2.14.1
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.14.0rc1 → gamesentenceminer-2.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.14.0rc1
+Version: 2.14.1
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.14.0rc1 → gamesentenceminer-2.14.1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GameSentenceMiner"
-version = "2.14.0.pre1"
+version = "2.14.1"
 description = "A tool for mining sentences from games. Update: Overlay?"
 readme = "README.md"
 requires-python = ">=3.10"