diff options
| -rw-r--r-- | ATRI/plugins/essential.py | 25 | ||||
| -rw-r--r-- | ATRI/utils/check_update.py | 14 |
2 files changed, 21 insertions, 18 deletions
diff --git a/ATRI/plugins/essential.py b/ATRI/plugins/essential.py index b0c1d02..d1c8e09 100644 --- a/ATRI/plugins/essential.py +++ b/ATRI/plugins/essential.py @@ -51,20 +51,21 @@ TEMP_PATH.mkdir(parents=True, exist_ok=True) @driver.on_startup async def startup(): + await init_database() + log.info(f"Now running: {ATRI.__version__}") - try: - log.info("Starting to check update...") - log.info(await CheckUpdate.show_latest_commit_info()) - sleep(1) + log.info("Starting to check update...") + commit_info = await CheckUpdate.show_latest_commit_info() + if commit_info: + log.info(commit_info) - l_v, l_v_t = await CheckUpdate.show_latest_version() + l_v, l_v_t = await CheckUpdate.show_latest_version() + if l_v and l_v_t: if l_v != ATRI.__version__: - log.warning("New version has been released, please update.") - log.warning(f"Latest version: {l_v} Update time: {l_v_t}") + log.warning("新版本已发布, 请更新.") + log.warning(f"最新版本: {l_v} 更新时间: {l_v_t}") sleep(3) - except Exception: - log.error("检查 更新/最新推送 失败...") if not scheduler.running: scheduler.start() @@ -75,11 +76,9 @@ async def startup(): @driver.on_shutdown async def shutdown(): - log.info("Thanks for using.") - + await close_database_connection() -driver.on_startup(init_database) -driver.on_shutdown(close_database_connection) + log.info("Thanks for using.") @run_preprocessor diff --git a/ATRI/utils/check_update.py b/ATRI/utils/check_update.py index 16b61ad..49a8f06 100644 --- a/ATRI/utils/check_update.py +++ b/ATRI/utils/check_update.py @@ -1,4 +1,4 @@ -from ATRI.exceptions import RequestError +from ATRI.log import logger as log from . import request @@ -23,12 +23,14 @@ class CheckUpdate: try: data = await cls._get_commits_info() except Exception: - raise RequestError("Getting commit info timeout...") + log.error("获取最新推送信息失败...") + return str() try: commit_data: dict = data[0] except Exception: - raise Exception("GitHub has been error!!!") + log.error("GitHub 数据结构已更改, 请前往仓库提交 Issue.") + return str() c_info = commit_data["commit"] c_msg = c_info["message"] @@ -42,12 +44,14 @@ class CheckUpdate: try: data = await cls._get_release_info() except Exception: - raise RequestError("Getting release list timeout...") + log.error("获取发布列表失败...") + return str(), str() try: release_data: dict = data[0] except Exception: - raise Exception("GitHub has been error!!!") + log.error("GitHub 数据结构已更改, 请前往仓库提交 Issue.") + return str(), str() l_v = release_data["tag_name"] l_v_t = release_data["published_at"] |