GameSentenceMiner 2.7.3__py3-none-any.whl → 2.7.5__py3-none-any.whl

GameSentenceMiner/ocr/owocr_helper.py

@@ -148,15 +148,15 @@ class WebsocketServerThread(threading.Thread):
 all_cords = None
 rectangles = None
 
-def text_callback(text, rectangle):
+def text_callback(text, rectangle, time):
     global twopassocr, ocr2, last_oneocr_results
     if not text:
         return
     if not twopassocr or not ocr2:
-        websocket_server_thread.send_text(text, datetime.now())
+        websocket_server_thread.send_text(text, time if time else datetime.now())
         return
     with mss.mss() as sct:
-        line_time = datetime.now()
+        line_time = time if time else datetime.now()
         logger.info(f"Received message: {text}, ATTEMPTING LENS OCR")
         if rectangles:
             cords = rectangles[rectangle]

GameSentenceMiner/owocr/owocr/run.py

@@ -1,3 +1,4 @@
+import datetime
 import sys
 import signal
 import time
@@ -538,7 +539,7 @@ def are_images_identical(img1, img2):
     return (img1.shape == img2.shape) and (img1 == img2).all()
 
 
-def process_and_write_results(img_or_path, write_to, notifications, last_result, filtering, engine=None, rectangle=None):
+def process_and_write_results(img_or_path, write_to, notifications, last_result, filtering, engine=None, rectangle=None, time=None):
     global engine_index
     if auto_pause_handler:
         auto_pause_handler.stop()
