Unverified Commit c114f3e9 authored by Sergey Pinus's avatar Sergey Pinus Committed by GitHub
Browse files

Merge branch 'dmMaze:dev' into dev

parents 646a168c cc90b151

launch.py

+9 −5
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ import re 
import subprocess

import pkg_resources

from platform import platform

import logging



BRANCH = 'dev'

VERSION = '1.4.0'
@@ -109,7 +110,7 @@ def commit_hash(): 




def load_modules():



    LOGGER = logging.getLogger('BallonTranslator')

    def _load_module(module_dir: str, module_pattern: str):

        modules = os.listdir(module_dir)

        pattern = re.compile(module_pattern)
@@ -118,7 +119,11 @@ def load_modules(): 
            module_path += '.'

        for module_name in modules:

            if pattern.match(module_name) is not None:

                importlib.import_module(module_path + module_name.replace('.py', ''))

                try:

                    module = module_path + module_name.replace('.py', '')

                    importlib.import_module(module)

                except Exception as e:

                    LOGGER.warning(f'Failed to import {module}: {e}')



    for kwargs in [

        {'module_dir': 'modules/translators', 'module_pattern': r'trans_(.*?).py'},
@@ -134,7 +139,7 @@ APP = None 
def restart():

    global BT

    print('restarting...\n')

    if BT: # Проверка на None перед закрытием

    if BT:

        BT.close()

    os.execv(sys.executable, ['python'] + sys.argv)
@@ -159,7 +164,6 @@ def main(): 


    prepare_environment()



    # Проверка обновлений ПЕРЕД инициализацией GUI

    if args.update:

        if getattr(sys, 'frozen', False):

            print('Running as app, skipping update.')
@@ -175,7 +179,7 @@ def main(): 
                    run(f"{git} pull origin {BRANCH}", desc="Updating repository...", errdesc="Failed to update repository.")

                    print("Repository updated. Restarting to apply updates...")

                    restart()

                    return # Важно выйти после перезапуска, чтобы продолжить уже в новом процессе

                    return

                else:

                    print("No updates found.")

            except Exception as e:

modules/ocr/ocr_paddle.py

+2 −1
Original line number Diff line number Diff line
@@ -2,13 +2,14 @@ import numpy as np 
from typing import List

import os

import logging

LOGGER = logging.getLogger('BallonTranslator')



try:

    from paddleocr import PaddleOCR

    PADDLE_OCR_AVAILABLE = True

except ImportError:

    PADDLE_OCR_AVAILABLE = False

    logging.warning(

    LOGGER.warning(

        'PaddleOCR is not installed, so the module will not be initialized. \nInstall core it by following https://www.paddlepaddle.org.cn/en/install/quick?docurl \nand then run `pip install paddleocr`'

    )