style: format and sort import with ruff

This commit is contained in:
100gle
2023-06-07 14:05:17 +08:00
parent 55f8cdc7b1
commit 620d1bbe5c
51 changed files with 95 additions and 102 deletions

View File

@@ -1,6 +1,6 @@
import logging
import uvicorn
import uvicorn
from module.api import router
from module.conf import settings, setup_logger

View File

@@ -1,6 +1,6 @@
import logging
import time
import threading
import time
logger = logging.getLogger(__name__)
lock = threading.Lock()

View File

@@ -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

View File

@@ -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]

View File

@@ -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__)

View File

@@ -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)):

View File

@@ -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)):

View File

@@ -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

View File

@@ -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__)

View File

@@ -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")

View File

@@ -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:

View File

@@ -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"

View File

@@ -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:

View File

@@ -1,6 +1,5 @@
# -*- encoding: utf-8 -*-
from urllib.parse import urlparse, parse_qs
from urllib.parse import parse_qs, urlparse
DEFAULT_SETTINGS = {
"program": {

View File

@@ -1,5 +1,5 @@
import os
import logging
import os
from .config import settings

View File

@@ -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"""

View File

@@ -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__)

View File

@@ -1,6 +1,6 @@
import asyncio
import os.path
import threading
import asyncio
from module.checker import Checker

View File

@@ -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):

View File

@@ -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__)

View File

@@ -1,7 +1,6 @@
import logging
import os
import sqlite3
import logging
from module.conf import DATA_PATH

View File

@@ -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__)

View File

@@ -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__)

View File

@@ -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

View File

@@ -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__)

View File

@@ -1,5 +1,5 @@
import re
import logging
import re
from module.conf import settings
from module.models import BangumiData

View File

@@ -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__)

View File

@@ -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__)

View File

@@ -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__)

View File

@@ -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

View File

@@ -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")

View File

@@ -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

View File

@@ -1,9 +1,9 @@
import logging
import socket
import time
import requests
import socket
import socks
import logging
from module.conf import settings

View File

@@ -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__)

View File

@@ -1,6 +1,6 @@
import logging
from module.network import RequestContent
from module.network import RequestContent
logger = logging.getLogger(__name__)

View File

@@ -1,4 +1,5 @@
import logging
from module.network import RequestContent
logger = logging.getLogger(__name__)

View File

@@ -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

View File

@@ -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

View File

@@ -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__)

View File

@@ -1,4 +1,3 @@
from .analyser import RSSAnalyser
analyser = RSSAnalyser()

View File

@@ -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__)

View File

@@ -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__)

View File

@@ -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):

View File

@@ -1,5 +1,5 @@
from module.network import RequestContent
from module.conf import settings
from module.network import RequestContent
class RSSSearcher(RequestContent):

View File

@@ -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",

View File

@@ -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

View File

@@ -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")

View File

@@ -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"

View File

@@ -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():

View File

@@ -1,5 +1,5 @@
import logging
from .json_config import save, load
from .json_config import load, save
logger = logging.getLogger(__name__)

View File

@@ -1,4 +1,5 @@
import json
import requests