@@ -570,7 +571,7 @@ def process_and_write_results(img_or_path, write_to, notifications, last_result,
         elif write_to == 'clipboard':
             pyperclipfix.copy(text)
         elif write_to == "callback":
-            txt_callback(text, rectangle)
+            txt_callback(text, rectangle, time)
         elif write_to:
             with Path(write_to).open('a', encoding='utf-8') as f:
                 f.write(text + '\n')
@@ -906,6 +907,7 @@ def run(read_from=None,
     logger.opt(ansi=True).info(f"Reading from {read_from_readable}, writing to {write_to_readable} using <{engine_color}>{engine_instances[engine_index].readable_name}</{engine_color}>{' (paused)' if paused else ''}")
 
     while not terminated and not stop_running_flag:
+        time = datetime.datetime.now()
         if read_from == 'websocket':
             while True:
                 try:
@@ -915,7 +917,7 @@ def run(read_from=None,
                 else:
                     if not paused:
                         img = Image.open(io.BytesIO(item))
-                        process_and_write_results(img, write_to, notifications, None, None)
+                        process_and_write_results(img, write_to, notifications, None, None, time=time)
         elif read_from == 'unixsocket':
             while True:
                 try:
@@ -925,7 +927,7 @@ def run(read_from=None,
                 else:
                     if not paused:
                         img = Image.open(io.BytesIO(item))
-                        process_and_write_results(img, write_to, notifications, None, None)
+                        process_and_write_results(img, write_to, notifications, None, None, time=time)
         elif read_from == 'clipboard':
             process_clipboard = False
             if windows_clipboard_polling:
@@ -973,7 +975,7 @@ def run(read_from=None,
                             process_clipboard = True
 
             if process_clipboard:
-                process_and_write_results(img, write_to, notifications, None, None)
+                process_and_write_results(img, write_to, notifications, None, None, time=time)
 
             just_unpaused = False
 
@@ -1052,7 +1054,7 @@ def run(read_from=None,
                         draw.rectangle((left, top, right, bottom), fill=(0, 0, 0, 0))
                         # draw.rectangle((left, top, right, bottom), fill=(0, 0, 0))
                 # img.save(os.path.join(get_temporary_directory(), 'screencapture.png'), 'png')
-                res, _ = process_and_write_results(img, write_to, notifications, last_result, filtering, rectangle=rectangle)
+                res, _ = process_and_write_results(img, write_to, notifications, last_result, filtering, rectangle=rectangle, time=time)
                 if res:
                     last_result = (res, engine_index)
                 delay = screen_capture_delay_secs
@@ -1075,7 +1077,7 @@ def run(read_from=None,
                             except (UnidentifiedImageError, OSError) as e:
                                 logger.warning(f'Error while reading file {path}: {e}')
                             else:
-                                process_and_write_results(img, write_to, notifications, None, None)
+                                process_and_write_results(img, write_to, notifications, None, None, time=time)
                                 img.close()
                                 if delete_images:
                                     Path.unlink(path)

{gamesentenceminer-2.7.3.dist-info → gamesentenceminer-2.7.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.7.3
+Version: 2.7.5
 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.3.dist-info → gamesentenceminer-2.7.5.dist-info}/RECORD

@@ -23,21 +23,21 @@ GameSentenceMiner/downloader/download_tools.py,sha256=mI1u_FGBmBqDIpCH3jOv8DOoZ3
 GameSentenceMiner/ocr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/ocr/ocrconfig.py,sha256=hTROOZ3On2HngXKxwQFZvnr5AxlmlMV0mPxv-F3NbMg,6476
 GameSentenceMiner/ocr/owocr_area_selector.py,sha256=6MQPCSAhuyOSEDEgc-w6jVdsELjxstzI2Zhz0JBkG8g,11703
-GameSentenceMiner/ocr/owocr_helper.py,sha256=e4WMFAl_tgE6AxofxghfrvisdZO3HmKa_3z-WmkdYYE,11798
+GameSentenceMiner/ocr/owocr_helper.py,sha256=yR_W_tK6w7c_zDj48d1B6-9f61fBD3PPnt_FSSPleLs,11840
 GameSentenceMiner/owocr/owocr/__init__.py,sha256=opjBOyGGyEqZCE6YdZPnyt7nVfiwyELHsXA0jAsjm14,25
 GameSentenceMiner/owocr/owocr/__main__.py,sha256=nkaZGTCZsPDKcej2O0S1SHkyzHJEboTUBc9izyGPvqw,92
 GameSentenceMiner/owocr/owocr/config.py,sha256=738QCJHEWpFhMh966plOcXYWwcshSiRsxjjIwldeTtI,7461
 GameSentenceMiner/owocr/owocr/lens_betterproto.py,sha256=oNoISsPilVVRBBPVDtb4-roJtAhp8ZAuFTci3TGXtMc,39141
 GameSentenceMiner/owocr/owocr/ocr.py,sha256=d0uLAQotZ6xhUSWWEXW07c0-EYjeTmumHxIEsT01Iuo,36604
-GameSentenceMiner/owocr/owocr/run.py,sha256=S-eb8wFC-LQLiibHVORTyTKTuPaOM2Uj6awoJxGyInQ,46549
+GameSentenceMiner/owocr/owocr/run.py,sha256=dkGNC5DtUN1jmon-m--f_nMJTuXHT6muKgM_7hXEAtA,46678
 GameSentenceMiner/owocr/owocr/screen_coordinate_picker.py,sha256=f_YIV4-2OEZ21CAEZ_pbqeTb5D28PS82Tig4ZSnkY4Q,3096
 GameSentenceMiner/vad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.7.3.dist-info/METADATA,sha256=18F6DexdMo-dYWQCtWl_caEy5vo2B7E5Lkfyq4JOdwA,5839
-gamesentenceminer-2.7.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-gamesentenceminer-2.7.3.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.7.3.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.7.3.dist-info/RECORD,,
+gamesentenceminer-2.7.5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.7.5.dist-info/METADATA,sha256=QiZcuM1aWuz5ZeJBKZtVoxpzFkm8C3aaEEqWy8fztqM,5839
+gamesentenceminer-2.7.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+gamesentenceminer-2.7.5.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.7.5.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.7.5.dist-info/RECORD,,