GameSentenceMiner 2.7.11__py3-none-any.whl → 2.7.13__py3-none-any.whl

GameSentenceMiner/ocr/owocr_helper.py

@@ -126,8 +126,6 @@ def get_ocr_config() -> OCRConfig:
             return OCRConfig.from_dict(new_config_data)
         elif "rectangles" in config_data and isinstance(config_data["rectangles"], list) and all(
                 isinstance(item, dict) and "coordinates" in item for item in config_data["rectangles"]):
-            logger.info("Loading new OCR config format.")
-            logger.info(config_data)
             return OCRConfig.from_dict(config_data)
         else:
             raise Exception(f"Invalid config format in {config_path}.")
@@ -210,11 +208,6 @@ rectangles = None
 def do_second_ocr(ocr1_text, rectangle_index, time, img):
     global twopassocr, ocr2, last_ocr1_results, last_ocr2_results
     last_result = ([], -1)
-
-    previous_ocr1_text = last_ocr1_results[rectangle_index]
-    if fuzz.ratio(previous_ocr1_text, ocr1_text) >= 80:
-        logger.info("Seems like the same text, not doing 2nd pass")
-    last_ocr1_results[rectangle_index] = ocr1_text
     try:
         orig_text, text = run.process_and_write_results(img, None, None, last_result, TextFiltering(),
                                                         engine=ocr2)
@@ -222,6 +215,7 @@ def do_second_ocr(ocr1_text, rectangle_index, time, img):
         if fuzz.ratio(previous_ocr2_text, text) >= 80:
             logger.info("Seems like the same text from previous ocr2 result, not sending")
             return
+        img.save(os.path.join(get_app_directory(), "temp", "last_successful_ocr.png"))
         last_ocr2_results[rectangle_index] = text
         if get_config().advanced.ocr_sends_to_clipboard:
             import pyperclip
@@ -244,7 +238,7 @@ def text_callback(text, rectangle_index, time, img=None):
 
     current_time = time if time else datetime.now()
 
-    previous_text = last_oneocr_results_to_check.get(rectangle_index, "")
+    previous_text = last_oneocr_results_to_check.get(rectangle_index, "").strip()
 
     if not text:
         if previous_text:
@@ -253,15 +247,19 @@ def text_callback(text, rectangle_index, time, img=None):
                 if twopassocr:
                     do_second_ocr(previous_text, rectangle_index, time, img)
                 else:
-                    previous_text = last_ocr1_results[rectangle_index]
-                    if fuzz.ratio(previous_text, text) >= 80:
+                    previous_result = last_ocr1_results[rectangle_index]
+                    if previous_result and fuzz.ratio(previous_result, previous_text) >= 80:
                         logger.info("Seems like the same text, not sending")
+                        return
                     if get_config().advanced.ocr_sends_to_clipboard:
                         import pyperclip
                         pyperclip.copy(text)
                     websocket_server_thread.send_text(previous_text, stable_time)
+                    img.save(os.path.join(get_app_directory(), "temp", "last_successful_ocr.png"))
+                    last_ocr1_results[rectangle_index] = previous_text
                 del text_stable_start_times[rectangle_index]
             del last_oneocr_results_to_check[rectangle_index]
+            return
         return
 
     if rectangle_index not in last_oneocr_results_to_check:
@@ -285,13 +283,13 @@ def text_callback(text, rectangle_index, time, img=None):
 done = False
 
 
-def run_oneocr(ocr_config: OCRConfig, i):
+def run_oneocr(ocr_config: OCRConfig, i, area=False):
     global done
     rect_config = ocr_config.rectangles[i]
     coords = rect_config.coordinates
     monitor_config = rect_config.monitor
