GameSentenceMiner 2.12.4__tar.gz → 2.12.6__tar.gz

{gamesentenceminer-2.12.4 → gamesentenceminer-2.12.6}/GameSentenceMiner/ocr/owocr_helper.py

@@ -194,19 +194,21 @@ def compare_ocr_results(prev_text, new_text, threshold=90):
 all_cords = None
 rectangles = None
 last_ocr2_result = []
+last_sent_result = ""
 
 def do_second_ocr(ocr1_text, time, img, filtering, pre_crop_image=None, ignore_furigana_filter=False, ignore_previous_result=False):
-    global twopassocr, ocr2, last_ocr2_result
+    global twopassocr, ocr2, last_ocr2_result, last_sent_result
     try:
         orig_text, text = run.process_and_write_results(img, None, last_ocr2_result if not ignore_previous_result else None, filtering, None,
                                                         engine=get_ocr_ocr2(), furigana_filter_sensitivity=furigana_filter_sensitivity if not ignore_furigana_filter else 0)
 
-        if compare_ocr_results(last_ocr2_result, orig_text):
+        if compare_ocr_results(last_sent_result, text, threshold=80):
             if text:
                 logger.info("Seems like Text we already sent, not doing anything.")
             return
         save_result_image(img, pre_crop_image=pre_crop_image)
         last_ocr2_result = orig_text
+        last_sent_result = text
         asyncio.run(send_result(text, time))
     except json.JSONDecodeError:
         print("Invalid JSON received.")
@@ -291,7 +293,7 @@ def reset_callback_vars():
     run.set_last_image(None)
 
 def text_callback(text, orig_text, time, img=None, came_from_ss=False, filtering=None, crop_coords=None):
-    global twopassocr, ocr2, previous_text, last_oneocr_time, text_stable_start_time, previous_orig_text, previous_img, force_stable, previous_ocr1_result, previous_text_list
+    global twopassocr, ocr2, previous_text, last_oneocr_time, text_stable_start_time, previous_orig_text, previous_img, force_stable, previous_ocr1_result, previous_text_list, last_sent_result
     orig_text_string = ''.join([item for item in orig_text if item is not None]) if orig_text else ""
     if came_from_ss:
         save_result_image(img)
@@ -304,12 +306,13 @@ def text_callback(text, orig_text, time, img=None, came_from_ss=False, filtering
     line_start_time = time if time else datetime.now()
 
     if manual or not get_ocr_two_pass_ocr():
-        if compare_ocr_results(previous_orig_text, orig_text_string):
+        if compare_ocr_results(last_sent_result, text, 80):
             if text:
                 logger.info("Seems like Text we already sent, not doing anything.")
             return
         save_result_image(img)
         asyncio.run(send_result(text, line_start_time))
+        last_sent_result = text
         previous_orig_text = orig_text_string
         previous_text = None
         previous_img = None

{gamesentenceminer-2.12.4 → gamesentenceminer-2.12.6}/GameSentenceMiner/owocr/owocr/run.py

@@ -856,6 +856,9 @@ class OBSScreenshotThread(threading.Thread):
             self.current_source_name = self.current_source.get("sourceName") or None
             self.current_scene = scene if scene else obs.get_current_game()
             self.ocr_config = get_scene_ocr_config()
+            if not self.ocr_config:
+                logger.error("No OCR config found for the current scene.")
+                return
             self.ocr_config.scale_to_custom_size(self.width, self.height)
 
         # Register a scene switch callback in obsws
@@ -883,6 +886,7 @@ class OBSScreenshotThread(threading.Thread):
                 continue
 
             if not self.ocr_config:
+                logger.info("No OCR config found for the current scene. Waiting for scene switch.")
                 time.sleep(1)
                 continue
             
@@ -896,7 +900,7 @@ class OBSScreenshotThread(threading.Thread):
                     logger.error("No active source found in the current scene.")
                     time.sleep(1)
                     continue
-                img = obs.get_screenshot_PIL(source_name=self.current_source_name, width=self.width, height=self.height, img_format='jpg', compression=90)
+                img = obs.get_screenshot_PIL(source_name=self.current_source_name, width=self.width, height=self.height, img_format='png', compression=80)
 
                 if img is not None:
                     if not img.getbbox():

{gamesentenceminer-2.12.4 → gamesentenceminer-2.12.6}/GameSentenceMiner/wip/get_overlay_coords.py

@@ -314,7 +314,7 @@ async def get_full_screenshot() -> Image.Image | None:
             else:
                 monitors = [monitors[0]]
             monitor = monitors[get_config().wip.monitor_to_capture]
-            img = get_screenshot_PIL(compression=100, img_format='jpg')
+            img = get_screenshot_PIL(compression=90, img_format='jpg')
             # Put the image over a transparent background without stretching
             new_img = Image.new("RGBA", (monitor['width'], monitor['height']), (0, 0, 0, 0))
             # Calculate coordinates to center img horizontally and vertically

{gamesentenceminer-2.12.4 → gamesentenceminer-2.12.6}/GameSentenceMiner.egg-info/PKG-INFO

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

{gamesentenceminer-2.12.4 → gamesentenceminer-2.12.6}/PKG-INFO

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

{gamesentenceminer-2.12.4 → gamesentenceminer-2.12.6}/pyproject.toml

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