From 620d1bbe5cb3304c99716a058a7d9af0e4dc59c8 Mon Sep 17 00:00:00 2001 From: 100gle Date: Wed, 7 Jun 2023 14:05:17 +0800 Subject: [PATCH] style: format and sort import with ruff --- src/main.py | 2 +- src/module/ab_decorator/__init__.py | 2 +- src/module/api/auth.py | 4 ++-- src/module/api/bangumi.py | 6 +++--- src/module/api/config.py | 4 ++-- src/module/api/download.py | 8 ++++---- src/module/api/log.py | 5 +++-- src/module/api/program.py | 5 ++--- src/module/api/proxy.py | 7 +++---- src/module/api/web.py | 5 ++--- src/module/checker/checker.py | 2 +- src/module/conf/__init__.py | 3 +-- src/module/conf/config.py | 6 ++++-- src/module/conf/const.py | 3 +-- src/module/conf/log.py | 2 +- src/module/core/program.py | 8 ++++---- src/module/core/rss_feed.py | 2 +- src/module/core/status.py | 2 +- src/module/core/sub_thread.py | 10 +++++----- src/module/database/bangumi.py | 2 +- src/module/database/connector.py | 3 +-- src/module/database/user.py | 3 +-- src/module/downloader/client/aria2_downloader.py | 4 +--- src/module/downloader/client/qb_downloader.py | 2 +- src/module/downloader/download_client.py | 6 +++--- src/module/downloader/path.py | 2 +- src/module/manager/collector.py | 2 +- src/module/manager/renamer.py | 8 +++----- src/module/manager/torrent.py | 4 ++-- src/module/models/__init__.py | 5 ++--- src/module/models/bangumi.py | 3 ++- src/module/network/request_contents.py | 3 ++- src/module/network/request_url.py | 4 ++-- src/module/notification/notification.py | 5 ++--- src/module/notification/plugin/bark.py | 2 +- src/module/notification/plugin/wecom.py | 1 + src/module/parser/analyser/__init__.py | 2 +- src/module/parser/analyser/torrent_parser.py | 4 ++-- src/module/parser/title_parser.py | 6 +++--- src/module/rss/__init__.py | 1 - src/module/rss/analyser.py | 8 ++++---- src/module/rss/filter.py | 4 ++-- src/module/rss/poller.py | 6 +++--- src/module/rss/searcher.py | 2 +- src/module/searcher/searcher.py | 4 ++-- src/module/security/__init__.py | 2 +- src/module/security/api.py | 4 ++-- src/module/security/jwt.py | 4 ++-- src/module/update/data_migration.py | 2 +- src/module/utils/bangumi_data.py | 2 +- src/module/utils/json_config.py | 1 + 51 files changed, 95 insertions(+), 102 deletions(-) diff --git a/src/main.py b/src/main.py index c0229948..66e5a4d4 100644 --- a/src/main.py +++ b/src/main.py @@ -1,6 +1,6 @@ import logging -import uvicorn +import uvicorn from module.api import router from module.conf import settings, setup_logger diff --git a/src/module/ab_decorator/__init__.py b/src/module/ab_decorator/__init__.py index f25a083b..469a6413 100644 --- a/src/module/ab_decorator/__init__.py +++ b/src/module/ab_decorator/__init__.py @@ -1,6 +1,6 @@ import logging -import time import threading +import time logger = logging.getLogger(__name__) lock = threading.Lock() diff --git a/src/module/api/auth.py b/src/module/api/auth.py index bbea2090..1dd63859 100644 --- a/src/module/api/auth.py +++ b/src/module/api/auth.py @@ -3,13 +3,13 @@ from datetime import timedelta from fastapi import Depends, HTTPException, status from fastapi.security import OAuth2PasswordRequestForm +from module.models.user import User from module.security import ( + auth_user, create_access_token, get_current_user, update_user_info, - auth_user, ) -from module.models.user import User from .program import router diff --git a/src/module/api/bangumi.py b/src/module/api/bangumi.py index 8091890a..8be82d41 100644 --- a/src/module/api/bangumi.py +++ b/src/module/api/bangumi.py @@ -1,12 +1,12 @@ from fastapi import Depends, HTTPException, status from fastapi.responses import JSONResponse -from .log import router - -from module.models import BangumiData from module.manager import TorrentManager +from module.models import BangumiData from module.security import get_current_user +from .log import router + @router.get( "/api/v1/bangumi/getAll", tags=["bangumi"], response_model=list[BangumiData] diff --git a/src/module/api/config.py b/src/module/api/config.py index b034d9d0..98f8da3c 100644 --- a/src/module/api/config.py +++ b/src/module/api/config.py @@ -2,12 +2,12 @@ import logging from fastapi import Depends, HTTPException, status -from .bangumi import router - from module.conf import settings from module.models import Config from module.security import get_current_user +from .bangumi import router + logger = logging.getLogger(__name__) diff --git a/src/module/api/download.py b/src/module/api/download.py index 6ce80569..64c0da1d 100644 --- a/src/module/api/download.py +++ b/src/module/api/download.py @@ -1,13 +1,13 @@ from fastapi import Depends, HTTPException, status -from .config import router - -from module.models.api import * -from module.models import BangumiData from module.manager import SeasonCollector +from module.models import BangumiData +from module.models.api import * from module.rss import analyser from module.security import get_current_user +from .config import router + @router.post("/api/v1/download/analysis", tags=["download"]) async def analysis(link: RssLink, current_user=Depends(get_current_user)): diff --git a/src/module/api/log.py b/src/module/api/log.py index 8e7e65d7..13a6ad44 100644 --- a/src/module/api/log.py +++ b/src/module/api/log.py @@ -1,11 +1,12 @@ import os -from fastapi import Response, HTTPException, Depends, status -from .auth import router +from fastapi import Depends, HTTPException, Response, status from module.conf import LOG_PATH from module.security import get_current_user +from .auth import router + @router.get("/api/v1/log", tags=["log"]) async def get_log(current_user=Depends(get_current_user)): diff --git a/src/module/api/program.py b/src/module/api/program.py index d8cf46c4..1b72035e 100644 --- a/src/module/api/program.py +++ b/src/module/api/program.py @@ -1,9 +1,8 @@ -import signal import logging import os +import signal -from fastapi import HTTPException, status, Depends -from fastapi import FastAPI +from fastapi import Depends, FastAPI, HTTPException, status from module.core import Program from module.security import get_current_user diff --git a/src/module/api/proxy.py b/src/module/api/proxy.py index c9b43b8a..86aeebf6 100644 --- a/src/module/api/proxy.py +++ b/src/module/api/proxy.py @@ -1,14 +1,13 @@ -import re import logging +import re -from fastapi.responses import Response from fastapi.exceptions import HTTPException - -from .download import router +from fastapi.responses import Response from module.conf import settings from module.network import RequestContent +from .download import router logger = logging.getLogger(__name__) diff --git a/src/module/api/web.py b/src/module/api/web.py index 37e6afcf..62836441 100644 --- a/src/module/api/web.py +++ b/src/module/api/web.py @@ -1,12 +1,11 @@ from fastapi import Request -from fastapi.responses import HTMLResponse, RedirectResponse, FileResponse +from fastapi.responses import FileResponse, HTMLResponse, RedirectResponse from fastapi.staticfiles import StaticFiles from fastapi.templating import Jinja2Templates -from .proxy import router - from module.conf import VERSION +from .proxy import router if VERSION != "DEV_VERSION": router.mount("/assets", StaticFiles(directory="templates/assets"), name="assets") diff --git a/src/module/checker/checker.py b/src/module/checker/checker.py index fc2c46d8..bb2ed808 100644 --- a/src/module/checker/checker.py +++ b/src/module/checker/checker.py @@ -1,8 +1,8 @@ import os.path +from module.conf import DATA_PATH, settings from module.downloader import DownloadClient from module.network import RequestContent -from module.conf import settings, DATA_PATH class Checker: diff --git a/src/module/conf/__init__.py b/src/module/conf/__init__.py index 04b72fd9..afb47703 100644 --- a/src/module/conf/__init__.py +++ b/src/module/conf/__init__.py @@ -1,6 +1,5 @@ -from .log import setup_logger, LOG_PATH from .config import VERSION, settings - +from .log import LOG_PATH, setup_logger TMDB_API = "32b19d6a05b512190a056fa4e747cbbc" DATA_PATH = "data/data.db" diff --git a/src/module/conf/config.py b/src/module/conf/config.py index 90503783..0532a511 100644 --- a/src/module/conf/config.py +++ b/src/module/conf/config.py @@ -1,11 +1,13 @@ import json -import os import logging +import os + from dotenv import load_dotenv -from .const import ENV_TO_ATTR from module.models.config import Config +from .const import ENV_TO_ATTR + logger = logging.getLogger(__name__) try: diff --git a/src/module/conf/const.py b/src/module/conf/const.py index e8b5634f..c48409d7 100644 --- a/src/module/conf/const.py +++ b/src/module/conf/const.py @@ -1,6 +1,5 @@ # -*- encoding: utf-8 -*- -from urllib.parse import urlparse, parse_qs - +from urllib.parse import parse_qs, urlparse DEFAULT_SETTINGS = { "program": { diff --git a/src/module/conf/log.py b/src/module/conf/log.py index 8ba45ce1..2d503e74 100644 --- a/src/module/conf/log.py +++ b/src/module/conf/log.py @@ -1,5 +1,5 @@ -import os import logging +import os from .config import settings diff --git a/src/module/core/program.py b/src/module/core/program.py index 9e6a2627..05d7ad58 100644 --- a/src/module/core/program.py +++ b/src/module/core/program.py @@ -1,11 +1,11 @@ import logging -from .sub_thread import RenameThread, RSSThread -from .rss_feed import add_rss_feed - -from module.conf import settings, VERSION +from module.conf import VERSION, settings from module.update import data_migration +from .rss_feed import add_rss_feed +from .sub_thread import RenameThread, RSSThread + logger = logging.getLogger(__name__) figlet = r""" diff --git a/src/module/core/rss_feed.py b/src/module/core/rss_feed.py index e1f14653..82006602 100644 --- a/src/module/core/rss_feed.py +++ b/src/module/core/rss_feed.py @@ -1,7 +1,7 @@ import logging -from module.downloader import DownloadClient from module.conf import settings +from module.downloader import DownloadClient logger = logging.getLogger(__name__) diff --git a/src/module/core/status.py b/src/module/core/status.py index de42599b..6f056463 100644 --- a/src/module/core/status.py +++ b/src/module/core/status.py @@ -1,6 +1,6 @@ +import asyncio import os.path import threading -import asyncio from module.checker import Checker diff --git a/src/module/core/sub_thread.py b/src/module/core/sub_thread.py index 33f9d1c5..c9ddb22e 100644 --- a/src/module/core/sub_thread.py +++ b/src/module/core/sub_thread.py @@ -1,14 +1,14 @@ import threading import time -from .status import ProgramStatus - -from module.rss import analyser +from module.conf import settings +from module.database import BangumiDatabase from module.downloader import DownloadClient from module.manager import Renamer, eps_complete from module.notification import PostNotification -from module.database import BangumiDatabase -from module.conf import settings +from module.rss import analyser + +from .status import ProgramStatus class RSSThread(ProgramStatus): diff --git a/src/module/database/bangumi.py b/src/module/database/bangumi.py index f2129826..e0e8c8be 100644 --- a/src/module/database/bangumi.py +++ b/src/module/database/bangumi.py @@ -1,8 +1,8 @@ import logging +from module.ab_decorator import locked from module.database.connector import DataConnector from module.models import BangumiData -from module.ab_decorator import locked logger = logging.getLogger(__name__) diff --git a/src/module/database/connector.py b/src/module/database/connector.py index dbd87c04..a72d92e8 100644 --- a/src/module/database/connector.py +++ b/src/module/database/connector.py @@ -1,7 +1,6 @@ +import logging import os import sqlite3 -import logging - from module.conf import DATA_PATH diff --git a/src/module/database/user.py b/src/module/database/user.py index 76dcade4..69dd9dea 100644 --- a/src/module/database/user.py +++ b/src/module/database/user.py @@ -3,9 +3,8 @@ import logging from fastapi import HTTPException from module.database.connector import DataConnector - -from module.security.jwt import get_password_hash, verify_password from module.models.user import User +from module.security.jwt import get_password_hash, verify_password logger = logging.getLogger(__name__) diff --git a/src/module/downloader/client/aria2_downloader.py b/src/module/downloader/client/aria2_downloader.py index 8cfb5aea..7e755f11 100644 --- a/src/module/downloader/client/aria2_downloader.py +++ b/src/module/downloader/client/aria2_downloader.py @@ -1,11 +1,9 @@ import logging import time -from aria2p import Client, ClientException, API - +from aria2p import API, Client, ClientException from module.conf import settings - from module.downloader.exceptions import ConflictError logger = logging.getLogger(__name__) diff --git a/src/module/downloader/client/qb_downloader.py b/src/module/downloader/client/qb_downloader.py index fc5b622e..9dda692e 100644 --- a/src/module/downloader/client/qb_downloader.py +++ b/src/module/downloader/client/qb_downloader.py @@ -3,9 +3,9 @@ import time from qbittorrentapi import Client, LoginFailed from qbittorrentapi.exceptions import ( + APIConnectionError, Conflict409Error, Forbidden403Error, - APIConnectionError, ) from module.ab_decorator import qb_connect_failed_wait diff --git a/src/module/downloader/download_client.py b/src/module/downloader/download_client.py index c30c1cd3..32db35d6 100644 --- a/src/module/downloader/download_client.py +++ b/src/module/downloader/download_client.py @@ -1,9 +1,9 @@ import logging -from .path import TorrentPath - -from module.models import BangumiData from module.conf import settings +from module.models import BangumiData + +from .path import TorrentPath logger = logging.getLogger(__name__) diff --git a/src/module/downloader/path.py b/src/module/downloader/path.py index e0ed8043..30aa0400 100644 --- a/src/module/downloader/path.py +++ b/src/module/downloader/path.py @@ -1,5 +1,5 @@ -import re import logging +import re from module.conf import settings from module.models import BangumiData diff --git a/src/module/manager/collector.py b/src/module/manager/collector.py index 7350108a..2ff955a0 100644 --- a/src/module/manager/collector.py +++ b/src/module/manager/collector.py @@ -2,9 +2,9 @@ import logging from fastapi.responses import JSONResponse +from module.database import BangumiDatabase from module.downloader import DownloadClient from module.models import BangumiData -from module.database import BangumiDatabase from module.searcher import SearchTorrent logger = logging.getLogger(__name__) diff --git a/src/module/manager/renamer.py b/src/module/manager/renamer.py index 6cfc9b8b..38052bd9 100644 --- a/src/module/manager/renamer.py +++ b/src/module/manager/renamer.py @@ -1,11 +1,9 @@ import logging -from module.downloader import DownloadClient - -from module.parser import TitleParser -from module.models import SubtitleFile, EpisodeFile, Notification from module.conf import settings - +from module.downloader import DownloadClient +from module.models import EpisodeFile, Notification, SubtitleFile +from module.parser import TitleParser logger = logging.getLogger(__name__) diff --git a/src/module/manager/torrent.py b/src/module/manager/torrent.py index 6d43be6f..53eede58 100644 --- a/src/module/manager/torrent.py +++ b/src/module/manager/torrent.py @@ -1,10 +1,10 @@ import logging + from fastapi.responses import JSONResponse +from module.database import BangumiDatabase from module.downloader import DownloadClient from module.models import BangumiData -from module.database import BangumiDatabase - logger = logging.getLogger(__name__) diff --git a/src/module/models/__init__.py b/src/module/models/__init__.py index 823d65c7..a73f18ed 100644 --- a/src/module/models/__init__.py +++ b/src/module/models/__init__.py @@ -1,6 +1,5 @@ from .bangumi import * from .config import Config -from .torrent import EpisodeFile, SubtitleFile -from .user import UserLogin -from .torrent import TorrentBase from .rss import RSSTorrents +from .torrent import EpisodeFile, SubtitleFile, TorrentBase +from .user import UserLogin diff --git a/src/module/models/bangumi.py b/src/module/models/bangumi.py index f1c03369..08774df1 100644 --- a/src/module/models/bangumi.py +++ b/src/module/models/bangumi.py @@ -1,6 +1,7 @@ -from pydantic import BaseModel, Field from dataclasses import dataclass +from pydantic import BaseModel, Field + class BangumiData(BaseModel): id: int = Field(0, alias="id", title="番剧ID") diff --git a/src/module/network/request_contents.py b/src/module/network/request_contents.py index 0c2096b6..597c2189 100644 --- a/src/module/network/request_contents.py +++ b/src/module/network/request_contents.py @@ -4,9 +4,10 @@ from dataclasses import dataclass from bs4 import BeautifulSoup +from module.conf import settings + from .request_url import RequestURL from .site import mikan_parser -from module.conf import settings @dataclass diff --git a/src/module/network/request_url.py b/src/module/network/request_url.py index 16da3d4c..51730f66 100644 --- a/src/module/network/request_url.py +++ b/src/module/network/request_url.py @@ -1,9 +1,9 @@ +import logging +import socket import time import requests -import socket import socks -import logging from module.conf import settings diff --git a/src/module/notification/notification.py b/src/module/notification/notification.py index 22bde17a..72d93a5b 100644 --- a/src/module/notification/notification.py +++ b/src/module/notification/notification.py @@ -1,11 +1,10 @@ import logging -from .plugin import * - -from module.models import Notification from module.conf import settings from module.database import BangumiDatabase +from module.models import Notification +from .plugin import * logger = logging.getLogger(__name__) diff --git a/src/module/notification/plugin/bark.py b/src/module/notification/plugin/bark.py index f405ab4b..aa4cf553 100644 --- a/src/module/notification/plugin/bark.py +++ b/src/module/notification/plugin/bark.py @@ -1,6 +1,6 @@ import logging -from module.network import RequestContent +from module.network import RequestContent logger = logging.getLogger(__name__) diff --git a/src/module/notification/plugin/wecom.py b/src/module/notification/plugin/wecom.py index c56e97e2..f84dbba4 100644 --- a/src/module/notification/plugin/wecom.py +++ b/src/module/notification/plugin/wecom.py @@ -1,4 +1,5 @@ import logging + from module.network import RequestContent logger = logging.getLogger(__name__) diff --git a/src/module/parser/analyser/__init__.py b/src/module/parser/analyser/__init__.py index 433a62d7..8465565c 100644 --- a/src/module/parser/analyser/__init__.py +++ b/src/module/parser/analyser/__init__.py @@ -1,3 +1,3 @@ from .raw_parser import raw_parser -from .torrent_parser import torrent_parser from .tmdb_parser import tmdb_parser +from .torrent_parser import torrent_parser diff --git a/src/module/parser/analyser/torrent_parser.py b/src/module/parser/analyser/torrent_parser.py index ba2a1880..3b473899 100644 --- a/src/module/parser/analyser/torrent_parser.py +++ b/src/module/parser/analyser/torrent_parser.py @@ -1,7 +1,7 @@ -import re import logging -import os.path as unix_path import ntpath as win_path +import os.path as unix_path +import re from module.models import EpisodeFile, SubtitleFile diff --git a/src/module/parser/title_parser.py b/src/module/parser/title_parser.py index 1f1ffd4b..3b8e54bc 100644 --- a/src/module/parser/title_parser.py +++ b/src/module/parser/title_parser.py @@ -1,9 +1,9 @@ import logging -from .analyser import raw_parser, torrent_parser, tmdb_parser - -from module.models import BangumiData from module.conf import settings +from module.models import BangumiData + +from .analyser import raw_parser, tmdb_parser, torrent_parser logger = logging.getLogger(__name__) diff --git a/src/module/rss/__init__.py b/src/module/rss/__init__.py index 0b9167ea..f61d269a 100644 --- a/src/module/rss/__init__.py +++ b/src/module/rss/__init__.py @@ -1,4 +1,3 @@ from .analyser import RSSAnalyser - analyser = RSSAnalyser() diff --git a/src/module/rss/analyser.py b/src/module/rss/analyser.py index 9ae35b37..75097432 100644 --- a/src/module/rss/analyser.py +++ b/src/module/rss/analyser.py @@ -1,11 +1,11 @@ -import re import logging +import re +from module.conf import settings +from module.database import BangumiDatabase +from module.models import BangumiData from module.network import RequestContent, TorrentInfo from module.parser import TitleParser -from module.models import BangumiData -from module.database import BangumiDatabase -from module.conf import settings logger = logging.getLogger(__name__) diff --git a/src/module/rss/filter.py b/src/module/rss/filter.py index 8255dbde..e70d4602 100644 --- a/src/module/rss/filter.py +++ b/src/module/rss/filter.py @@ -1,10 +1,10 @@ import logging +from module.conf import settings from module.database import BangumiDatabase from module.downloader import DownloadClient -from module.network import RequestContent -from module.conf import settings from module.models import BangumiData +from module.network import RequestContent logger = logging.getLogger(__name__) diff --git a/src/module/rss/poller.py b/src/module/rss/poller.py index 604fc0c8..9893d3be 100644 --- a/src/module/rss/poller.py +++ b/src/module/rss/poller.py @@ -1,9 +1,9 @@ import re -from module.database import RSSDatabase -from module.network import RequestContent, TorrentInfo -from module.models import BangumiData, RSSTorrents from module.conf import settings +from module.database import RSSDatabase +from module.models import BangumiData, RSSTorrents +from module.network import RequestContent, TorrentInfo class RSSPoller(RSSDatabase): diff --git a/src/module/rss/searcher.py b/src/module/rss/searcher.py index 0d547bd2..de83ef13 100644 --- a/src/module/rss/searcher.py +++ b/src/module/rss/searcher.py @@ -1,5 +1,5 @@ -from module.network import RequestContent from module.conf import settings +from module.network import RequestContent class RSSSearcher(RequestContent): diff --git a/src/module/searcher/searcher.py b/src/module/searcher/searcher.py index 621022eb..ecc32803 100644 --- a/src/module/searcher/searcher.py +++ b/src/module/searcher/searcher.py @@ -1,6 +1,6 @@ -from module.searcher.plugin import search_url -from module.network import RequestContent from module.models import BangumiData, TorrentBase +from module.network import RequestContent +from module.searcher.plugin import search_url SEARCH_KEY = [ "group_name", diff --git a/src/module/security/__init__.py b/src/module/security/__init__.py index 28f5d20e..7ce58e8c 100644 --- a/src/module/security/__init__.py +++ b/src/module/security/__init__.py @@ -1,2 +1,2 @@ +from .api import auth_user, get_current_user, get_token_data, update_user_info from .jwt import create_access_token -from .api import get_current_user, get_token_data, auth_user, update_user_info diff --git a/src/module/security/api.py b/src/module/security/api.py index 14282171..368abb0e 100644 --- a/src/module/security/api.py +++ b/src/module/security/api.py @@ -1,11 +1,11 @@ from fastapi import Depends, HTTPException, status from fastapi.security import OAuth2PasswordBearer -from .jwt import verify_token - from module.database.user import AuthDB from module.models.user import User +from .jwt import verify_token + oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/v1/auth/login") diff --git a/src/module/security/jwt.py b/src/module/security/jwt.py index 23f711fd..78ca595d 100644 --- a/src/module/security/jwt.py +++ b/src/module/security/jwt.py @@ -1,7 +1,7 @@ from datetime import datetime, timedelta -from passlib.context import CryptContext -from jose import jwt, JWTError +from jose import JWTError, jwt +from passlib.context import CryptContext app_pwd_key = "auto_bangumi" app_pwd_algorithm = "HS256" diff --git a/src/module/update/data_migration.py b/src/module/update/data_migration.py index 21dd72f6..0540ea64 100644 --- a/src/module/update/data_migration.py +++ b/src/module/update/data_migration.py @@ -1,8 +1,8 @@ import os +from module.database import BangumiDatabase from module.models import BangumiData from module.utils import json_config -from module.database import BangumiDatabase def data_migration(): diff --git a/src/module/utils/bangumi_data.py b/src/module/utils/bangumi_data.py index d688be50..aeda2a3d 100644 --- a/src/module/utils/bangumi_data.py +++ b/src/module/utils/bangumi_data.py @@ -1,5 +1,5 @@ import logging -from .json_config import save, load +from .json_config import load, save logger = logging.getLogger(__name__) diff --git a/src/module/utils/json_config.py b/src/module/utils/json_config.py index fdc974ca..2b060935 100644 --- a/src/module/utils/json_config.py +++ b/src/module/utils/json_config.py @@ -1,4 +1,5 @@ import json + import requests