GameSentenceMiner 2.8.30__py3-none-any.whl → 2.8.33__py3-none-any.whl

GameSentenceMiner/anki.py

@@ -45,14 +45,7 @@ def update_anki_card(last_note: AnkiCard, note=None, audio_path='', video_path='
             if get_config().paths.remove_screenshot:
                 os.remove(screenshot)
         if get_config().anki.previous_image_field:
-            if prev_ss_timing != 0:
-                try:
-                    prev_screenshot = ffmpeg.get_screenshot(video_path, prev_ss_timing)
-                except Exception as e:
-                    logger.error(f"Error getting previous screenshot based on VAD, Falling back to previous logic: {e}")
-                    prev_screenshot = ffmpeg.get_screenshot(video_path, ffmpeg.get_screenshot_time(video_path, selected_lines[0].prev if selected_lines else game_line.prev))
-            else:
-                prev_screenshot = ffmpeg.get_screenshot(video_path, ffmpeg.get_screenshot_time(video_path, selected_lines[0].prev if selected_lines else game_line.prev))
+            prev_screenshot = ffmpeg.get_screenshot_for_line(video_path, selected_lines[0].prev if selected_lines else game_line.prev)
             prev_screenshot_in_anki = store_media_file(prev_screenshot)
             if get_config().paths.remove_screenshot:
                 os.remove(prev_screenshot)

GameSentenceMiner/config_gui.py

@@ -777,7 +777,7 @@ class ConfigApp:
         self.seconds_after_line = ttk.Entry(screenshot_frame)
         self.seconds_after_line.insert(0, str(self.settings.screenshot.seconds_after_line))
         self.seconds_after_line.grid(row=self.current_row, column=1)
-        self.add_label_and_increment_row(screenshot_frame, "Time in seconds to offset the screenshot based on the Timing setting above (should almost always be positive)", row=self.current_row,
+        self.add_label_and_increment_row(screenshot_frame, "Time in seconds to offset the screenshot based on the Timing setting above (should almost always be positive, can be negative if you use \"middle\")", row=self.current_row,
                                          column=2)
 
         # ttk.Label(screenshot_frame, text="Use Beginning of Line as Screenshot:").grid(row=self.current_row, column=0, sticky='W')

GameSentenceMiner/ffmpeg.py

@@ -70,10 +70,10 @@ def get_screenshot_time(video_path, game_line, default_beginning=False, vad_resu
     screenshot_offset = get_config().screenshot.seconds_after_line
 
     # Calculate screenshot time from the beginning by adding the offset
-    if vad_result and vad_result.success and not doing_multi_line:
-        screenshot_time_from_beginning = line_timestamp_in_video + vad_result.end - 1
-        logger.info(f"Using VAD result {vad_result} for screenshot time: {screenshot_time_from_beginning} seconds from beginning of replay")
-    elif get_config().screenshot.screenshot_timing_setting == "beginning":
+    # if vad_result and vad_result.success and not doing_multi_line:
+    #     screenshot_time_from_beginning = line_timestamp_in_video + vad_result.end - 1
+    #     logger.info(f"Using VAD result {vad_result} for screenshot time: {screenshot_time_from_beginning} seconds from beginning of replay")
+    if get_config().screenshot.screenshot_timing_setting == "beginning":
         screenshot_time_from_beginning = line_timestamp_in_video + screenshot_offset
         logger.info(f"Using 'beginning' setting for screenshot time: {screenshot_time_from_beginning} seconds from beginning of replay")
     elif get_config().screenshot.screenshot_timing_setting == "middle":

GameSentenceMiner/gsm.py

@@ -151,14 +151,14 @@ class VideoToAudioHandler(FileSystemEventHandler):
                         logger.info("No SentenceAudio Field in config, skipping audio processing!")
 
                 ss_timing = ffmpeg.get_screenshot_time(video_path, mined_line, vad_result=vad_result, doing_multi_line=bool(selected_lines))
-                prev_ss_timing = 0
-                if get_config().anki.previous_image_field and get_config().vad.do_vad_postprocessing:
-                    prev_ss_timing = ffmpeg.get_screenshot_time(video_path, mined_line.prev,
-                                                                vad_result=VideoToAudioHandler.get_audio(game_line=mined_line.prev,
-                                                                 next_line_time=mined_line.time,
-                                                                 video_path=video_path,
-                                                                 anki_card_creation_time=anki_card_creation_time,
-                                                                 timing_only=True) ,doing_multi_line=bool(selected_lines), previous_line=True)
+                # prev_ss_timing = 0
+                # if get_config().anki.previous_image_field and get_config().vad.do_vad_postprocessing:
+                #     prev_ss_timing = ffmpeg.get_screenshot_time(video_path, mined_line.prev,
+                #                                                 vad_result=VideoToAudioHandler.get_audio(game_line=mined_line.prev,
+                #                                                  next_line_time=mined_line.time,
+                #                                                  video_path=video_path,
+                #                                                  anki_card_creation_time=anki_card_creation_time,
+                #                                                  timing_only=True) ,doing_multi_line=bool(selected_lines), previous_line=True)
 
                 if get_config().anki.update_anki and last_note:
                     anki.update_anki_card(last_note, note, audio_path=final_audio_output, video_path=video_path,
@@ -166,8 +166,7 @@ class VideoToAudioHandler(FileSystemEventHandler):
                                           should_update_audio=vad_result.success,
                                           ss_time=ss_timing,
                                           game_line=start_line,
-                                          selected_lines=selected_lines,
-                                          prev_ss_timing=prev_ss_timing)
+                                          selected_lines=selected_lines)
                 elif get_config().features.notify_on_update and vad_result.success:
                     notification.send_audio_generated_notification(vad_trimmed_audio)
         except Exception as e:

GameSentenceMiner/ocr/gsm_ocr_config.py

@@ -1,3 +1,4 @@
+import ctypes
 from dataclasses import dataclass
 from math import floor, ceil
 
@@ -49,6 +50,7 @@ class OCRConfig:
         if self.coordinate_system and self.coordinate_system == "percentage" and self.window:
             import pygetwindow as gw
             try:
+                ctypes.windll.shcore.SetProcessDpiAwareness(2)
                 window = gw.getWindowsWithTitle(self.window)[0]
                 self.window_geometry = WindowGeometry(
                     left=window.left,
@@ -56,6 +58,7 @@ class OCRConfig:
                     width=window.width,
                     height=window.height,
                 )
+                print(f"Window '{self.window}' found with geometry: {self.window_geometry}")
             except IndexError:
                 raise ValueError(f"Window with title '{self.window}' not found.")
             for rectangle in self.rectangles:

GameSentenceMiner/ocr/owocr_area_selector.py

@@ -1,3 +1,4 @@
+import ctypes
 import json
 import sys
 from multiprocessing import Process, Manager
@@ -856,6 +857,7 @@ def get_screen_selection(window_name):
 if __name__ == "__main__":
     target_window_title = None  # Default to absolute coordinates
     # Check for command line arguments to specify window title
+    ctypes.windll.shcore.SetProcessDpiAwareness(2)
     if len(sys.argv) > 1:
         target_window_title = sys.argv[1]
         print(f"Attempting to target window title from args: '{target_window_title}'")

GameSentenceMiner/ocr/owocr_helper.py

@@ -1,4 +1,5 @@
 import asyncio
+import ctypes
 import json
 import logging
 import os
@@ -366,6 +367,7 @@ if __name__ == "__main__":
     logger.info(f"Received arguments: ocr1={ocr1}, ocr2={ocr2}, twopassocr={twopassocr}")
     global ocr_config
     ocr_config: OCRConfig = get_ocr_config()
+    ctypes.windll.shcore.SetProcessDpiAwareness(2)
     if ocr_config:
         if ocr_config.window:
             start_time = time.time()
@@ -377,7 +379,7 @@ if __name__ == "__main__":
             else:
                 logger.error(f"Window '{ocr_config.window}' not found within 30 seconds.")
                 sys.exit(1)
-    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}")
+    logger.info(f"Starting OCR with configuration: Window: {ocr_config.window}, Rectangles: {ocr_config.rectangles}, Engine 1: {ocr1}, Engine 2: {ocr2}, Two-pass OCR: {twopassocr}")
     if ocr_config:
         rectangles = list(filter(lambda rect: not rect.is_excluded, ocr_config.rectangles))
         last_ocr1_results = [""] * len(rectangles) if rectangles else [""]

GameSentenceMiner/owocr/owocr/run.py

@@ -53,8 +53,7 @@ except ImportError:
     pass
 from .config import Config
 from .screen_coordinate_picker import get_screen_selection
-from ...configuration import get_temporary_directory
-
+from ...configuration import get_temporary_directory, get_app_directory
 
 config = None
 
@@ -513,7 +512,7 @@ class ScreenshotClass:
                 if not self.window_handle:
                     raise ValueError(area_invalid_error)
 
-                ctypes.windll.shcore.SetProcessDpiAwareness(1)
+                ctypes.windll.shcore.SetProcessDpiAwareness(2)
 
                 self.windows_window_tracker_instance = threading.Thread(target=self.windows_window_tracker)
                 self.windows_window_tracker_instance.start()
@@ -693,11 +692,11 @@ class ScreenshotClass:
             sct_img = self.sct.grab(self.sct_params)
             img = Image.frombytes('RGB', sct_img.size, sct_img.bgra, 'raw', 'BGRX')
 
-        # import random  # Ensure this is imported at the top of the file if not already
-        # rand_int = random.randint(1, 10)  # Executes only once out of 10 times
+        import random  # Ensure this is imported at the top of the file if not already
+        rand_int = random.randint(1, 20)  # Executes only once out of 10 times
 
-        # if rand_int == 1:  # Executes only once out of 10 times
-        #     img.show()
+        if rand_int == 1:  # Executes only once out of 10 times
+            img.save(os.path.join(get_temporary_directory(), 'before_crop.png'), 'PNG')
 
         if self.screen_capture_exclusions:
             img = img.convert("RGBA")
@@ -709,8 +708,9 @@ class ScreenshotClass:
         if self.custom_left:
             img = img.crop((self.custom_left, self.custom_top, self.custom_left + self.custom_width, self.custom_top + self.custom_height))
 
-        # if rand_int == 1:
-        #     img.show()
+        if rand_int == 1:
+            img.save(os.path.join(get_temporary_directory(), 'after_crop.png'), 'PNG')
+            print(f'OCR images saved to {get_temporary_directory()} if debugging is needed, this is 1/20 chance')
 
         return img
 

{gamesentenceminer-2.8.30.dist-info → gamesentenceminer-2.8.33.dist-info}/METADATA

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

{gamesentenceminer-2.8.30.dist-info → gamesentenceminer-2.8.33.dist-info}/RECORD

@@ -1,11 +1,11 @@
 GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/anki.py,sha256=I98bvdxgZornaV1cnYux0-6AHnpEKkc4W56KCzOWC0s,14722
-GameSentenceMiner/config_gui.py,sha256=R7pUJDXCP7unGtBpuUjL0-8iWvY6LXRCYckHIrwkvF8,74207
+GameSentenceMiner/anki.py,sha256=fu59gdyp1en_yKTK1WOVZX5lwGzGFKvhccXffgkoYlY,14190
+GameSentenceMiner/config_gui.py,sha256=2klOj2DmHhmvtURp4JjhDJ1vn0hN-uWoUu1lS0xDl3s,74246
 GameSentenceMiner/configuration.py,sha256=ndnxuQbLfhMruHld-yK3UjWt1DcXlVhaLRZD8l6SJ0E,22562
 GameSentenceMiner/electron_config.py,sha256=dGcPYCISPehXubYSzsDuI2Gl092MYK0u3bTnkL9Jh1Y,9787
-GameSentenceMiner/ffmpeg.py,sha256=Gcx45ZwUTDjQ3fQkz1xm0Hcd4pT0X0n7AlADFlL-Srg,14509
+GameSentenceMiner/ffmpeg.py,sha256=OXjus4JJ2LZKku5SJ1qN89rjZ3jIxbvvAHL-mhGL-5o,14513
 GameSentenceMiner/gametext.py,sha256=VogQDs-VQ4dorqy8uvoklweeS58r3Th_yP-zn36e0u4,5556
-GameSentenceMiner/gsm.py,sha256=iMVaAEEaMP8Vfzxiiz-2PR1y5bl1wde2DC-MwA0e3uw,26069
+GameSentenceMiner/gsm.py,sha256=WmVhcC_CGjFmqV75NMMVm9hOiiv-ER4Lu5DUF-6IULo,26012
 GameSentenceMiner/model.py,sha256=JdnkT4VoPOXmOpRgFdvERZ09c9wLN6tUJxdrKlGZcqo,5305
 GameSentenceMiner/notification.py,sha256=FY39ChSRK0Y8TQ6lBGsLnpZUFPtFpSy2tweeXVoV7kc,2809
 GameSentenceMiner/obs.py,sha256=-tzVHejaGDXyERaDrRqrKmbgwT13oJKxTivGwfUij7Y,10284
@@ -22,16 +22,16 @@ GameSentenceMiner/downloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 GameSentenceMiner/downloader/download_tools.py,sha256=aRfpCqEmKUFRVsGipwY-7PhY6AeWiFJanW4ZCB9e2iE,8124
 GameSentenceMiner/downloader/oneocr_dl.py,sha256=o3ANp5IodEQoQ8GPcJdg9Y8JzA_lictwnebFPwwUZVk,10144
 GameSentenceMiner/ocr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/ocr/gsm_ocr_config.py,sha256=rQC6C8PKJXWoAvwCOYa363kodQQBwl1YNeYsD0bBbx4,1957
+GameSentenceMiner/ocr/gsm_ocr_config.py,sha256=-tw5l2wvv_sqUcGS0Y5X9LlXqmFxcCHcwZ76Q93T3I4,2127
 GameSentenceMiner/ocr/ocrconfig.py,sha256=_tY8mjnzHMJrLS8E5pHqYXZjMuLoGKYgJwdhYgN-ny4,6466
-GameSentenceMiner/ocr/owocr_area_selector.py,sha256=sryQd7D33i7E6c8gO7dnxLWtL6Nghgs7cvppK-xFxiE,47076
-GameSentenceMiner/ocr/owocr_helper.py,sha256=motXED_wX_CUljXp0pIaziw2xFBpz6gjokD2icDz02k,17358
+GameSentenceMiner/ocr/owocr_area_selector.py,sha256=gHvhsgvYmIMKmkq0cDOLzBTnmBAvVyP9JKNlTZouJk8,47141
+GameSentenceMiner/ocr/owocr_helper.py,sha256=_mRqQ8928ovdF5o_4qpK2DGWMmu3cGBYsmpgMtc0adU,17418
 GameSentenceMiner/owocr/owocr/__init__.py,sha256=opjBOyGGyEqZCE6YdZPnyt7nVfiwyELHsXA0jAsjm14,25
 GameSentenceMiner/owocr/owocr/__main__.py,sha256=XQaqZY99EKoCpU-gWQjNbTs7Kg17HvBVE7JY8LqIE0o,157
 GameSentenceMiner/owocr/owocr/config.py,sha256=qM7kISHdUhuygGXOxmgU6Ef2nwBShrZtdqu4InDCViE,8103
 GameSentenceMiner/owocr/owocr/lens_betterproto.py,sha256=oNoISsPilVVRBBPVDtb4-roJtAhp8ZAuFTci3TGXtMc,39141
 GameSentenceMiner/owocr/owocr/ocr.py,sha256=dPnDmtG-I24kcfxC3iudeRIVgGhLmiWMGyRiMANcYsA,41573
-GameSentenceMiner/owocr/owocr/run.py,sha256=oLXNYFZ4kHRfpSngGNSMEZa4zv6QmSW-x_bk9B1isOE,52096
+GameSentenceMiner/owocr/owocr/run.py,sha256=ZC0sG-3mCyGgg8FPSto9Hd6-k-N18T1hBe-IgsbSBLM,52345
 GameSentenceMiner/owocr/owocr/screen_coordinate_picker.py,sha256=Na6XStbQBtpQUSdbN3QhEswtKuU1JjReFk_K8t5ezQE,3395
 GameSentenceMiner/vad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/vad/result.py,sha256=C08HsYH4qVjTRh_dvrWrskmXHJ950w0GWxPjGx_BfGY,275
@@ -52,9 +52,9 @@ GameSentenceMiner/web/static/web-app-manifest-512x512.png,sha256=wyqgCWCrLEUxSRX
 GameSentenceMiner/web/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/web/templates/text_replacements.html,sha256=tV5c8mCaWSt_vKuUpbdbLAzXZ3ATZeDvQ9PnnAfqY0M,8598
 GameSentenceMiner/web/templates/utility.html,sha256=NUp4Yjs6_j7YeqsM2rcF0LzwS6nXSBUWJDl-k2E8BbM,16270
-gamesentenceminer-2.8.30.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.8.30.dist-info/METADATA,sha256=qT-voNQ5NwqOcQtACk_VsApymhHJBiyLxIBWjnPdgnQ,7165
-gamesentenceminer-2.8.30.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-gamesentenceminer-2.8.30.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.8.30.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.8.30.dist-info/RECORD,,
+gamesentenceminer-2.8.33.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.8.33.dist-info/METADATA,sha256=Tr9Brv6OO1-QMLV_nSZsR1DPy4-ZffwdVqWOX9OjZ9g,7165
+gamesentenceminer-2.8.33.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+gamesentenceminer-2.8.33.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.8.33.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.8.33.dist-info/RECORD,,