GameSentenceMiner 2.19.15__tar.gz → 2.19.17__tar.gz

{gamesentenceminer-2.19.15 → gamesentenceminer-2.19.17}/GameSentenceMiner/gsm.py

@@ -13,6 +13,8 @@ def handle_error_in_initialization(e):
         sys.exit(1)
 
 Icon = None
+Menu = None
+MenuItem = None
 
 try:
     import GameSentenceMiner.util.configuration
@@ -41,7 +43,7 @@ try:
     from PIL import Image
     try:
         pass
-        # from pystray import Icon, Menu, MenuItem
+        from pystray import Icon, Menu, MenuItem
     except Exception:
         logger.warning("pystray not installed correctly, tray icon will not work.")
     from watchdog.events import FileSystemEventHandler

{gamesentenceminer-2.19.15 → gamesentenceminer-2.19.17}/GameSentenceMiner/ocr/owocr_helper.py

@@ -21,7 +21,7 @@ from rapidfuzz import fuzz
 from GameSentenceMiner import obs
 from GameSentenceMiner.ocr.ss_picker import ScreenCropper
 from GameSentenceMiner.owocr.owocr.run import TextFiltering
-from GameSentenceMiner.util.configuration import get_config, get_app_directory, get_temporary_directory
+from GameSentenceMiner.util.configuration import get_config, get_app_directory, get_temporary_directory, is_windows
 from GameSentenceMiner.ocr.gsm_ocr_config import OCRConfig, has_config_changed, set_dpi_awareness, get_window, get_ocr_config_path
 from GameSentenceMiner.owocr.owocr import run
 from GameSentenceMiner.util.electron_config import get_ocr_ocr2, get_ocr_send_to_clipboard, get_ocr_scan_rate, \
@@ -619,7 +619,6 @@ def process_task_queue():
 
 def run_oneocr(ocr_config: OCRConfig, rectangles, config_check_thread):
     global done
-    print("Running OneOCR")
     screen_area = None
     screen_areas = [",".join(str(c) for c in rect_config.coordinates) for rect_config in rectangles if not rect_config.is_excluded]
     exclusions = list(rect.coordinates for rect in list(filter(lambda x: x.is_excluded, rectangles)))
@@ -808,7 +807,8 @@ if __name__ == "__main__":
                 worker_thread.start()
             websocket_server_thread = WebsocketServerThread(read=True)
             websocket_server_thread.start()
-            add_ss_hotkey(ss_hotkey)
+            if is_windows():
+                add_ss_hotkey(ss_hotkey)
             try:
                 while not done:
                     time.sleep(1)

{gamesentenceminer-2.19.15 → gamesentenceminer-2.19.17}/GameSentenceMiner/util/ffmpeg.py

@@ -228,9 +228,19 @@ def get_screenshot(video_file, screenshot_timing, try_selector=False):
     output_image = make_unique_file_name(os.path.join(
         get_temporary_directory(), f"{obs.get_current_game(sanitize=True)}.{get_config().screenshot.extension}"))
     
+    pre_input_args = []
+    pre_input_args_string = ""
+    if get_config().screenshot.custom_ffmpeg_settings:
+        if '-hwaccel' in get_config().screenshot.custom_ffmpeg_settings:
+            hwaccel_args = get_config().screenshot.custom_ffmpeg_settings.split(" ")
+            hwaccel_index = hwaccel_args.index('-hwaccel')
+            pre_input_args.extend(hwaccel_args[hwaccel_index:hwaccel_index + 2])
+            pre_input_args_string = " ".join(pre_input_args)
+    
     # Base command for extracting the frame
     ffmpeg_command = ffmpeg_base_command_list + [
         "-ss", f"{screenshot_timing}",
+    ] + pre_input_args + [
         "-i", f"{video_file}",
         "-vframes", "1"  # Extract only one frame
     ]
@@ -252,7 +262,7 @@ def get_screenshot(video_file, screenshot_timing, try_selector=False):
         ffmpeg_command.extend(["-vf", ",".join(video_filters)])
 
     if get_config().screenshot.custom_ffmpeg_settings:
-        ffmpeg_command.extend(get_config().screenshot.custom_ffmpeg_settings.replace("\"", "").split(" "))
+        ffmpeg_command.extend(get_config().screenshot.custom_ffmpeg_settings.replace("\"", "").replace(pre_input_args_string, "").split())
     else:
         # Ensure quality settings are strings
         ffmpeg_command.extend(["-compression_level", "6", "-q:v", str(get_config().screenshot.quality)])
@@ -598,14 +608,23 @@ def get_screenshot_time(video_path, game_line, default_beginning=False, vad_resu
 def process_image(image_file):
     output_image = make_unique_file_name(
         os.path.join(get_temporary_directory(), f"{obs.get_current_game(sanitize=True)}.{get_config().screenshot.extension}"))
+    
+    pre_input_args = []
+    pre_input_args_string = ""
+    if get_config().screenshot.custom_ffmpeg_settings:
+        if '-hwaccel' in get_config().screenshot.custom_ffmpeg_settings:
+            hwaccel_args = get_config().screenshot.custom_ffmpeg_settings.split()
+            hwaccel_index = hwaccel_args.index('-hwaccel')
+            pre_input_args.extend(hwaccel_args[hwaccel_index:hwaccel_index + 2])
+            pre_input_args_string = " ".join(pre_input_args)
 
     # FFmpeg command to process the input image
-    ffmpeg_command = ffmpeg_base_command_list + [
+    ffmpeg_command = ffmpeg_base_command_list + pre_input_args + [
         "-i", image_file
     ]
 
     if get_config().screenshot.custom_ffmpeg_settings:
-        ffmpeg_command.extend(get_config().screenshot.custom_ffmpeg_settings.split(" "))
+        ffmpeg_command.extend(get_config().screenshot.custom_ffmpeg_settings.replace(pre_input_args_string, "").split())
     else:
         ffmpeg_command.extend(["-compression_level", "6", "-q:v", get_config().screenshot.quality])
 
@@ -769,7 +788,7 @@ def reencode_file_with_user_config(input_file, final_output_audio, user_ffmpeg_o
     command = ffmpeg_base_command_list + [
         "-i", input_file,
         "-map", "0:a"
-    ] + user_ffmpeg_options.replace("\"", "").split(" ") + [
+    ] + user_ffmpeg_options.replace("\"", "").split() + [
                   temp_file
               ]
 

{gamesentenceminer-2.19.15 → gamesentenceminer-2.19.17}/GameSentenceMiner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.19.15
+Version: 2.19.17
 Summary: A tool for mining sentences from games. Update: Dependencies, replay buffer based line searching, and bug fixes.
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.19.15 → gamesentenceminer-2.19.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.19.15
+Version: 2.19.17
 Summary: A tool for mining sentences from games. Update: Dependencies, replay buffer based line searching, and bug fixes.
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.19.15 → gamesentenceminer-2.19.17}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GameSentenceMiner"
-version = "2.19.15"
+version = "2.19.17"
 description = "A tool for mining sentences from games. Update: Dependencies, replay buffer based line searching, and bug fixes."
 readme = "README.md"
 requires-python = ">=3.10, <3.14"