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

Fix potential race condition in Windows, minor other changes

Browse Source
This commit is contained in:
AuroraWright
2024-01-24 06:26:38 +01:00
parent b1ac3b6438
commit a8790e106f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
owocr/run.py
View File

@@ -115,9 +115,9 @@ def getchar_thread():
if sys.platform == 'win32': if sys.platform == 'win32':
import msvcrt import msvcrt
while True: while True:
user_input = msvcrt.getch() user_input_bytes = msvcrt.getch()
try: try:
user_input = user_input.decode() user_input = user_input_bytes.decode()
if user_input.lower() in 'tq': if user_input.lower() in 'tq':
break break
except UnicodeDecodeError: except UnicodeDecodeError:
@@ -170,7 +170,7 @@ def process_and_write_results(engine_instance, engine_color, img_or_path, write_
t1 = time.time() t1 = time.time()
logger.opt(ansi=True).info(f'Text recognized in {t1 - t0:0.03f}s using <{engine_color}>{engine_instance.readable_name}</{engine_color}>: {text}') logger.opt(ansi=True).info(f'Text recognized in {t1 - t0:0.03f}s using <{engine_color}>{engine_instance.readable_name}</{engine_color}>: {text}')
if notifications == True: if notifications:
notification = Notify() notification = Notify()
notification.application_name = 'owocr' notification.application_name = 'owocr'
notification.title = 'Text recognized:' notification.title = 'Text recognized:'
@@ -183,7 +183,7 @@ def process_and_write_results(engine_instance, engine_color, img_or_path, write_
pyperclipfix.copy(text) pyperclipfix.copy(text)
else: else:
write_to = Path(write_to) write_to = Path(write_to)
if write_to.suffix != '.txt': if write_to.suffix.lower() != '.txt':
raise ValueError('write_to must be either "clipboard" or a path to a text file') raise ValueError('write_to must be either "clipboard" or a path to a text file')
with write_to.open('a', encoding='utf-8') as f: with write_to.open('a', encoding='utf-8') as f:
@@ -347,7 +347,7 @@ def run(read_from='clipboard',
old_paths = set() old_paths = set()
for path in read_from.iterdir(): for path in read_from.iterdir():
if str(path).lower().endswith(allowed_extensions): if path.suffix.lower() in allowed_extensions:
old_paths.add(get_path_key(path)) old_paths.add(get_path_key(path))
while True: while True:
@@ -427,7 +427,7 @@ def run(read_from='clipboard',
time.sleep(delay_secs) time.sleep(delay_secs)
else: else:
for path in read_from.iterdir(): for path in read_from.iterdir():
if str(path).lower().endswith(allowed_extensions): if path.suffix.lower() in allowed_extensions:
path_key = get_path_key(path) path_key = get_path_key(path)
if path_key not in old_paths: if path_key not in old_paths:
old_paths.add(path_key) old_paths.add(path_key)