From a88705a8214d48083a71d55f4af55b6985b70d31 Mon Sep 17 00:00:00 2001 From: mikigo Date: Wed, 26 Jun 2024 15:42:57 +0800 Subject: [PATCH] fix: update Description: Log: --- docs/index.md | 2 +- youqu3/cmd.py | 4 ++-- youqu3/dogtail.py | 4 ++-- youqu3/exception.py | 2 +- youqu3/image.py | 4 ++-- youqu3/mousekey.py | 4 ++-- youqu3/ocr.py | 4 ++-- youqu3/plugin.py | 2 +- youqu3/requests.py | 4 ++-- youqu3/ui.py | 4 ++-- youqu3/webui.py | 4 ++-- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/index.md b/docs/index.md index b544e60..6f137f4 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,7 +11,7 @@ hero: text: GitHub link: "https://github.com/funny-dream/youqu3" - theme: alt - text: issue + text: Issues link: "https://github.com/funny-dream/youqu3/issues" image: src: /logo.png diff --git a/youqu3/cmd.py b/youqu3/cmd.py index f52fb8d..11bdb58 100644 --- a/youqu3/cmd.py +++ b/youqu3/cmd.py @@ -136,7 +136,7 @@ def remote_run(self, cmd: str, return_code: bool = False): try: from fabric import Connection except ImportError: - raise exception.YouQuPluginInstalledError("fabric") + raise exception.YouQuPluginDependencyError("fabric") c = Connection( host=self.ip, user=self.user, @@ -152,7 +152,7 @@ def remote_sudo_run(self, cmd: str, return_code: bool = False): try: from fabric import Connection, Config except ImportError: - raise exception.YouQuPluginInstalledError("fabric") + raise exception.YouQuPluginDependencyError("fabric") c = Connection( host=self.ip, user=self.user, diff --git a/youqu3/dogtail.py b/youqu3/dogtail.py index 2af7e4b..68c93d4 100644 --- a/youqu3/dogtail.py +++ b/youqu3/dogtail.py @@ -1,4 +1,4 @@ -from youqu3.exception import YouQuPluginInstalledError +from youqu3.exception import YouQuPluginDependencyError try: from youqu_dogtail import DogtailUtils as Dogtail @@ -8,4 +8,4 @@ HAS_DOGTAIL = False if HAS_DOGTAIL is False: - raise YouQuPluginInstalledError("youqu-dogtail") + raise YouQuPluginDependencyError("youqu-dogtail") diff --git a/youqu3/exception.py b/youqu3/exception.py index 5c5f5d1..919d92f 100644 --- a/youqu3/exception.py +++ b/youqu3/exception.py @@ -173,7 +173,7 @@ def __init__(self, msg): logger.error(err) Exception.__init__(self, err) -class YouQuPluginInstalledError(Exception): +class YouQuPluginDependencyError(Exception): def __init__(self, msg): err = f"YouQu插件未安装 <{msg}>, 请尝试安装：pip install {msg}" diff --git a/youqu3/image.py b/youqu3/image.py index 33eb8c2..5f5c906 100644 --- a/youqu3/image.py +++ b/youqu3/image.py @@ -1,6 +1,6 @@ import random -from youqu3.exception import YouQuPluginInstalledError +from youqu3.exception import YouQuPluginDependencyError try: from youqu_imagecenter_rpc import ImageCenter as _ImageCenter @@ -13,7 +13,7 @@ HAS_IMAGECENTER = False if HAS_IMAGECENTER is False: - raise YouQuPluginInstalledError("youqu-imagecenter-rpc") + raise YouQuPluginDependencyError("youqu-imagecenter-rpc") from youqu3.mkmixin import MouseKeyChainMixin diff --git a/youqu3/mousekey.py b/youqu3/mousekey.py index 303422a..5e673d7 100644 --- a/youqu3/mousekey.py +++ b/youqu3/mousekey.py @@ -1,4 +1,4 @@ -from youqu3.exception import YouQuPluginInstalledError +from youqu3.exception import YouQuPluginDependencyError try: from youqu_mousekey import MouseKey as MouseKey @@ -8,4 +8,4 @@ HAS_MOUSEKEY = False if HAS_MOUSEKEY is False: - raise YouQuPluginInstalledError("youqu-mousekey") + raise YouQuPluginDependencyError("youqu-mousekey") diff --git a/youqu3/ocr.py b/youqu3/ocr.py index 95c67e6..0e8504d 100644 --- a/youqu3/ocr.py +++ b/youqu3/ocr.py @@ -1,6 +1,6 @@ import random -from youqu3.exception import YouQuPluginInstalledError +from youqu3.exception import YouQuPluginDependencyError try: from pdocr_rpc import OCR as _OCR @@ -13,7 +13,7 @@ HAS_OCR = False if HAS_OCR is False: - raise YouQuPluginInstalledError("pdocr-rpc") + raise YouQuPluginDependencyError("pdocr-rpc") from youqu3.mkmixin import MouseKeyChainMixin diff --git a/youqu3/plugin.py b/youqu3/plugin.py index cdf16f8..1cfadde 100644 --- a/youqu3/plugin.py +++ b/youqu3/plugin.py @@ -24,7 +24,7 @@ def page(): try: from playwright.sync_api import sync_playwright except ImportError: - raise exception.YouQuPluginInstalledError("playwright") + raise exception.YouQuPluginDependencyError("playwright") driver = sync_playwright().start() browser = driver.chromium.launch_persistent_context( user_data_dir=setting.USER_DATE_DIR, diff --git a/youqu3/requests.py b/youqu3/requests.py index 13f63df..8c08d5c 100644 --- a/youqu3/requests.py +++ b/youqu3/requests.py @@ -1,7 +1,7 @@ from funnylog.conf import setting as log_setting from youqu3 import log -from youqu3.exception import YouQuPluginInstalledError +from youqu3.exception import YouQuPluginDependencyError try: import requests @@ -11,7 +11,7 @@ HAS_REQUESTS = False if HAS_REQUESTS is False: - raise YouQuPluginInstalledError("requests") + raise YouQuPluginDependencyError("requests") log_setting.CLASS_NAME_ENDSWITH = "Requests" diff --git a/youqu3/ui.py b/youqu3/ui.py index fc63bef..be45e3f 100644 --- a/youqu3/ui.py +++ b/youqu3/ui.py @@ -1,10 +1,10 @@ -from youqu3.exception import YouQuPluginInstalledError +from youqu3.exception import YouQuPluginDependencyError try: from youqu_button_center import ButtonCenter as _ButtonCenter except ImportError: - raise YouQuPluginInstalledError("youqu-button-center") + raise YouQuPluginDependencyError("youqu-button-center") from youqu3.mkmixin import MouseKeyChainMixin diff --git a/youqu3/webui.py b/youqu3/webui.py index 4f23f7d..276a2aa 100644 --- a/youqu3/webui.py +++ b/youqu3/webui.py @@ -6,7 +6,7 @@ from typing import Union from youqu3 import setting -from youqu3.exception import YouQuPluginInstalledError +from youqu3.exception import YouQuPluginDependencyError try: from playwright.sync_api import sync_playwright @@ -18,7 +18,7 @@ from playwright.sync_api import PageAssertions from playwright.sync_api import APIResponseAssertions except ImportError: - raise YouQuPluginInstalledError("playwright") + raise YouQuPluginDependencyError("playwright") class WebUI: