sudacode/owocr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add window closed detection and catch SIGINT

Browse Source
This commit is contained in:
AuroraWright
2024-01-28 13:40:03 +01:00
parent b2474476d0
commit 2c45805318
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
owocr/run.py
View File

@@ -1,4 +1,5 @@
import sys import sys
import signal
import time import time
import threading import threading
from pathlib import Path from pathlib import Path
@@ -196,6 +197,19 @@ def on_key_release(key):
first_pressed = None first_pressed = None
def signal_handler(sig, frame):
global terminated
logger.info('Terminated!')
terminated = True
def on_window_closed(alive):
global terminated
if not alive:
logger.info('Window closed, terminated!')
terminated = True
def on_window_activated(active): def on_window_activated(active):
global screencapture_window_active global screencapture_window_active
screencapture_window_active = active screencapture_window_active = active
@@ -423,11 +437,10 @@ def run(read_from=None,
coord_height = target_window.height coord_height = target_window.height
if screen_capture_only_active_windows: if screen_capture_only_active_windows:
screencapture_window_active = target_window.isActive screencapture_window_active = target_window.isActive
target_window.watchdog.start(isActiveCB=on_window_activated, resizedCB=on_window_resized, movedCB=on_window_moved) target_window.watchdog.start(isAliveCB=on_window_closed, isActiveCB=on_window_activated, resizedCB=on_window_resized, movedCB=on_window_moved)
else: else:
screencapture_window_visible = not target_window.isMinimized screencapture_window_visible = not target_window.isMinimized
target_window.watchdog.start(isMinimizedCB=on_window_minimized, resizedCB=on_window_resized, movedCB=on_window_moved) target_window.watchdog.start(isAliveCB=on_window_closed, isMinimizedCB=on_window_minimized, resizedCB=on_window_resized, movedCB=on_window_moved)
target_window.watchdog.setTryToFind(True)
global sct_params global sct_params
sct_params = {'top': coord_top, 'left': coord_left, 'width': coord_width, 'height': coord_height, 'mon': screen_capture_monitor} sct_params = {'top': coord_top, 'left': coord_left, 'width': coord_width, 'height': coord_height, 'mon': screen_capture_monitor}
@@ -446,6 +459,7 @@ def run(read_from=None,
if path.suffix.lower() in allowed_extensions: if path.suffix.lower() in allowed_extensions:
old_paths.add(get_path_key(path)) old_paths.add(get_path_key(path))
signal.signal(signal.SIGINT, signal_handler)
while not terminated: while not terminated:
if read_from == 'websocket': if read_from == 'websocket':
while True: while True:
@@ -526,7 +540,6 @@ def run(read_from=None,
windows_clipboard_thread.join() windows_clipboard_thread.join()
elif read_from == 'screencapture' and screencapture_window_mode: elif read_from == 'screencapture' and screencapture_window_mode:
target_window.watchdog.stop() target_window.watchdog.stop()
user_input_thread.join()
tmp_paused_listener.stop() tmp_paused_listener.stop()
if __name__ == '__main__': if __name__ == '__main__':