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

Reduce macOS idle resource usage

Browse Source
This commit is contained in:
AuroraWright
2023-12-13 16:37:17 +01:00
parent 25d101f806
commit a12ddfd222
1 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
manga_ocr/run.py
View File

@@ -153,6 +153,14 @@ def run(read_from='clipboard',
on_press=on_key_press, on_press=on_key_press,
on_release=on_key_release) on_release=on_key_release)
tmp_paused_listener.start() tmp_paused_listener.start()
if sys.platform == "darwin" and 'objc' in sys.modules:
from AppKit import NSPasteboard, NSPasteboardTypePNG, NSPasteboardTypeTIFF
pasteboard = NSPasteboard.generalPasteboard()
count = pasteboard.changeCount()
mac_clipboard_polling = True
else:
mac_clipboard_polling = False
else: else:
read_from = Path(read_from) read_from = Path(read_from)
if not read_from.is_dir(): if not read_from.is_dir():
@@ -225,22 +233,32 @@ def run(read_from='clipboard',
if read_from == 'clipboard': if read_from == 'clipboard':
if not paused and not tmp_paused: if not paused and not tmp_paused:
old_img = img if mac_clipboard_polling:
changed = False
try: old_count = count
img = ImageGrab.grabclipboard() count = pasteboard.changeCount()
except OSError as error: if not just_unpaused and count != old_count and any(x in pasteboard.types() for x in [NSPasteboardTypePNG, NSPasteboardTypeTIFF]):
if not verbose and "cannot identify image file" in str(error): changed = True
# Pillow error when clipboard hasn't changed since last grab (Linux)
pass
elif not verbose and "target image/png not available" in str(error):
# Pillow error when clipboard contains text (Linux, X11)
pass
else:
logger.warning('Error while reading from clipboard ({})'.format(error))
else: else:
if not just_unpaused and isinstance(img, Image.Image) and not are_images_identical(img, old_img): changed = True
process_and_write_results(engine_instances[engine_index], img, write_to)
if changed:
old_img = img
try:
img = ImageGrab.grabclipboard()
except OSError as error:
if not verbose and "cannot identify image file" in str(error):
# Pillow error when clipboard hasn't changed since last grab (Linux)
pass
elif not verbose and "target image/png not available" in str(error):
# Pillow error when clipboard contains text (Linux, X11)
pass
else:
logger.warning('Error while reading from clipboard ({})'.format(error))
else:
if not just_unpaused and isinstance(img, Image.Image) and not are_images_identical(img, old_img):
process_and_write_results(engine_instances[engine_index], img, write_to)
if just_unpaused: if just_unpaused:
just_unpaused = False just_unpaused = False