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

Fix crashes trying to run multiple instances

Browse Source
This commit is contained in:
AuroraWright
2025-10-19 21:22:06 +02:00
parent 620a8307e2
commit 97fc0bf770
1 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
owocr/run.py
View File

@@ -18,6 +18,7 @@ import mss
import psutil import psutil
import asyncio import asyncio
import websockets import websockets
import socket
import socketserver import socketserver
from PIL import Image, UnidentifiedImageError from PIL import Image, UnidentifiedImageError
@@ -268,7 +269,6 @@ class WebsocketServerThread(threading.Thread):
self.server = start_server = websockets.serve(self.server_handler, '0.0.0.0', websocket_port, max_size=1000000000) self.server = start_server = websockets.serve(self.server_handler, '0.0.0.0', websocket_port, max_size=1000000000)
try: try:
async with start_server: async with start_server:
logger.info(f"Started websocket server on port {websocket_port}")
await stop_event.wait() await stop_event.wait()
except OSError: except OSError:
logger.error(f"Couldn't start websocket server. Make sure port {websocket_port} is not already in use") logger.error(f"Couldn't start websocket server. Make sure port {websocket_port} is not already in use")
@@ -276,7 +276,7 @@ class WebsocketServerThread(threading.Thread):
asyncio.run(main()) asyncio.run(main())
class RequestHandler(socketserver.BaseRequestHandler): class UnixSocketRequestHandler(socketserver.BaseRequestHandler):
def handle(self): def handle(self):
conn = self.request conn = self.request
conn.settimeout(3) conn.settimeout(3)
@@ -292,11 +292,14 @@ class RequestHandler(socketserver.BaseRequestHandler):
except TimeoutError: except TimeoutError:
pass pass
if not paused.is_set(): try:
image_queue.put((img, False)) if not paused.is_set():
conn.sendall(b'True') image_queue.put((img, False))
else: conn.sendall(b'True')
conn.sendall(b'False') else:
conn.sendall(b'False')
except:
pass
class TextFiltering: class TextFiltering:
@@ -1536,8 +1539,9 @@ def engine_change_handler(user_input='s', is_combo=True):
def terminate_handler(sig=None, frame=None): def terminate_handler(sig=None, frame=None):
global terminated global terminated
logger.info('Terminated!') if not terminated.is_set():
terminated.set() logger.info('Terminated!')
terminated.set()
def user_input_thread_run(): def user_input_thread_run():
@@ -1708,6 +1712,8 @@ def run():
key_combos[combo_engine_switch] = engine_change_handler key_combos[combo_engine_switch] = engine_change_handler
if 'websocket' in (read_from, read_from_secondary) or write_to == 'websocket': if 'websocket' in (read_from, read_from_secondary) or write_to == 'websocket':
websocket_port = config.get_general('websocket_port')
logger.info(f"Starting websocket server on port {websocket_port}")
websocket_server_thread = WebsocketServerThread('websocket' in (read_from, read_from_secondary)) websocket_server_thread = WebsocketServerThread('websocket' in (read_from, read_from_secondary))
websocket_server_thread.start() websocket_server_thread.start()
if 'screencapture' in (read_from, read_from_secondary): if 'screencapture' in (read_from, read_from_secondary):
@@ -1727,6 +1733,7 @@ def run():
screen_capture_periodic = True screen_capture_periodic = True
if not (screen_capture_on_combo or screen_capture_periodic): if not (screen_capture_on_combo or screen_capture_periodic):
logger.error('screen_capture_delay_secs or screen_capture_combo need to be valid values') logger.error('screen_capture_delay_secs or screen_capture_combo need to be valid values')
terminate_handler()
sys.exit(1) sys.exit(1)
screenshot_request_queue = queue.Queue() screenshot_request_queue = queue.Queue()
screenshot_thread = ScreenshotThread() screenshot_thread = ScreenshotThread()
@@ -1737,11 +1744,20 @@ def run():
if 'unixsocket' in (read_from, read_from_secondary): if 'unixsocket' in (read_from, read_from_secondary):
if sys.platform == 'win32': if sys.platform == 'win32':
logger.error('"unixsocket" is not currently supported on Windows') logger.error('"unixsocket" is not currently supported on Windows')
terminate_handler()
sys.exit(1) sys.exit(1)
socket_path = Path('/tmp/owocr.sock') socket_path = Path('/tmp/owocr.sock')
if socket_path.exists(): if socket_path.exists():
socket_path.unlink() try:
unix_socket_server = socketserver.ThreadingUnixStreamServer(str(socket_path), RequestHandler) test_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
test_socket.connect(str(socket_path))
test_socket.close()
logger.error('Unix domain socket is already in use')
terminate_handler()
sys.exit(1)
except ConnectionRefusedError:
socket_path.unlink()
unix_socket_server = socketserver.ThreadingUnixStreamServer(str(socket_path), UnixSocketRequestHandler)
unix_socket_server_thread = threading.Thread(target=unix_socket_server.serve_forever, daemon=True) unix_socket_server_thread = threading.Thread(target=unix_socket_server.serve_forever, daemon=True)
unix_socket_server_thread.start() unix_socket_server_thread.start()
read_from_readable.append('unix socket') read_from_readable.append('unix socket')
@@ -1752,11 +1768,13 @@ def run():
if any(i and i not in non_path_inputs for i in (read_from, read_from_secondary)): if any(i and i not in non_path_inputs for i in (read_from, read_from_secondary)):
if all(i and i not in non_path_inputs for i in (read_from, read_from_secondary)): if all(i and i not in non_path_inputs for i in (read_from, read_from_secondary)):
logger.error("read_from and read_from_secondary can't both be directory paths") logger.error("read_from and read_from_secondary can't both be directory paths")
terminate_handler()
sys.exit(1) sys.exit(1)
delete_images = config.get_general('delete_images') delete_images = config.get_general('delete_images')
read_from_path = Path(read_from) if read_from not in non_path_inputs else Path(read_from_secondary) read_from_path = Path(read_from) if read_from not in non_path_inputs else Path(read_from_secondary)
if not read_from_path.is_dir(): if not read_from_path.is_dir():
logger.error('read_from and read_from_secondary must be either "websocket", "unixsocket", "clipboard", "screencapture", or a path to a directory') logger.error('read_from and read_from_secondary must be either "websocket", "unixsocket", "clipboard", "screencapture", or a path to a directory')
terminate_handler()
sys.exit(1) sys.exit(1)
directory_watcher_thread = DirectoryWatcher(read_from_path) directory_watcher_thread = DirectoryWatcher(read_from_path)
directory_watcher_thread.start() directory_watcher_thread.start()
@@ -1773,6 +1791,7 @@ def run():
else: else:
if Path(write_to).suffix.lower() != '.txt': if Path(write_to).suffix.lower() != '.txt':
logger.error('write_to must be either "websocket", "clipboard" or a path to a text file') logger.error('write_to must be either "websocket", "clipboard" or a path to a text file')
terminate_handler()
sys.exit(1) sys.exit(1)
write_to_readable = f'file {write_to}' write_to_readable = f'file {write_to}'