-    exclusions = (rect.coordinates for rect in list(filter(lambda x: x.is_excluded, ocr_config.rectangles)))
-    screen_area = ",".join(str(c) for c in coords)
+    exclusions = list(rect.coordinates for rect in list(filter(lambda x: x.is_excluded, ocr_config.rectangles)))
+    screen_area = ",".join(str(c) for c in coords) if area else None
     run.run(read_from="screencapture", write_to="callback",
             screen_capture_area=screen_area,
             # screen_capture_monitor=monitor_config['index'],
@@ -328,19 +326,21 @@ if __name__ == "__main__":
     logger.info(f"Received arguments: ocr1={ocr1}, ocr2={ocr2}, twopassocr={twopassocr}")
     global ocr_config
     ocr_config: OCRConfig = get_ocr_config()
+
+    logger.info(f"Starting OCR with configuration: Window: {ocr_config.window}, Rectangles: {len(ocr_config.rectangles)}, Engine 1: {ocr1}, Engine 2: {ocr2}, Two-pass OCR: {twopassocr}")
     if ocr_config and ocr_config.rectangles:
-        rectangles = ocr_config.rectangles
+        rectangles = list(filter(lambda rect: not rect.is_excluded, ocr_config.rectangles))
         last_ocr1_results = [""] * len(rectangles) if rectangles else [""]
         last_ocr2_results = [""] * len(rectangles) if rectangles else [""]
         oneocr_threads = []
         run.init_config(False)
         if rectangles:
             for i, rectangle in enumerate(rectangles):
-                thread = threading.Thread(target=run_oneocr, args=(ocr_config, i,), daemon=True)
+                thread = threading.Thread(target=run_oneocr, args=(ocr_config, i,True, ), daemon=True)
                 oneocr_threads.append(thread)
                 thread.start()
         else:
-            single_ocr_thread = threading.Thread(target=run_oneocr, args=(ocr_config, 0,), daemon=True)
+            single_ocr_thread = threading.Thread(target=run_oneocr, args=(ocr_config, 0,False, ), daemon=True)
             oneocr_threads.append(single_ocr_thread)
             single_ocr_thread.start()
         websocket_server_thread = WebsocketServerThread(read=True)

{gamesentenceminer-2.7.11.dist-info → gamesentenceminer-2.7.13.dist-info}/METADATA

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

{gamesentenceminer-2.7.11.dist-info → gamesentenceminer-2.7.13.dist-info}/RECORD

@@ -1,5 +1,5 @@
 GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/anki.py,sha256=9E9GRR2zylW3Gp4PNlwYS_Nn-mhojZkjFqfYlTazte8,14068
+GameSentenceMiner/anki.py,sha256=X16RG3qXUogyKwdc_T5Dugq2J4gaslpgnKbZKoggAxc,14198
 GameSentenceMiner/config_gui.py,sha256=-1PanqdtTKiwItxeyt0piXrWo7lGMWwrC4iSo4NiPz4,67521
 GameSentenceMiner/configuration.py,sha256=TGDgI93J0jVYRlV6rXXnoRFJXaWQ3_o4_OTcXUZHrZw,20405
 GameSentenceMiner/electron_config.py,sha256=dGcPYCISPehXubYSzsDuI2Gl092MYK0u3bTnkL9Jh1Y,9787
@@ -8,7 +8,7 @@ GameSentenceMiner/gametext.py,sha256=AAke4swwmN16da0IpyL5xMhU23nTz_c6z2kMfXPYv-8
 GameSentenceMiner/gsm.py,sha256=dT9MsD_uOSFdZxi50EBsfpaqOJys36T2yzBrCeakn9E,24690
 GameSentenceMiner/model.py,sha256=JdnkT4VoPOXmOpRgFdvERZ09c9wLN6tUJxdrKlGZcqo,5305
 GameSentenceMiner/notification.py,sha256=FY39ChSRK0Y8TQ6lBGsLnpZUFPtFpSy2tweeXVoV7kc,2809
-GameSentenceMiner/obs.py,sha256=3h1hh868zdXQFGXJ7_mQZs5kcudEMa3yBOrbCVckhCs,9139
+GameSentenceMiner/obs.py,sha256=UuMGhiD1sinEjM2JGdLLeQAXTifYPrcNy-78Ta316ds,9022
 GameSentenceMiner/package.py,sha256=YlS6QRMuVlm6mdXx0rlXv9_3erTGS21jaP3PNNWfAH0,1250
 GameSentenceMiner/util.py,sha256=W49gqYlhbzZe-17zHMFcAjNeeteXrv_USHT7aBDKSqM,6825
 GameSentenceMiner/utility_gui.py,sha256=JcNjk9Wrz_Au7P4ITslSBqXBU-o6nA2sc2vJvglAk4o,7432
@@ -21,10 +21,10 @@ GameSentenceMiner/downloader/Untitled_json.py,sha256=RUUl2bbbCpUDUUS0fP0tdvf5Fng
 GameSentenceMiner/downloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/downloader/download_tools.py,sha256=mI1u_FGBmBqDIpCH3jOv8DOoZ3obgP5pIf9o9SVfX2Q,8131
 GameSentenceMiner/ocr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/ocr/gsm_ocr_config.py,sha256=FZ3CCgtpVawJ2mq3EP0KheJjYte5PlyOO1VnGND-__Y,467
+GameSentenceMiner/ocr/gsm_ocr_config.py,sha256=zagsB4UD9mmZX_r6dFBCXZqdDa0XGk-RvIqbKoPB9lQ,1932
 GameSentenceMiner/ocr/ocrconfig.py,sha256=hTROOZ3On2HngXKxwQFZvnr5AxlmlMV0mPxv-F3NbMg,6476
-GameSentenceMiner/ocr/owocr_area_selector.py,sha256=MggSnJSUQhs7SD6YTKRNnVhEZEliLgaUTOPkBUCjAss,11952
-GameSentenceMiner/ocr/owocr_helper.py,sha256=RMoGmmD9ECR_sFxWl-kxRPiYaNOk8SJVPSwhDBIkS-4,14825
+GameSentenceMiner/ocr/owocr_area_selector.py,sha256=bCgusYXe9ibCsf56PlU301aNfDA2PDKasi78ox0IGbk,46856
+GameSentenceMiner/ocr/owocr_helper.py,sha256=Rd1wcVtJy0N6ySn1p7-08hLYA9iPkts12zGJESoEewI,15126
 GameSentenceMiner/owocr/owocr/__init__.py,sha256=opjBOyGGyEqZCE6YdZPnyt7nVfiwyELHsXA0jAsjm14,25
 GameSentenceMiner/owocr/owocr/__main__.py,sha256=r8MI6RAmbkTWqOJ59uvXoDS7CSw5jX5war9ULGWELrA,128
 GameSentenceMiner/owocr/owocr/config.py,sha256=738QCJHEWpFhMh966plOcXYWwcshSiRsxjjIwldeTtI,7461
@@ -36,9 +36,9 @@ GameSentenceMiner/vad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 GameSentenceMiner/vad/silero_trim.py,sha256=ULf3zwS-JMsY82cKF7gZxREHw8L6lgpWF2U1YqgE9Oc,1681
 GameSentenceMiner/vad/vosk_helper.py,sha256=125X8C9NxFPlWWpoNsbOnEqKx8RCjXN109zNx_QXhyg,6070
 GameSentenceMiner/vad/whisper_helper.py,sha256=JJ-iltCh813XdjyEw0Wn5DaErf6PDqfH0Efu1Md8cIY,3543
-gamesentenceminer-2.7.11.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.7.11.dist-info/METADATA,sha256=HKYJ4gjLwMKl43qNewCIV1-ykumK2lYIjgPbl-KhPAQ,5840
-gamesentenceminer-2.7.11.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-gamesentenceminer-2.7.11.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.7.11.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.7.11.dist-info/RECORD,,
+gamesentenceminer-2.7.13.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.7.13.dist-info/METADATA,sha256=O0-SbnS2VsaCS9Erd-r0ufjQqly71axdeILxm4k61LE,5840
+gamesentenceminer-2.7.13.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+gamesentenceminer-2.7.13.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.7.13.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.7.13.dist-info/RECORD,,