From 9ebeff70994191abe6052e53bb58541f08917f5a Mon Sep 17 00:00:00 2001 From: Kyomotoi Date: Sun, 20 Mar 2022 09:06:49 +0800 Subject: =?UTF-8?q?=E2=9C=A8=20=E6=B7=BB=E5=8A=A0=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/utils/check_update.py | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 ATRI/utils/check_update.py (limited to 'ATRI/utils') diff --git a/ATRI/utils/check_update.py b/ATRI/utils/check_update.py new file mode 100644 index 0000000..b2f8b53 --- /dev/null +++ b/ATRI/utils/check_update.py @@ -0,0 +1,58 @@ +from ATRI.exceptions import RequestError + +from . import request + + +REPO_COMMITS_URL = "https://api.github.com/repos/Kyomotoi/ATRI/commits" +REPO_RELEASE_URL = "https://api.github.com/repos/Kyomotoi/ATRI/releases" + + +class CheckUpdate: + + @staticmethod + async def _get_commits_info() -> dict: + req = await request.get(REPO_COMMITS_URL) + return req.json() + + @staticmethod + async def _get_release_info() -> dict: + req = await request.get(REPO_RELEASE_URL) + return req.json() + + @classmethod + async def show_latest_commit_info(cls) -> str: + try: + data = await cls._get_commits_info() + except RequestError: + raise RequestError("Getting commit info timeout...") + + try: + commit_data: dict = data[0] + except Exception: + raise Exception("GitHub has been error!!!") + + c_info = commit_data["commit"] + c_msg = c_info["message"] + c_sha = commit_data["sha"][0:5] + c_time = c_info["author"]["date"] + + return f"Latest commit {c_msg} | sha: {c_sha} | time: {c_time}" + + @classmethod + async def show_latest_version(cls) -> tuple: + try: + data = await cls._get_release_info() + except RequestError: + raise RequestError("Getting release list timeout...") + + try: + release_data: dict = data[0] + except Exception: + raise Exception("GitHub has been error!!!") + + l_v = release_data["tag_name"] + l_v_t = release_data["published_at"] + return l_v, l_v_t + + + -- cgit v1.2.3 From cc5c0fab220776508eab9ac6831f8efa1010d083 Mon Sep 17 00:00:00 2001 From: Lint Action Date: Sun, 20 Mar 2022 01:09:34 +0000 Subject: =?UTF-8?q?:rotating=5Flight:=20=E8=87=AA=E5=8A=A8=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/utils/check_update.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'ATRI/utils') diff --git a/ATRI/utils/check_update.py b/ATRI/utils/check_update.py index b2f8b53..a8575ab 100644 --- a/ATRI/utils/check_update.py +++ b/ATRI/utils/check_update.py @@ -8,12 +8,11 @@ REPO_RELEASE_URL = "https://api.github.com/repos/Kyomotoi/ATRI/releases" class CheckUpdate: - @staticmethod async def _get_commits_info() -> dict: req = await request.get(REPO_COMMITS_URL) return req.json() - + @staticmethod async def _get_release_info() -> dict: req = await request.get(REPO_RELEASE_URL) @@ -25,7 +24,7 @@ class CheckUpdate: data = await cls._get_commits_info() except RequestError: raise RequestError("Getting commit info timeout...") - + try: commit_data: dict = data[0] except Exception: @@ -44,15 +43,12 @@ class CheckUpdate: data = await cls._get_release_info() except RequestError: raise RequestError("Getting release list timeout...") - + try: release_data: dict = data[0] except Exception: raise Exception("GitHub has been error!!!") - + l_v = release_data["tag_name"] l_v_t = release_data["published_at"] return l_v, l_v_t - - - -- cgit v1.2.3 From 1caf5ae8bb3e0560451f967f276ff1291a80d1dd Mon Sep 17 00:00:00 2001 From: Kyomotoi Date: Mon, 4 Apr 2022 17:06:09 +0800 Subject: =?UTF-8?q?=F0=9F=A7=B1=20=E9=92=88=E5=AF=B9=20=20=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/utils/apscheduler.py | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'ATRI/utils') diff --git a/ATRI/utils/apscheduler.py b/ATRI/utils/apscheduler.py index 186ff8e..e1959c1 100644 --- a/ATRI/utils/apscheduler.py +++ b/ATRI/utils/apscheduler.py @@ -1,34 +1,13 @@ -""" -Fork from: https://github.com/nonebot/plugin-apscheduler -""" import logging from apscheduler.schedulers.asyncio import AsyncIOScheduler -from nonebot import get_driver -from nonebot.log import logger, LoguruHandler +from nonebot.log import LoguruHandler -apscheduler_autostart: bool = True -# apscheduler_config: dict = {"apscheduler.timezone": "Asia/Shanghai"} - - -driver = get_driver() scheduler = AsyncIOScheduler(timezone="Asia/Shanghai") -async def _start_scheduler(): - if not scheduler.running: - # scheduler.configure(apscheduler_config) - scheduler.start() - logger.info("Scheduler Started.") - - -if apscheduler_autostart: - driver.on_startup(_start_scheduler) - aps_logger = logging.getLogger("apscheduler") aps_logger.setLevel(logging.DEBUG) aps_logger.handlers.clear() aps_logger.addHandler(LoguruHandler()) - -from apscheduler.triggers.date import DateTrigger -- cgit v1.2.3 From f1ce42da9027f416561ecabe34e0f5592bdfdd3e Mon Sep 17 00:00:00 2001 From: Kyomotoi Date: Mon, 4 Apr 2022 17:08:28 +0800 Subject: =?UTF-8?q?=E2=9A=B0=EF=B8=8F=20=E6=B8=85=E9=99=A4=E6=9C=AA?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ATRI/utils/__init__.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'ATRI/utils') diff --git a/ATRI/utils/__init__.py b/ATRI/utils/__init__.py index 565de97..29c9f05 100644 --- a/ATRI/utils/__init__.py +++ b/ATRI/utils/__init__.py @@ -5,18 +5,15 @@ import yaml import aiofiles import time from pathlib import Path -from aiohttp import FormData from datetime import datetime from PIL import Image, ImageFile from aiofiles.threadpool.text import AsyncTextIOWrapper -from . import request - def timestamp2datetimestr(timestamp: int) -> str: format = "%Y-%m-%d %H:%M:%S" - timestamp = time.localtime(timestamp) - dt = time.strftime(format, timestamp) + tt = time.localtime(timestamp) + dt = time.strftime(format, tt) return dt -- cgit v1.2.3