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

Minor style changes

Browse Source
This commit is contained in:
AuroraWright
2024-01-31 16:32:09 +01:00
parent 555d95f907
commit a6581dd3ff
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
owocr/run.py
View File

@@ -35,8 +35,10 @@ try:
except ImportError: except ImportError:
pass pass
config = None config = None
class WindowsClipboardThread(threading.Thread): class WindowsClipboardThread(threading.Thread):
def __init__(self): def __init__(self):
super().__init__() super().__init__()
@@ -398,13 +400,10 @@ def run(read_from=None,
websocket_queue = queue.Queue() websocket_queue = queue.Queue()
logger.opt(ansi=True).info(f"Reading from websocket using <{engine_color}>{engine_instances[engine_index].readable_name}</{engine_color}>{' (paused)' if paused else ''}") logger.opt(ansi=True).info(f"Reading from websocket using <{engine_color}>{engine_instances[engine_index].readable_name}</{engine_color}>{' (paused)' if paused else ''}")
elif read_from == 'clipboard': elif read_from == 'clipboard':
from PIL import ImageGrab
mac_clipboard_polling = False mac_clipboard_polling = False
windows_clipboard_polling = False windows_clipboard_polling = False
img = None img = None
logger.opt(ansi=True).info(f"Reading from clipboard using <{engine_color}>{engine_instances[engine_index].readable_name}</{engine_color}>{' (paused)' if paused else ''}")
if sys.platform == 'darwin': if sys.platform == 'darwin':
from AppKit import NSPasteboard, NSPasteboardTypeTIFF, NSPasteboardTypeString from AppKit import NSPasteboard, NSPasteboardTypeTIFF, NSPasteboardTypeString
pasteboard = NSPasteboard.generalPasteboard() pasteboard = NSPasteboard.generalPasteboard()
@@ -416,6 +415,10 @@ def run(read_from=None,
windows_clipboard_thread = WindowsClipboardThread() windows_clipboard_thread = WindowsClipboardThread()
windows_clipboard_thread.start() windows_clipboard_thread.start()
windows_clipboard_polling = True windows_clipboard_polling = True
else:
from PIL import ImageGrab
logger.opt(ansi=True).info(f"Reading from clipboard using <{engine_color}>{engine_instances[engine_index].readable_name}</{engine_color}>{' (paused)' if paused else ''}")
elif read_from == 'screencapture': elif read_from == 'screencapture':
if screen_capture_combo != '': if screen_capture_combo != '':
screen_capture_on_combo = True screen_capture_on_combo = True
@@ -476,18 +479,18 @@ def run(read_from=None,
logger.opt(ansi=True).info(f"Reading with screen capture using <{engine_color}>{engine_instances[engine_index].readable_name}</{engine_color}>{' (paused)' if paused else ''}") logger.opt(ansi=True).info(f"Reading with screen capture using <{engine_color}>{engine_instances[engine_index].readable_name}</{engine_color}>{' (paused)' if paused else ''}")
else: else:
allowed_extensions = ('.png', '.jpg', '.jpeg', '.bmp', '.gif', '.webp')
read_from = Path(read_from) read_from = Path(read_from)
if not read_from.is_dir(): if not read_from.is_dir():
raise ValueError('read_from must be either "websocket", "clipboard", "screencapture" or a path to a directory') raise ValueError('read_from must be either "websocket", "clipboard", "screencapture" or a path to a directory')
logger.opt(ansi=True).info(f"Reading from directory {read_from} using <{engine_color}>{engine_instances[engine_index].readable_name}</{engine_color}>{' (paused)' if paused else ''}") allowed_extensions = ('.png', '.jpg', '.jpeg', '.bmp', '.gif', '.webp')
old_paths = set() old_paths = set()
for path in read_from.iterdir(): for path in read_from.iterdir():
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))
logger.opt(ansi=True).info(f"Reading from directory {read_from} using <{engine_color}>{engine_instances[engine_index].readable_name}</{engine_color}>{' (paused)' if paused else ''}")
if screen_capture_on_combo: if screen_capture_on_combo:
tmp_paused_listener = keyboard.GlobalHotKeys({ tmp_paused_listener = keyboard.GlobalHotKeys({
screen_capture_combo: on_screenshot_combo}) screen_capture_combo: on_screenshot_combo})