diff --git a/app/api/endpoints/douban.py b/app/api/endpoints/douban.py index d0b0eb17..6aba525c 100644 --- a/app/api/endpoints/douban.py +++ b/app/api/endpoints/douban.py @@ -20,7 +20,7 @@ def start_douban_chain(): @router.get("/sync", summary="同步豆瓣想看", response_model=schemas.Response) -async def sync_douban( +def sync_douban( background_tasks: BackgroundTasks, _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ @@ -31,8 +31,8 @@ async def sync_douban( @router.get("/recognize/{doubanid}", summary="豆瓣ID识别", response_model=schemas.Context) -async def recognize_doubanid(doubanid: str, - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def recognize_doubanid(doubanid: str, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 根据豆瓣ID识别媒体信息 """ @@ -45,11 +45,11 @@ async def recognize_doubanid(doubanid: str, @router.get("/movies", summary="豆瓣电影", response_model=List[schemas.MediaInfo]) -async def douban_movies(sort: str = "R", - tags: str = "", - page: int = 1, - count: int = 30, - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def douban_movies(sort: str = "R", + tags: str = "", + page: int = 1, + count: int = 30, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 浏览豆瓣电影信息 """ @@ -65,11 +65,11 @@ async def douban_movies(sort: str = "R", @router.get("/tvs", summary="豆瓣剧集", response_model=List[schemas.MediaInfo]) -async def douban_tvs(sort: str = "R", - tags: str = "", - page: int = 1, - count: int = 30, - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def douban_tvs(sort: str = "R", + tags: str = "", + page: int = 1, + count: int = 30, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 浏览豆瓣剧集信息 """ @@ -86,9 +86,9 @@ async def douban_tvs(sort: str = "R", @router.get("/movie_top250", summary="豆瓣电影TOP250", response_model=List[schemas.MediaInfo]) -async def movie_top250(page: int = 1, - count: int = 30, - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def movie_top250(page: int = 1, + count: int = 30, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 浏览豆瓣剧集信息 """ @@ -97,9 +97,9 @@ async def movie_top250(page: int = 1, @router.get("/tv_weekly_chinese", summary="豆瓣国产剧集周榜", response_model=List[schemas.MediaInfo]) -async def tv_weekly_chinese(page: int = 1, - count: int = 30, - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def tv_weekly_chinese(page: int = 1, + count: int = 30, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 中国每周剧集口碑榜 """ @@ -108,9 +108,9 @@ async def tv_weekly_chinese(page: int = 1, @router.get("/tv_weekly_global", summary="豆瓣全球剧集周榜", response_model=List[schemas.MediaInfo]) -async def tv_weekly_global(page: int = 1, - count: int = 30, - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def tv_weekly_global(page: int = 1, + count: int = 30, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 全球每周剧集口碑榜 """ @@ -119,7 +119,7 @@ async def tv_weekly_global(page: int = 1, @router.get("/{doubanid}", summary="查询豆瓣详情", response_model=schemas.MediaInfo) -async def douban_info(doubanid: str, _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def douban_info(doubanid: str, _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 根据豆瓣ID查询豆瓣媒体信息 """ @@ -128,4 +128,3 @@ async def douban_info(doubanid: str, _: schemas.TokenPayload = Depends(verify_to return MediaInfo(douban_info=doubaninfo).to_dict() else: return schemas.MediaInfo() - diff --git a/app/api/endpoints/download.py b/app/api/endpoints/download.py index 9602addf..3d4263de 100644 --- a/app/api/endpoints/download.py +++ b/app/api/endpoints/download.py @@ -17,7 +17,7 @@ router = APIRouter() @router.get("/", summary="正在下载", response_model=List[schemas.DownloadingTorrent]) -async def read_downloading( +def read_downloading( _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 查询正在下载的任务 @@ -26,7 +26,7 @@ async def read_downloading( @router.post("/", summary="添加下载", response_model=schemas.Response) -async def add_downloading( +def add_downloading( media_in: schemas.MediaInfo, torrent_in: schemas.TorrentInfo, current_user: User = Depends(get_current_active_superuser)) -> Any: @@ -54,7 +54,7 @@ async def add_downloading( @router.post("/notexists", summary="查询缺失媒体信息", response_model=List[NotExistMediaInfo]) -async def exists(media_in: schemas.MediaInfo, +def exists(media_in: schemas.MediaInfo, _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 查询缺失媒体信息 @@ -88,7 +88,7 @@ async def exists(media_in: schemas.MediaInfo, @router.put("/{hashString}/start", summary="开始任务", response_model=schemas.Response) -async def start_downloading( +def start_downloading( hashString: str, _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ @@ -99,7 +99,7 @@ async def start_downloading( @router.put("/{hashString}/stop", summary="暂停任务", response_model=schemas.Response) -async def stop_downloading( +def stop_downloading( hashString: str, _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ @@ -110,7 +110,7 @@ async def stop_downloading( @router.delete("/{hashString}", summary="删除下载任务", response_model=schemas.Response) -async def remove_downloading( +def remove_downloading( hashString: str, _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ diff --git a/app/api/endpoints/history.py b/app/api/endpoints/history.py index 66022597..0e1c8554 100644 --- a/app/api/endpoints/history.py +++ b/app/api/endpoints/history.py @@ -15,10 +15,10 @@ router = APIRouter() @router.get("/download", summary="查询下载历史记录", response_model=List[schemas.DownloadHistory]) -async def download_history(page: int = 1, - count: int = 30, - db: Session = Depends(get_db), - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def download_history(page: int = 1, + count: int = 30, + db: Session = Depends(get_db), + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 查询下载历史记录 """ @@ -26,9 +26,9 @@ async def download_history(page: int = 1, @router.delete("/download", summary="删除下载历史记录", response_model=schemas.Response) -async def delete_download_history(history_in: schemas.DownloadHistory, - db: Session = Depends(get_db), - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def delete_download_history(history_in: schemas.DownloadHistory, + db: Session = Depends(get_db), + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 删除下载历史记录 """ @@ -37,11 +37,11 @@ async def delete_download_history(history_in: schemas.DownloadHistory, @router.get("/transfer", summary="查询转移历史记录", response_model=List[schemas.TransferHistory]) -async def transfer_history(title: str = None, - page: int = 1, - count: int = 30, - db: Session = Depends(get_db), - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def transfer_history(title: str = None, + page: int = 1, + count: int = 30, + db: Session = Depends(get_db), + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 查询转移历史记录 """ @@ -52,10 +52,10 @@ async def transfer_history(title: str = None, @router.delete("/transfer", summary="删除转移历史记录", response_model=schemas.Response) -async def delete_transfer_history(history_in: schemas.TransferHistory, - delete_file: bool = False, - db: Session = Depends(get_db), - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def delete_transfer_history(history_in: schemas.TransferHistory, + delete_file: bool = False, + db: Session = Depends(get_db), + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 删除转移历史记录 """ diff --git a/app/api/endpoints/login.py b/app/api/endpoints/login.py index 5307cc12..a86a217b 100644 --- a/app/api/endpoints/login.py +++ b/app/api/endpoints/login.py @@ -56,7 +56,7 @@ async def login_access_token( @router.get("/login/wallpaper", summary="Bing每日壁纸", response_model=schemas.Response) -async def bing_wallpaper() -> Any: +def bing_wallpaper() -> Any: """ 获取Bing每日壁纸 """ diff --git a/app/api/endpoints/media.py b/app/api/endpoints/media.py index f18fa734..9cab5056 100644 --- a/app/api/endpoints/media.py +++ b/app/api/endpoints/media.py @@ -10,9 +10,9 @@ router = APIRouter() @router.get("/recognize", summary="识别媒体信息", response_model=schemas.Context) -async def recognize(title: str, - subtitle: str = None, - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def recognize(title: str, + subtitle: str = None, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 根据标题、副标题识别媒体信息 """ @@ -24,10 +24,10 @@ async def recognize(title: str, @router.get("/search", summary="搜索媒体信息", response_model=List[schemas.MediaInfo]) -async def search_by_title(title: str, - page: int = 1, - count: int = 8, - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def search_by_title(title: str, + page: int = 1, + count: int = 8, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 模糊搜索媒体信息列表 """ diff --git a/app/api/endpoints/message.py b/app/api/endpoints/message.py index 933a6276..d4f1fc90 100644 --- a/app/api/endpoints/message.py +++ b/app/api/endpoints/message.py @@ -13,7 +13,7 @@ from app.modules.wechat.WXBizMsgCrypt3 import WXBizMsgCrypt router = APIRouter() -async def start_message_chain(body: Any, form: Any, args: Any): +def start_message_chain(body: Any, form: Any, args: Any): """ 启动链式任务 """ @@ -21,20 +21,20 @@ async def start_message_chain(body: Any, form: Any, args: Any): @router.post("/", summary="接收用户消息", response_model=schemas.Response) -async def user_message(background_tasks: BackgroundTasks, request: Request): +def user_message(background_tasks: BackgroundTasks, request: Request): """ 用户消息响应 """ - body = await request.body() - form = await request.form() + body = request.body() + form = request.form() args = request.query_params background_tasks.add_task(start_message_chain, body, form, args) return schemas.Response(success=True) @router.get("/", summary="微信验证") -async def wechat_verify(echostr: str, msg_signature: str, - timestamp: Union[str, int], nonce: str) -> Any: +def wechat_verify(echostr: str, msg_signature: str, + timestamp: Union[str, int], nonce: str) -> Any: """ 用户消息响应 """ diff --git a/app/api/endpoints/plugin.py b/app/api/endpoints/plugin.py index 718b6e3f..fb21e7e8 100644 --- a/app/api/endpoints/plugin.py +++ b/app/api/endpoints/plugin.py @@ -12,7 +12,7 @@ router = APIRouter() @router.get("/", summary="所有插件", response_model=List[schemas.Plugin]) -async def all_plugins(_: schemas.TokenPayload = Depends(verify_token)) -> Any: +def all_plugins(_: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 查询所有插件清单 """ @@ -20,7 +20,7 @@ async def all_plugins(_: schemas.TokenPayload = Depends(verify_token)) -> Any: @router.get("/installed", summary="已安装插件", response_model=List[str]) -async def installed_plugins(_: schemas.TokenPayload = Depends(verify_token)) -> Any: +def installed_plugins(_: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 查询用户已安装插件清单 """ @@ -28,7 +28,7 @@ async def installed_plugins(_: schemas.TokenPayload = Depends(verify_token)) -> @router.get("/{plugin_id}", summary="获取插件配置") -async def plugin_config(plugin_id: str, _: schemas.TokenPayload = Depends(verify_token)) -> dict: +def plugin_config(plugin_id: str, _: schemas.TokenPayload = Depends(verify_token)) -> dict: """ 根据插件ID获取插件配置信息 """ @@ -36,8 +36,8 @@ async def plugin_config(plugin_id: str, _: schemas.TokenPayload = Depends(verify @router.put("/{plugin_id}", summary="更新插件配置", response_model=schemas.Response) -async def set_plugin_config(plugin_id: str, conf: dict, - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def set_plugin_config(plugin_id: str, conf: dict, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 根据插件ID获取插件配置信息 """ @@ -46,8 +46,8 @@ async def set_plugin_config(plugin_id: str, conf: dict, @router.post("/{plugin_id}/install", summary="安装插件", response_model=schemas.Response) -async def install_plugin(plugin_id: str, - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def install_plugin(plugin_id: str, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 安装插件 """ @@ -63,7 +63,7 @@ async def install_plugin(plugin_id: str, @router.delete("/{plugin_id}", summary="卸载插件", response_model=schemas.Response) -async def uninstall_plugin(plugin_id: str, _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def uninstall_plugin(plugin_id: str, _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 卸载插件 """ diff --git a/app/api/endpoints/search.py b/app/api/endpoints/search.py index d15a22bd..7a7aa38a 100644 --- a/app/api/endpoints/search.py +++ b/app/api/endpoints/search.py @@ -22,9 +22,9 @@ async def search_latest(_: schemas.TokenPayload = Depends(verify_token)) -> Any: @router.get("/media/{mediaid}", summary="精确搜索资源", response_model=List[schemas.Context]) -async def search_by_tmdbid(mediaid: str, - mtype: str = None, - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def search_by_tmdbid(mediaid: str, + mtype: str = None, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 根据TMDBID/豆瓣ID精确搜索站点资源 tmdb:/douban:/ """ diff --git a/app/api/endpoints/site.py b/app/api/endpoints/site.py index 48ac697b..828e7778 100644 --- a/app/api/endpoints/site.py +++ b/app/api/endpoints/site.py @@ -24,8 +24,8 @@ def start_cookiecloud_sync(): @router.get("/", summary="所有站点", response_model=List[schemas.Site]) -async def read_sites(db: Session = Depends(get_db), - _: schemas.TokenPayload = Depends(verify_token)) -> List[dict]: +def read_sites(db: Session = Depends(get_db), + _: schemas.TokenPayload = Depends(verify_token)) -> List[dict]: """ 获取站点列表 """ @@ -33,7 +33,7 @@ async def read_sites(db: Session = Depends(get_db), @router.put("/", summary="更新站点", response_model=schemas.Response) -async def update_site( +def update_site( *, db: Session = Depends(get_db), site_in: schemas.Site, @@ -50,7 +50,7 @@ async def update_site( @router.delete("/", summary="删除站点", response_model=schemas.Response) -async def delete_site( +def delete_site( site_in: schemas.Site, db: Session = Depends(get_db), _: schemas.TokenPayload = Depends(verify_token) @@ -63,8 +63,8 @@ async def delete_site( @router.get("/cookiecloud", summary="CookieCloud同步", response_model=schemas.Response) -async def cookie_cloud_sync(background_tasks: BackgroundTasks, - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def cookie_cloud_sync(background_tasks: BackgroundTasks, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 运行CookieCloud同步站点信息 """ @@ -97,9 +97,9 @@ def update_cookie( @router.get("/test/{site_id}", summary="连接测试", response_model=schemas.Response) -async def test_site(site_id: int, - db: Session = Depends(get_db), - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def test_site(site_id: int, + db: Session = Depends(get_db), + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 测试站点是否可用 """ @@ -114,9 +114,9 @@ async def test_site(site_id: int, @router.get("/icon/{site_id}", summary="站点图标", response_model=schemas.Response) -async def site_icon(site_id: int, - db: Session = Depends(get_db), - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def site_icon(site_id: int, + db: Session = Depends(get_db), + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 获取站点图标:base64或者url """ @@ -135,9 +135,9 @@ async def site_icon(site_id: int, @router.get("/resource/{site_id}", summary="站点资源", response_model=List[schemas.TorrentInfo]) -async def site_resource(site_id: int, keyword: str = None, - db: Session = Depends(get_db), - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def site_resource(site_id: int, keyword: str = None, + db: Session = Depends(get_db), + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 浏览站点资源 """ @@ -154,7 +154,7 @@ async def site_resource(site_id: int, keyword: str = None, @router.get("/{site_id}", summary="站点详情", response_model=schemas.Site) -async def read_site( +def read_site( site_id: int, db: Session = Depends(get_db), _: schemas.TokenPayload = Depends(verify_token) diff --git a/app/api/endpoints/subscribe.py b/app/api/endpoints/subscribe.py index 420deb62..6e1b3d0a 100644 --- a/app/api/endpoints/subscribe.py +++ b/app/api/endpoints/subscribe.py @@ -33,7 +33,7 @@ def start_subscribe_search(sid: Optional[int], state: Optional[str]): @router.get("/", summary="所有订阅", response_model=List[schemas.Subscribe]) -async def read_subscribes( +def read_subscribes( db: Session = Depends(get_db), _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ @@ -43,7 +43,7 @@ async def read_subscribes( @router.post("/", summary="新增订阅", response_model=schemas.Response) -async def create_subscribe( +def create_subscribe( *, subscribe_in: schemas.Subscribe, current_user: User = Depends(get_current_active_user), @@ -75,7 +75,7 @@ async def create_subscribe( @router.put("/", summary="更新订阅", response_model=schemas.Response) -async def update_subscribe( +def update_subscribe( *, subscribe_in: schemas.Subscribe, db: Session = Depends(get_db), @@ -92,7 +92,7 @@ async def update_subscribe( @router.get("/media/{mediaid}", summary="查询订阅", response_model=schemas.Subscribe) -async def subscribe_mediaid( +def subscribe_mediaid( mediaid: str, season: int = None, db: Session = Depends(get_db), @@ -111,7 +111,7 @@ async def subscribe_mediaid( @router.get("/{subscribe_id}", summary="订阅详情", response_model=schemas.Subscribe) -async def read_subscribe( +def read_subscribe( subscribe_id: int, db: Session = Depends(get_db), _: schemas.TokenPayload = Depends(verify_token)) -> Any: @@ -122,7 +122,7 @@ async def read_subscribe( @router.delete("/media/{mediaid}", summary="删除订阅", response_model=schemas.Response) -async def delete_subscribe_by_mediaid( +def delete_subscribe_by_mediaid( mediaid: str, season: int = None, db: Session = Depends(get_db), @@ -140,7 +140,7 @@ async def delete_subscribe_by_mediaid( @router.delete("/{subscribe_id}", summary="删除订阅", response_model=schemas.Response) -async def delete_subscribe( +def delete_subscribe( subscribe_id: int, db: Session = Depends(get_db), _: schemas.TokenPayload = Depends(verify_token) @@ -153,8 +153,8 @@ async def delete_subscribe( @router.post("/seerr", summary="OverSeerr/JellySeerr通知订阅", response_model=schemas.Response) -async def seerr_subscribe(request: Request, background_tasks: BackgroundTasks, - authorization: str = Header(None)) -> Any: +def seerr_subscribe(request: Request, background_tasks: BackgroundTasks, + authorization: str = Header(None)) -> Any: """ Jellyseerr/Overseerr订阅 """ @@ -163,7 +163,7 @@ async def seerr_subscribe(request: Request, background_tasks: BackgroundTasks, status_code=400, detail="授权失败", ) - req_json = await request.json() + req_json = request.json() if not req_json: raise HTTPException( status_code=500, @@ -206,7 +206,7 @@ async def seerr_subscribe(request: Request, background_tasks: BackgroundTasks, @router.get("/refresh", summary="刷新订阅", response_model=schemas.Response) -async def refresh_subscribes( +def refresh_subscribes( _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 刷新所有订阅 @@ -216,7 +216,7 @@ async def refresh_subscribes( @router.get("/search/{subscribe_id}", summary="搜索订阅", response_model=schemas.Response) -async def search_subscribe( +def search_subscribe( subscribe_id: int, background_tasks: BackgroundTasks, _: schemas.TokenPayload = Depends(verify_token)) -> Any: @@ -228,7 +228,7 @@ async def search_subscribe( @router.get("/search", summary="搜索所有订阅", response_model=schemas.Response) -async def search_subscribes( +def search_subscribes( background_tasks: BackgroundTasks, _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ diff --git a/app/api/endpoints/system.py b/app/api/endpoints/system.py index 9b560295..df65ec88 100644 --- a/app/api/endpoints/system.py +++ b/app/api/endpoints/system.py @@ -1,11 +1,10 @@ -import asyncio import json +import json +import time -from fastapi import APIRouter, Depends, HTTPException +from fastapi import APIRouter, HTTPException from fastapi.responses import StreamingResponse -from app import schemas -from app.core.config import settings from app.core.security import verify_token from app.helper.message import MessageHelper from app.helper.progress import ProgressHelper @@ -14,7 +13,7 @@ router = APIRouter() @router.get("/progress/{process_type}", summary="实时进度") -async def get_progress(process_type: str, token: str): +def get_progress(process_type: str, token: str): """ 实时获取处理进度,返回格式为SSE """ @@ -26,17 +25,17 @@ async def get_progress(process_type: str, token: str): progress = ProgressHelper() - async def event_generator(): + def event_generator(): while True: detail = progress.get(process_type) yield 'data: %s\n\n' % json.dumps(detail) - await asyncio.sleep(0.2) + time.sleep(0.2) return StreamingResponse(event_generator(), media_type="text/event-stream") @router.get("/message", summary="实时消息") -async def get_progress(token: str): +def get_progress(token: str): """ 实时获取系统消息,返回格式为SSE """ @@ -48,10 +47,10 @@ async def get_progress(token: str): message = MessageHelper() - async def event_generator(): + def event_generator(): while True: detail = message.get() yield 'data: %s\n\n' % (detail or '') - await asyncio.sleep(3) + time.sleep(3) return StreamingResponse(event_generator(), media_type="text/event-stream") diff --git a/app/api/endpoints/tmdb.py b/app/api/endpoints/tmdb.py index 22e92159..8a265824 100644 --- a/app/api/endpoints/tmdb.py +++ b/app/api/endpoints/tmdb.py @@ -12,7 +12,7 @@ router = APIRouter() @router.get("/{tmdbid}/seasons", summary="TMDB所有季", response_model=List[schemas.TmdbSeason]) -async def tmdb_seasons(tmdbid: int, _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def tmdb_seasons(tmdbid: int, _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 根据TMDBID查询themoviedb所有季信息,type_name: 电影/电视剧 """ @@ -24,8 +24,8 @@ async def tmdb_seasons(tmdbid: int, _: schemas.TokenPayload = Depends(verify_tok @router.get("/{tmdbid}/{season}", summary="TMDB季所有集", response_model=List[schemas.TmdbEpisode]) -async def tmdb_season_episodes(tmdbid: int, season: int, - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def tmdb_season_episodes(tmdbid: int, season: int, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 根据TMDBID查询某季的所有信信息 """ @@ -37,11 +37,11 @@ async def tmdb_season_episodes(tmdbid: int, season: int, @router.get("/movies", summary="TMDB电影", response_model=List[schemas.MediaInfo]) -async def tmdb_movies(sort_by: str = "popularity.desc", - with_genres: str = "", - with_original_language: str = "", - page: int = 1, - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def tmdb_movies(sort_by: str = "popularity.desc", + with_genres: str = "", + with_original_language: str = "", + page: int = 1, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 浏览TMDB电影信息 """ @@ -56,11 +56,11 @@ async def tmdb_movies(sort_by: str = "popularity.desc", @router.get("/tvs", summary="TMDB剧集", response_model=List[schemas.MediaInfo]) -async def tmdb_tvs(sort_by: str = "popularity.desc", - with_genres: str = "", - with_original_language: str = "", - page: int = 1, - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def tmdb_tvs(sort_by: str = "popularity.desc", + with_genres: str = "", + with_original_language: str = "", + page: int = 1, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 浏览TMDB剧集信息 """ @@ -75,8 +75,8 @@ async def tmdb_tvs(sort_by: str = "popularity.desc", @router.get("/trending", summary="TMDB流行趋势", response_model=List[schemas.MediaInfo]) -async def tmdb_trending(page: int = 1, - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def tmdb_trending(page: int = 1, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 浏览TMDB剧集信息 """ @@ -87,8 +87,8 @@ async def tmdb_trending(page: int = 1, @router.get("/{tmdbid}", summary="TMDB详情", response_model=schemas.MediaInfo) -async def tmdb_info(tmdbid: int, type_name: str, - _: schemas.TokenPayload = Depends(verify_token)) -> Any: +def tmdb_info(tmdbid: int, type_name: str, + _: schemas.TokenPayload = Depends(verify_token)) -> Any: """ 根据TMDBID查询themoviedb媒体信息,type_name: 电影/电视剧 """ diff --git a/app/api/endpoints/user.py b/app/api/endpoints/user.py index 92b0fe80..acd28c91 100644 --- a/app/api/endpoints/user.py +++ b/app/api/endpoints/user.py @@ -13,7 +13,7 @@ router = APIRouter() @router.get("/", summary="所有用户", response_model=List[schemas.User]) -async def read_users( +def read_users( db: Session = Depends(get_db), current_user: User = Depends(get_current_active_superuser), ) -> Any: @@ -25,7 +25,7 @@ async def read_users( @router.post("/", summary="新增用户", response_model=schemas.User) -async def create_user( +def create_user( *, db: Session = Depends(get_db), user_in: schemas.UserCreate, @@ -50,7 +50,7 @@ async def create_user( @router.put("/", summary="更新用户", response_model=schemas.User) -async def update_user( +def update_user( *, db: Session = Depends(get_db), user_in: schemas.UserCreate, @@ -74,7 +74,7 @@ async def update_user( @router.delete("/", summary="删除用户", response_model=schemas.Response) -async def delete_user( +def delete_user( *, db: Session = Depends(get_db), user_in: schemas.UserCreate, @@ -94,7 +94,7 @@ async def delete_user( @router.get("/{user_id}", summary="用户详情", response_model=schemas.User) -async def read_user_by_id( +def read_user_by_id( user_id: int, current_user: User = Depends(get_current_active_user), db: Session = Depends(get_db), diff --git a/app/api/endpoints/webhook.py b/app/api/endpoints/webhook.py index c5864d19..37fc03e1 100644 --- a/app/api/endpoints/webhook.py +++ b/app/api/endpoints/webhook.py @@ -9,7 +9,7 @@ from app.core.config import settings router = APIRouter() -async def start_webhook_chain(body: Any, form: Any, args: Any): +def start_webhook_chain(body: Any, form: Any, args: Any): """ 启动链式任务 """ @@ -17,15 +17,15 @@ async def start_webhook_chain(body: Any, form: Any, args: Any): @router.post("/", summary="Webhook消息响应", response_model=schemas.Response) -async def webhook_message(background_tasks: BackgroundTasks, - token: str, request: Request) -> Any: +def webhook_message(background_tasks: BackgroundTasks, + token: str, request: Request) -> Any: """ Webhook响应 """ if token != settings.API_TOKEN: return schemas.Response(success=False, message="token认证不通过") - body = await request.body() - form = await request.form() + body = request.body() + form = request.form() args = request.query_params background_tasks.add_task(start_webhook_chain, body, form, args) return schemas.Response(success=True) diff --git a/app/api/servarr.py b/app/api/servarr.py index 9b82aac0..89587b76 100644 --- a/app/api/servarr.py +++ b/app/api/servarr.py @@ -18,7 +18,7 @@ arr_router = APIRouter(tags=['servarr']) @arr_router.get("/system/status", summary="系统状态") -async def arr_system_status(apikey: str) -> Any: +def arr_system_status(apikey: str) -> Any: """ 模拟Radarr、Sonarr系统状态 """ @@ -36,7 +36,7 @@ async def arr_system_status(apikey: str) -> Any: @arr_router.get("/qualityProfile", summary="质量配置") -async def arr_qualityProfile(apikey: str) -> Any: +def arr_qualityProfile(apikey: str) -> Any: """ 模拟Radarr、Sonarr质量配置 """ @@ -54,7 +54,7 @@ async def arr_qualityProfile(apikey: str) -> Any: @arr_router.get("/rootfolder", summary="根目录") -async def arr_rootfolder(apikey: str) -> Any: +def arr_rootfolder(apikey: str) -> Any: """ 模拟Radarr、Sonarr根目录 """ @@ -75,7 +75,7 @@ async def arr_rootfolder(apikey: str) -> Any: @arr_router.get("/tag", summary="标签") -async def arr_tag(apikey: str) -> Any: +def arr_tag(apikey: str) -> Any: """ 模拟Radarr、Sonarr标签 """ @@ -93,7 +93,7 @@ async def arr_tag(apikey: str) -> Any: @arr_router.get("/languageprofile", summary="语言") -async def arr_languageprofile(apikey: str) -> Any: +def arr_languageprofile(apikey: str) -> Any: """ 模拟Radarr、Sonarr语言 """ @@ -124,7 +124,7 @@ async def arr_languageprofile(apikey: str) -> Any: @arr_router.get("/movie", summary="所有订阅电影", response_model=List[schemas.RadarrMovie]) -async def arr_movies(apikey: str, db: Session = Depends(get_db)) -> Any: +def arr_movies(apikey: str, db: Session = Depends(get_db)) -> Any: """ 查询Rardar电影 """ @@ -220,7 +220,7 @@ async def arr_movies(apikey: str, db: Session = Depends(get_db)) -> Any: @arr_router.get("/movie/lookup", summary="查询电影", response_model=List[schemas.RadarrMovie]) -async def arr_movie_lookup(apikey: str, term: str, db: Session = Depends(get_db)) -> Any: +def arr_movie_lookup(apikey: str, term: str, db: Session = Depends(get_db)) -> Any: """ 查询Rardar电影 term: `tmdb:${id}` 存在和不存在均不能返回错误 @@ -271,7 +271,7 @@ async def arr_movie_lookup(apikey: str, term: str, db: Session = Depends(get_db) @arr_router.get("/movie/{mid}", summary="电影订阅详情", response_model=schemas.RadarrMovie) -async def arr_movie(apikey: str, mid: int, db: Session = Depends(get_db)) -> Any: +def arr_movie(apikey: str, mid: int, db: Session = Depends(get_db)) -> Any: """ 查询Rardar电影订阅 """ @@ -302,7 +302,7 @@ async def arr_movie(apikey: str, mid: int, db: Session = Depends(get_db)) -> Any @arr_router.post("/movie", summary="新增电影订阅") -async def arr_add_movie(apikey: str, movie: RadarrMovie) -> Any: +def arr_add_movie(apikey: str, movie: RadarrMovie) -> Any: """ 新增Rardar电影订阅 """ @@ -328,7 +328,7 @@ async def arr_add_movie(apikey: str, movie: RadarrMovie) -> Any: @arr_router.delete("/movie/{mid}", summary="删除电影订阅", response_model=schemas.Response) -async def arr_remove_movie(apikey: str, mid: int, db: Session = Depends(get_db)) -> Any: +def arr_remove_movie(apikey: str, mid: int, db: Session = Depends(get_db)) -> Any: """ 删除Rardar电影订阅 """ @@ -349,7 +349,7 @@ async def arr_remove_movie(apikey: str, mid: int, db: Session = Depends(get_db)) @arr_router.get("/series", summary="所有剧集", response_model=List[schemas.SonarrSeries]) -async def arr_series(apikey: str, db: Session = Depends(get_db)) -> Any: +def arr_series(apikey: str, db: Session = Depends(get_db)) -> Any: """ 查询Sonarr剧集 """ @@ -490,7 +490,7 @@ async def arr_series(apikey: str, db: Session = Depends(get_db)) -> Any: @arr_router.get("/series/lookup", summary="查询剧集") -async def arr_series_lookup(apikey: str, term: str, db: Session = Depends(get_db)) -> Any: +def arr_series_lookup(apikey: str, term: str, db: Session = Depends(get_db)) -> Any: """ 查询Sonarr剧集 term: `tvdb:${id}` title """ @@ -577,7 +577,7 @@ async def arr_series_lookup(apikey: str, term: str, db: Session = Depends(get_db @arr_router.get("/series/{tid}", summary="剧集详情") -async def arr_serie(apikey: str, tid: int, db: Session = Depends(get_db)) -> Any: +def arr_serie(apikey: str, tid: int, db: Session = Depends(get_db)) -> Any: """ 查询Sonarr剧集 """ @@ -616,7 +616,7 @@ async def arr_serie(apikey: str, tid: int, db: Session = Depends(get_db)) -> Any @arr_router.post("/series", summary="新增剧集订阅") -async def arr_add_series(apikey: str, tv: schemas.SonarrSeries) -> Any: +def arr_add_series(apikey: str, tv: schemas.SonarrSeries) -> Any: """ 新增Sonarr剧集订阅 """ @@ -649,7 +649,7 @@ async def arr_add_series(apikey: str, tv: schemas.SonarrSeries) -> Any: @arr_router.delete("/series/{tid}", summary="删除剧集订阅") -async def arr_remove_series(apikey: str, tid: int, db: Session = Depends(get_db)) -> Any: +def arr_remove_series(apikey: str, tid: int, db: Session = Depends(get_db)) -> Any: """ 删除Sonarr剧集订阅 """