GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-08-21 08:12:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix cython type error

Browse Source
This commit is contained in:
jxxghp
2025-03-23 21:39:37 +08:00
parent 740cf12c11
commit f9b0db623d
113 changed files with 812 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/modules/bangumi/bangumi.py
View File

@@ -1,4 +1,5 @@
from datetime import datetime
from typing import Optional
import requests
@@ -31,7 +32,7 @@ class BangumiApi(object):
@classmethod
@cached(maxsize=settings.CACHE_CONF["bangumi"], ttl=settings.CACHE_CONF["meta"])
def __invoke(cls, url, key: str = None, **kwargs):
def __invoke(cls, url, key: Optional[str] = None, **kwargs):
req_url = cls._base_url + url
params = {}
if kwargs:

58
app/modules/douban/apiv2.py
View File

@@ -4,6 +4,7 @@ import hashlib
import hmac
from datetime import datetime
from random import choice
from typing import Optional
from urllib import parse
import requests
@@ -18,7 +19,6 @@ class DoubanApi(metaclass=Singleton):
_urls = {
# 搜索类
# sort=U:近期热门 T:标记最多 S:评分最高 R:最新上映
# q=search_word&start: int = 0&count: int = 20&sort=U
# 聚合搜索
"search": "/search/weixin",
"search_agg": "/search",
@@ -27,21 +27,18 @@ class DoubanApi(metaclass=Singleton):
# 电影探索
# sort=U:综合排序 T:近期热度 S:高分优先 R:首播时间
# tags='日本,动画,2022'&start: int = 0&count: int = 20&sort=U
"movie_recommend": "/movie/recommend",
# 电视剧探索
"tv_recommend": "/tv/recommend",
# 搜索
"movie_tag": "/movie/tag",
"tv_tag": "/tv/tag",
# q=search_word&start: int = 0&count: int = 20
"movie_search": "/search/movie",
"tv_search": "/search/movie",
"book_search": "/search/book",
"group_search": "/search/group",
# 各类主题合集
# start: int = 0&count: int = 20
# 正在上映
"movie_showing": "/subject_collection/movie_showing/items",
# 热门电影
@@ -252,7 +249,7 @@ class DoubanApi(metaclass=Singleton):
"""
return self.__post(self._urls["imdbid"] % imdbid, _ts=ts)
def search(self, keyword: str, start: int = 0, count: int = 20,
def search(self, keyword: str, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')) -> dict:
"""
关键字搜索
@@ -260,7 +257,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_search(self._urls["search"], q=keyword,
start=start, count=count, _ts=ts)
def movie_search(self, keyword: str, start: int = 0, count: int = 20,
def movie_search(self, keyword: str, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
电影搜索
@@ -268,7 +265,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_search(self._urls["movie_search"], q=keyword,
start=start, count=count, _ts=ts)
def tv_search(self, keyword: str, start: int = 0, count: int = 20,
def tv_search(self, keyword: str, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
电视搜索
@@ -276,7 +273,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_search(self._urls["tv_search"], q=keyword,
start=start, count=count, _ts=ts)
def book_search(self, keyword: str, start: int = 0, count: int = 20,
def book_search(self, keyword: str, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
书籍搜索
@@ -284,7 +281,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_search(self._urls["book_search"], q=keyword,
start=start, count=count, _ts=ts)
def group_search(self, keyword: str, start: int = 0, count: int = 20,
def group_search(self, keyword: str, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
小组搜索
@@ -292,7 +289,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_search(self._urls["group_search"], q=keyword,
start=start, count=count, _ts=ts)
def person_search(self, keyword: str, start: int = 0, count: int = 20,
def person_search(self, keyword: str, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
人物搜索
@@ -300,7 +297,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_search(self._urls["search_subject"], type="person", q=keyword,
start=start, count=count, _ts=ts)
def movie_showing(self, start: int = 0, count: int = 20,
def movie_showing(self, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
正在热映
@@ -308,7 +305,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_recommend(self._urls["movie_showing"],
start=start, count=count, _ts=ts)
def movie_soon(self, start: int = 0, count: int = 20,
def movie_soon(self, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
即将上映
@@ -316,7 +313,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_recommend(self._urls["movie_soon"],
start=start, count=count, _ts=ts)
def movie_hot_gaia(self, start: int = 0, count: int = 20,
def movie_hot_gaia(self, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
热门电影
@@ -324,7 +321,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_recommend(self._urls["movie_hot_gaia"],
start=start, count=count, _ts=ts)
def tv_hot(self, start: int = 0, count: int = 20,
def tv_hot(self, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
热门剧集
@@ -332,7 +329,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_recommend(self._urls["tv_hot"],
start=start, count=count, _ts=ts)
def tv_animation(self, start: int = 0, count: int = 20,
def tv_animation(self, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
动画
@@ -340,7 +337,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_recommend(self._urls["tv_animation"],
start=start, count=count, _ts=ts)
def tv_variety_show(self, start: int = 0, count: int = 20,
def tv_variety_show(self, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
综艺
@@ -348,7 +345,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_recommend(self._urls["tv_variety_show"],
start=start, count=count, _ts=ts)
def tv_rank_list(self, start: int = 0, count: int = 20,
def tv_rank_list(self, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
电视剧排行榜
@@ -356,7 +353,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_recommend(self._urls["tv_rank_list"],
start=start, count=count, _ts=ts)
def show_hot(self, start: int = 0, count: int = 20,
def show_hot(self, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
综艺热门
@@ -394,7 +391,7 @@ class DoubanApi(metaclass=Singleton):
"""
return self.__invoke_search(self._urls["book_detail"] + subject_id)
def movie_top250(self, start: int = 0, count: int = 20,
def movie_top250(self, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
电影TOP250
@@ -402,7 +399,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_recommend(self._urls["movie_top250"],
start=start, count=count, _ts=ts)
def movie_recommend(self, tags='', sort='R', start: int = 0, count: int = 20,
def movie_recommend(self, tags='', sort='R', start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
电影探索
@@ -410,7 +407,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_recommend(self._urls["movie_recommend"], tags=tags, sort=sort,
start=start, count=count, _ts=ts)
def tv_recommend(self, tags='', sort='R', start: int = 0, count: int = 20,
def tv_recommend(self, tags='', sort='R', start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
电视剧探索
@@ -418,7 +415,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_recommend(self._urls["tv_recommend"], tags=tags, sort=sort,
start=start, count=count, _ts=ts)
def tv_chinese_best_weekly(self, start: int = 0, count: int = 20,
def tv_chinese_best_weekly(self, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
华语口碑周榜
@@ -426,7 +423,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_recommend(self._urls["tv_chinese_best_weekly"],
start=start, count=count, _ts=ts)
def tv_global_best_weekly(self, start: int = 0, count: int = 20,
def tv_global_best_weekly(self, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
全球口碑周榜
@@ -441,7 +438,7 @@ class DoubanApi(metaclass=Singleton):
"""
return self.__invoke_search(self._urls["doulist"] + subject_id)
def doulist_items(self, subject_id: str, start: int = 0, count: int = 20,
def doulist_items(self, subject_id: str, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
豆列列表
@@ -453,7 +450,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_search(self._urls["doulist_items"] % subject_id,
start=start, count=count, _ts=ts)
def movie_recommendations(self, subject_id: str, start: int = 0, count: int = 20,
def movie_recommendations(self, subject_id: str, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
电影推荐
@@ -465,7 +462,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_recommend(self._urls["movie_recommendations"] % subject_id,
start=start, count=count, _ts=ts)
def tv_recommendations(self, subject_id: str, start: int = 0, count: int = 20,
def tv_recommendations(self, subject_id: str, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
电视剧推荐
@@ -477,7 +474,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_recommend(self._urls["tv_recommendations"] % subject_id,
start=start, count=count, _ts=ts)
def movie_photos(self, subject_id: str, start: int = 0, count: int = 20,
def movie_photos(self, subject_id: str, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
电影剧照
@@ -489,7 +486,7 @@ class DoubanApi(metaclass=Singleton):
return self.__invoke_search(self._urls["movie_photos"] % subject_id,
start=start, count=count, _ts=ts)
def tv_photos(self, subject_id: str, start: int = 0, count: int = 20,
def tv_photos(self, subject_id: str, start: Optional[int] = 0, count: Optional[int] = 20,
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
电视剧剧照
@@ -509,8 +506,9 @@ class DoubanApi(metaclass=Singleton):
"""
return self.__invoke_search(self._urls["person_detail"] + str(subject_id))
def person_work(self, subject_id: int, start: int = 0, count: int = 20, sort_by: str = "time",
collection_title: str = "影视",
def person_work(self, subject_id: int, start: Optional[int] = 0, count: Optional[int] = 20,
sort_by: Optional[str] = "time",
collection_title: Optional[str] = "影视",
ts=datetime.strftime(datetime.now(), '%Y%m%d')):
"""
用户作品集

2
app/modules/douban/douban_cache.py
View File

@@ -165,7 +165,7 @@ class DoubanCache(metaclass=Singleton):
# None时不缓存，此时代表网络错误，允许重复请求
self._meta_data[self.__get_key(meta)] = {'id': "0"}
def save(self, force: bool = False) -> None:
def save(self, force: Optional[bool] = False) -> None:
"""
保存缓存数据到文件
"""

4
app/modules/douban/scraper.py
View File

@@ -11,7 +11,7 @@ class DoubanScraper:
_force_nfo = False
_force_img = False
def get_metadata_nfo(self, mediainfo: MediaInfo, season: int = None) -> Optional[str]:
def get_metadata_nfo(self, mediainfo: MediaInfo, season: Optional[int] = None) -> Optional[str]:
"""
获取NFO文件内容文本
:param mediainfo: 媒体信息
@@ -33,7 +33,7 @@ class DoubanScraper:
return None
@staticmethod
def get_metadata_img(mediainfo: MediaInfo, season: int = None, episode: int = None) -> Optional[dict]:
def get_metadata_img(mediainfo: MediaInfo, season: Optional[int] = None, episode: Optional[int] = None) -> Optional[dict]:
"""
获取图片内容
:param mediainfo: 媒体信息

26
app/modules/emby/__init__.py
View File

@@ -135,8 +135,8 @@ class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
return result
return None
def media_exists(self, mediainfo: MediaInfo, itemid: str = None,
server: str = None) -> Optional[schemas.ExistMediaInfo]:
def media_exists(self, mediainfo: MediaInfo, itemid: Optional[str] = None,
server: Optional[str] = None) -> Optional[schemas.ExistMediaInfo]:
"""
判断媒体文件是否存在
:param mediainfo: 识别的媒体信息
@@ -195,7 +195,7 @@ class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
)
return None
def media_statistic(self, server: str = None) -> Optional[List[schemas.Statistic]]:
def media_statistic(self, server: Optional[str] = None) -> Optional[List[schemas.Statistic]]:
"""
媒体数量统计
"""
@@ -216,8 +216,8 @@ class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
return media_statistics
def mediaserver_librarys(self, server: str,
username: str = None,
hidden: bool = False) -> Optional[List[schemas.MediaServerLibrary]]:
username: Optional[str] = None,
hidden: Optional[bool] = False) -> Optional[List[schemas.MediaServerLibrary]]:
"""
媒体库列表
"""
@@ -226,7 +226,7 @@ class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
return server_obj.get_librarys(username=username, hidden=hidden)
return None
def mediaserver_items(self, server: str, library_id: Union[str, int], start_index: int = 0,
def mediaserver_items(self, server: str, library_id: Union[str, int], start_index: Optional[int] = 0,
limit: Optional[int] = -1) -> Optional[Generator]:
"""
获取媒体服务器项目列表，支持分页和不分页逻辑，默认不分页获取所有数据
@@ -269,7 +269,7 @@ class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
) for season, episodes in seasoninfo.items()]
def mediaserver_playing(self, server: str,
count: int = 20, username: str = None) -> List[schemas.MediaServerPlayItem]:
count: Optional[int] = 20, username: Optional[str] = None) -> List[schemas.MediaServerPlayItem]:
"""
获取媒体服务器正在播放信息
"""
@@ -287,8 +287,8 @@ class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
return None
return server_obj.get_play_url(item_id)
def mediaserver_latest(self, server: str = None,
count: int = 20, username: str = None) -> List[schemas.MediaServerPlayItem]:
def mediaserver_latest(self, server: Optional[str] = None,
count: Optional[int] = 20, username: Optional[str] = None) -> List[schemas.MediaServerPlayItem]:
"""
获取媒体服务器最新入库条目
"""
@@ -298,10 +298,10 @@ class EmbyModule(_ModuleBase, _MediaServerBase[Emby]):
return server_obj.get_latest(num=count, username=username)
def mediaserver_latest_images(self,
server: str = None,
count: int = 10,
username: str = None,
remote: bool = False
server: Optional[str] = None,
count: Optional[int] = 10,
username: Optional[str] = None,
remote: Optional[bool] = False
) -> List[str]:
"""
获取媒体服务器最新入库条目的图片

38
app/modules/emby/emby.py
View File

@@ -17,13 +17,13 @@ from schemas import MediaServerItem
class Emby:
_host: str = None
_playhost: str = None
_apikey: str = None
_host: Optional[str] = None
_playhost: Optional[str] = None
_apikey: Optional[str] = None
_sync_libraries: List[str] = []
user: Optional[Union[str, int]] = None
def __init__(self, host: str = None, apikey: str = None, play_host: str = None,
def __init__(self, host: Optional[str] = None, apikey: Optional[str] = None, play_host: Optional[str] = None,
sync_libraries: list = None, **kwargs):
if not host or not apikey:
logger.error("Emby服务器配置不完整！")
@@ -116,7 +116,7 @@ class Emby:
logger.error(f"连接Library/VirtualFolders/Query 出错：" + str(e))
return []
def __get_emby_librarys(self, username: str = None) -> List[dict]:
def __get_emby_librarys(self, username: Optional[str] = None) -> List[dict]:
"""
获取Emby媒体库列表
"""
@@ -139,7 +139,7 @@ class Emby:
logger.error(f"连接User/Views 出错：" + str(e))
return []
def get_librarys(self, username: str = None, hidden: bool = False) -> List[schemas.MediaServerLibrary]:
def get_librarys(self, username: Optional[str] = None, hidden: Optional[bool] = False) -> List[schemas.MediaServerLibrary]:
"""
获取媒体服务器所有媒体库列表
"""
@@ -171,7 +171,7 @@ class Emby:
)
return libraries
def get_user(self, user_name: str = None) -> Optional[Union[str, int]]:
def get_user(self, user_name: Optional[str] = None) -> Optional[Union[str, int]]:
"""
获得管理员用户
"""
@@ -342,8 +342,8 @@ class Emby:
def get_movies(self,
title: str,
year: str = None,
tmdb_id: int = None) -> Optional[List[schemas.MediaServerItem]]:
year: Optional[str] = None,
tmdb_id: Optional[int] = None) -> Optional[List[schemas.MediaServerItem]]:
"""
根据标题和年份，检查电影是否在Emby中存在，存在则返回列表
:param title: 标题
@@ -386,11 +386,11 @@ class Emby:
return []
def get_tv_episodes(self,
item_id: str = None,
title: str = None,
year: str = None,
tmdb_id: int = None,
season: int = None
item_id: Optional[str] = None,
title: Optional[str] = None,
year: Optional[str] = None,
tmdb_id: Optional[int] = None,
season: Optional[int] = None
) -> Tuple[Optional[str], Optional[Dict[int, List[int]]]]:
"""
根据标题和年份和季，返回Emby中的剧集列表
@@ -668,7 +668,7 @@ class Emby:
logger.error(f"连接/Users/{self.user}/Items/{itemid}出错：" + str(e))
return None
def get_items(self, parent: Union[str, int], start_index: int = 0,
def get_items(self, parent: Union[str, int], start_index: Optional[int] = 0,
limit: Optional[int] = -1) -> Generator[MediaServerItem | None | Any, Any, None]:
"""
获取媒体服务器项目列表，支持分页和不分页逻辑，默认不分页获取所有数据
@@ -1049,7 +1049,7 @@ class Emby:
logger.error(f"连接Emby出错：" + str(e))
return None
def post_data(self, url: str, data: str = None, headers: dict = None) -> Optional[Response]:
def post_data(self, url: str, data: Optional[str] = None, headers: dict = None) -> Optional[Response]:
"""
自定义URL从媒体服务器获取数据，其中[HOST]、[APIKEY]、[USER]会被替换成实际的值
:param url: 请求地址
@@ -1077,7 +1077,7 @@ class Emby:
return f"{self._playhost or self._host}web/index.html#!" \
f"/item?id={item_id}&context=home&serverId={self.serverid}"
def get_backdrop_url(self, item_id: str, image_tag: str, remote: bool = False) -> str:
def get_backdrop_url(self, item_id: str, image_tag: str, remote: Optional[bool] = False) -> str:
"""
获取Emby的Backdrop图片地址
:param: item_id: 在Emby中的ID
@@ -1106,7 +1106,7 @@ class Emby:
return ""
return "%sItems/%s/Images/Primary" % (self._host, item_id)
def get_resume(self, num: int = 12, username: str = None) -> Optional[List[schemas.MediaServerPlayItem]]:
def get_resume(self, num: Optional[int] = 12, username: Optional[str] = None) -> Optional[List[schemas.MediaServerPlayItem]]:
"""
获得继续观看
"""
@@ -1174,7 +1174,7 @@ class Emby:
logger.error(f"连接Users/Items/Resume出错：" + str(e))
return []
def get_latest(self, num: int = 20, username: str = None) -> Optional[List[schemas.MediaServerPlayItem]]:
def get_latest(self, num: Optional[int] = 20, username: Optional[str] = None) -> Optional[List[schemas.MediaServerPlayItem]]:
"""
获得最近更新
"""

30
app/modules/filemanager/__init__.py
View File

@@ -169,7 +169,7 @@ class FileManagerModule(_ModuleBase):
return None
return storage_oper.check_login(**kwargs)
def list_files(self, fileitem: FileItem, recursion: bool = False) -> Optional[List[FileItem]]:
def list_files(self, fileitem: FileItem, recursion: Optional[bool] = False) -> Optional[List[FileItem]]:
"""
浏览文件
:param fileitem: 源文件
@@ -181,7 +181,7 @@ class FileManagerModule(_ModuleBase):
logger.error(f"不支持 {fileitem.storage} 的文件浏览")
return None
def __get_files(_item: FileItem, _r: bool = False):
def __get_files(_item: FileItem, _r: Optional[bool] = False):
"""
递归处理
"""
@@ -275,7 +275,7 @@ class FileManagerModule(_ModuleBase):
return None
return storage_oper.download(fileitem, path=path)
def upload_file(self, fileitem: FileItem, path: Path, new_name: str = None) -> Optional[FileItem]:
def upload_file(self, fileitem: FileItem, path: Path, new_name: Optional[str] = None) -> Optional[FileItem]:
"""
上传文件
"""
@@ -327,9 +327,9 @@ class FileManagerModule(_ModuleBase):
def transfer(self, fileitem: FileItem, meta: MetaBase, mediainfo: MediaInfo,
target_directory: TransferDirectoryConf = None,
target_storage: str = None, target_path: Path = None,
transfer_type: str = None, scrape: bool = None,
library_type_folder: bool = None, library_category_folder: bool = None,
target_storage: Optional[str] = None, target_path: Path = None,
transfer_type: Optional[str] = None, scrape: Optional[bool] = None,
library_type_folder: Optional[bool] = None, library_category_folder: Optional[bool] = None,
episodes_info: List[TmdbEpisode] = None) -> TransferInfo:
"""
文件整理
@@ -413,7 +413,7 @@ class FileManagerModule(_ModuleBase):
overwrite_mode=overwrite_mode,
episodes_info=episodes_info)
def __get_storage_oper(self, _storage: str, _func: str = None) -> Optional[StorageBase]:
def __get_storage_oper(self, _storage: str, _func: Optional[str] = None) -> Optional[StorageBase]:
"""
获取存储操作对象
"""
@@ -834,7 +834,7 @@ class FileManagerModule(_ModuleBase):
return True, ""
def __transfer_file(self, fileitem: FileItem, mediainfo: MediaInfo, target_storage: str, target_file: Path,
transfer_type: str, over_flag: bool = False) -> Tuple[Optional[FileItem], str]:
transfer_type: str, over_flag: Optional[bool] = False) -> Tuple[Optional[FileItem], str]:
"""
整理一个文件，同时处理其他相关文件
:param fileitem: 原文件
@@ -888,7 +888,7 @@ class FileManagerModule(_ModuleBase):
@staticmethod
def __get_dest_path(mediainfo: MediaInfo, target_path: Path,
need_type_folder: bool = False, need_category_folder: bool = False):
need_type_folder: Optional[bool] = False, need_category_folder: Optional[bool] = False):
"""
获取目标路径
"""
@@ -900,7 +900,7 @@ class FileManagerModule(_ModuleBase):
@staticmethod
def __get_dest_dir(mediainfo: MediaInfo, target_dir: TransferDirectoryConf,
need_type_folder: bool = None, need_category_folder: bool = None) -> Path:
need_type_folder: Optional[bool] = None, need_category_folder: Optional[bool] = None) -> Path:
"""
根据设置并装媒体库目录
:param mediainfo: 媒体信息
@@ -936,10 +936,10 @@ class FileManagerModule(_ModuleBase):
target_storage: str,
target_path: Path,
transfer_type: str,
need_scrape: bool = False,
need_rename: bool = True,
need_notify: bool = True,
overwrite_mode: str = None,
need_scrape: Optional[bool] = False,
need_rename: Optional[bool] = True,
need_notify: Optional[bool] = True,
overwrite_mode: Optional[str] = None,
episodes_info: List[TmdbEpisode] = None,
) -> TransferInfo:
"""
@@ -1133,7 +1133,7 @@ class FileManagerModule(_ModuleBase):
need_notify=need_notify)
@staticmethod
def __get_naming_dict(meta: MetaBase, mediainfo: MediaInfo, file_ext: str = None,
def __get_naming_dict(meta: MetaBase, mediainfo: MediaInfo, file_ext: Optional[str] = None,
episodes_info: List[TmdbEpisode] = None) -> dict:
"""
根据媒体信息，返回Format字典

12
app/modules/indexer/__init__.py
View File

@@ -77,8 +77,8 @@ class IndexerModule(_ModuleBase):
def search_torrents(self, site: dict,
keywords: List[str] = None,
mtype: MediaType = None,
cat: str = None,
page: int = 0) -> List[TorrentInfo]:
cat: Optional[str] = None,
page: Optional[int] = 0) -> List[TorrentInfo]:
"""
搜索一个站点
:param site: 站点
@@ -218,10 +218,10 @@ class IndexerModule(_ModuleBase):
@staticmethod
def __spider_search(indexer: dict,
search_word: str = None,
search_word: Optional[str] = None,
mtype: MediaType = None,
cat: str = None,
page: int = 0) -> Tuple[bool, List[dict]]:
cat: Optional[str] = None,
page: Optional[int] = 0) -> Tuple[bool, List[dict]]:
"""
根据关键字搜索单个站点
:param: indexer: 站点配置
@@ -241,7 +241,7 @@ class IndexerModule(_ModuleBase):
return _spider.is_error, _spider.get_torrents()
def refresh_torrents(self, site: dict,
keyword: str = None, cat: str = None, page: int = 0) -> Optional[List[TorrentInfo]]:
keyword: Optional[str] = None, cat: Optional[str] = None, page: Optional[int] = 0) -> Optional[List[TorrentInfo]]:
"""
获取站点最新一页的种子，多个站点需要多线程处理
:param site: 站点

2
app/modules/indexer/parser/__init__.py
View File

@@ -47,7 +47,7 @@ class SiteParserBase(metaclass=ABCMeta):
apikey: str,
token: str,
session: Session = None,
ua: str = None,
ua: Optional[str] = None,
emulate: bool = False,
proxy: bool = None):
super().__init__()

2
app/modules/indexer/parser/file_list.py
View File

@@ -74,7 +74,7 @@ class FileListSiteUserInfo(SiteParserBase):
self.bonus = StringUtils.str_float(bonus_html[0].xpath("string(.)").strip())
pass
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: bool = False) -> Optional[str]:
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: Optional[bool] = False) -> Optional[str]:
"""
做种相关信息
:param html_text:

2
app/modules/indexer/parser/gazelle.py
View File

@@ -87,7 +87,7 @@ class GazelleSiteUserInfo(SiteParserBase):
if join_at_text:
self.join_at = StringUtils.unify_datetime_str(join_at_text[0].strip())
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: bool = False) -> Optional[str]:
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: Optional[bool] = False) -> Optional[str]:
"""
做种相关信息
:param html_text:

2
app/modules/indexer/parser/hddolby.py
View File

@@ -121,7 +121,7 @@ class HDDolbySiteUserInfo(SiteParserBase):
"""
pass
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: bool = False) -> Optional[str]:
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: Optional[bool] = False) -> Optional[str]:
"""
解析用户做种信息
"""

2
app/modules/indexer/parser/mtorrent.py
View File

@@ -111,7 +111,7 @@ class MTorrentSiteUserInfo(SiteParserBase):
"""
pass
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: bool = False) -> Optional[str]:
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: Optional[bool] = False) -> Optional[str]:
"""
解析用户做种信息
"""

2
app/modules/indexer/parser/nexus_php.py
View File

@@ -147,7 +147,7 @@ class NexusPhpSiteUserInfo(SiteParserBase):
return True, gold * 100 * 100 + silver * 100 + copper
return False, 0.0
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: bool = False) -> Optional[str]:
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: Optional[bool] = False) -> Optional[str]:
"""
做种相关信息
:param html_text:

4
app/modules/indexer/parser/nexus_rabbit.py
View File

@@ -66,7 +66,7 @@ class NexusRabbitSiteUserInfo(SiteParserBase):
torrents = json.loads(html_text).get("data", [])
except Exception as e:
logger.error(f"解析做种信息失败: {str(e)}")
return
return None
seeding_size = 0
seeding_info = []
@@ -89,7 +89,7 @@ class NexusRabbitSiteUserInfo(SiteParserBase):
messages = json.loads(html_text).get("data", [])
except Exception as e:
logger.error(f"解析未读消息失败: {e}")
return
return None
for msg in messages:
msg_id, msg_unread = msg.get("id"), msg.get("unread")
if not (msg_id and msg_unread) or msg_unread == "no":

2
app/modules/indexer/parser/small_horse.py
View File

@@ -55,7 +55,7 @@ class SmallHorseSiteUserInfo(SiteParserBase):
def _parse_user_detail_info(self, html_text: str):
pass
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: bool = False) -> Optional[str]:
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: Optional[bool] = False) -> Optional[str]:
"""
做种相关信息
:param html_text:

2
app/modules/indexer/parser/tnode.py
View File

@@ -59,7 +59,7 @@ class TNodeSiteUserInfo(SiteParserBase):
"unreadSystem", 0)
pass
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: bool = False) -> Optional[str]:
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: Optional[bool] = False) -> Optional[str]:
"""
解析用户做种信息
"""

2
app/modules/indexer/parser/torrent_leech.py
View File

@@ -59,7 +59,7 @@ class TorrentLeechSiteUserInfo(SiteParserBase):
def _parse_user_detail_info(self, html_text: str):
pass
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: bool = False) -> Optional[str]:
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: Optional[bool] = False) -> Optional[str]:
"""
做种相关信息
:param html_text:

2
app/modules/indexer/parser/unit3d.py
View File

@@ -56,7 +56,7 @@ class Unit3dSiteUserInfo(SiteParserBase):
self.join_at = StringUtils.unify_datetime_str(
join_at_text[0].replace('注册日期', '').replace('註冊日期', '').replace('Registration date', ''))
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: bool = False) -> Optional[str]:
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: Optional[bool] = False) -> Optional[str]:
"""
做种相关信息
:param html_text:

2
app/modules/indexer/parser/yema.py
View File

@@ -73,7 +73,7 @@ class TYemaSiteUserInfo(SiteParserBase):
"""
pass
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: bool = False) -> Optional[str]:
def _parse_user_torrent_seeding_info(self, html_text: str, multi_page: Optional[bool] = False) -> Optional[str]:
"""
解析用户做种信息
"""

4
app/modules/indexer/spider/hddolby.py
View File

@@ -1,4 +1,4 @@
from typing import Tuple, List
from typing import Tuple, List, Optional
from app.core.config import settings
from app.db.systemconfig_oper import SystemConfigOper
@@ -73,7 +73,7 @@ class HddolbySpider:
self._searchurl = f"https://api.{self._domain_host}/api/v1/torrent/search"
self._pageurl = f"{self._domain}details.php?id=%s&hit=1"
def search(self, keyword: str, mtype: MediaType = None, page: int = 0) -> Tuple[bool, List[dict]]:
def search(self, keyword: str, mtype: MediaType = None, page: Optional[int] = 0) -> Tuple[bool, List[dict]]:
"""
搜索
"""

4
app/modules/indexer/spider/mtorrent.py
View File

@@ -1,7 +1,7 @@
import base64
import json
import re
from typing import Tuple, List
from typing import Tuple, List, Optional
from app.core.config import settings
from app.db.systemconfig_oper import SystemConfigOper
@@ -65,7 +65,7 @@ class MTorrentSpider:
self._token = indexer.get('token')
self._timeout = indexer.get('timeout') or 15
def search(self, keyword: str, mtype: MediaType = None, page: int = 0) -> Tuple[bool, List[dict]]:
def search(self, keyword: str, mtype: MediaType = None, page: Optional[int] = 0) -> Tuple[bool, List[dict]]:
"""
搜索
"""

4
app/modules/indexer/spider/tnode.py
View File

@@ -1,5 +1,5 @@
import re
from typing import Tuple, List
from typing import Tuple, List, Optional
from app.core.config import settings
from app.log import logger
@@ -49,7 +49,7 @@ class TNodeSpider:
if csrf_token:
self._token = csrf_token.group(1)
def search(self, keyword: str, page: int = 0) -> Tuple[bool, List[dict]]:
def search(self, keyword: str, page: Optional[int] = 0) -> Tuple[bool, List[dict]]:
if not self._token:
logger.warn(f"{self._name} 未获取到token，无法搜索")
return True, []

4
app/modules/indexer/spider/torrentleech.py
View File

@@ -1,4 +1,4 @@
from typing import List, Tuple
from typing import List, Tuple, Optional
from urllib.parse import quote
from app.core.config import settings
@@ -23,7 +23,7 @@ class TorrentLeech:
self._proxy = settings.PROXY
self._timeout = indexer.get('timeout') or 15
def search(self, keyword: str, page: int = 0) -> Tuple[bool, List[dict]]:
def search(self, keyword: str, page: Optional[int] = 0) -> Tuple[bool, List[dict]]:
if StringUtils.is_chinese(keyword):
# 不支持中文

4
app/modules/indexer/spider/yema.py
View File

@@ -1,4 +1,4 @@
from typing import Tuple, List
from typing import Tuple, List, Optional
from app.core.config import settings
from app.db.systemconfig_oper import SystemConfigOper
@@ -57,7 +57,7 @@ class YemaSpider:
self._ua = indexer.get('ua')
self._timeout = indexer.get('timeout') or 15
def search(self, keyword: str, mtype: MediaType = None, page: int = 0) -> Tuple[bool, List[dict]]:
def search(self, keyword: str, mtype: MediaType = None, page: Optional[int] = 0) -> Tuple[bool, List[dict]]:
"""
搜索
"""

28
app/modules/jellyfin/__init__.py
View File

@@ -136,8 +136,8 @@ class JellyfinModule(_ModuleBase, _MediaServerBase[Jellyfin]):
return result
return None
def media_exists(self, mediainfo: MediaInfo, itemid: str = None,
server: str = None) -> Optional[schemas.ExistMediaInfo]:
def media_exists(self, mediainfo: MediaInfo, itemid: Optional[str] = None,
server: Optional[str] = None) -> Optional[schemas.ExistMediaInfo]:
"""
判断媒体文件是否存在
:param mediainfo: 识别的媒体信息
@@ -194,7 +194,7 @@ class JellyfinModule(_ModuleBase, _MediaServerBase[Jellyfin]):
)
return None
def media_statistic(self, server: str = None) -> Optional[List[schemas.Statistic]]:
def media_statistic(self, server: Optional[str] = None) -> Optional[List[schemas.Statistic]]:
"""
媒体数量统计
"""
@@ -214,9 +214,9 @@ class JellyfinModule(_ModuleBase, _MediaServerBase[Jellyfin]):
media_statistics.append(media_statistic)
return media_statistics
def mediaserver_librarys(self, server: str = None,
username: str = None,
hidden: bool = False) -> Optional[List[schemas.MediaServerLibrary]]:
def mediaserver_librarys(self, server: Optional[str] = None,
username: Optional[str] = None,
hidden: Optional[bool] = False) -> Optional[List[schemas.MediaServerLibrary]]:
"""
媒体库列表
"""
@@ -225,7 +225,7 @@ class JellyfinModule(_ModuleBase, _MediaServerBase[Jellyfin]):
return server_obj.get_librarys(username=username, hidden=hidden)
return None
def mediaserver_items(self, server: str, library_id: Union[str, int], start_index: int = 0,
def mediaserver_items(self, server: str, library_id: Union[str, int], start_index: Optional[int] = 0,
limit: Optional[int] = -1) -> Optional[Generator]:
"""
获取媒体服务器项目列表，支持分页和不分页逻辑，默认不分页获取所有数据
@@ -268,7 +268,7 @@ class JellyfinModule(_ModuleBase, _MediaServerBase[Jellyfin]):
) for season, episodes in seasoninfo.items()]
def mediaserver_playing(self, server: str,
count: int = 20, username: str = None) -> List[schemas.MediaServerPlayItem]:
count: Optional[int] = 20, username: Optional[str] = None) -> List[schemas.MediaServerPlayItem]:
"""
获取媒体服务器正在播放信息
"""
@@ -286,8 +286,8 @@ class JellyfinModule(_ModuleBase, _MediaServerBase[Jellyfin]):
return None
return server_obj.get_play_url(item_id)
def mediaserver_latest(self, server: str = None, count: int = 20,
username: str = None) -> List[schemas.MediaServerPlayItem]:
def mediaserver_latest(self, server: Optional[str] = None, count: Optional[int] = 20,
username: Optional[str] = None) -> List[schemas.MediaServerPlayItem]:
"""
获取媒体服务器最新入库条目
"""
@@ -297,10 +297,10 @@ class JellyfinModule(_ModuleBase, _MediaServerBase[Jellyfin]):
return server_obj.get_latest(num=count, username=username)
def mediaserver_latest_images(self,
server: str = None,
count: int = 20,
username: str = None,
remote: bool = False,
server: Optional[str] = None,
count: Optional[int] = 20,
username: Optional[str] = None,
remote: Optional[bool] = False,
) -> List[str]:
"""
获取媒体服务器最新入库条目的图片

38
app/modules/jellyfin/jellyfin.py
View File

@@ -14,13 +14,13 @@ from schemas import MediaServerItem
class Jellyfin:
_host: str = None
_apikey: str = None
_playhost: str = None
_host: Optional[str] = None
_apikey: Optional[str] = None
_playhost: Optional[str] = None
_sync_libraries: List[str] = []
user: Optional[Union[str, int]] = None
def __init__(self, host: str = None, apikey: str = None, play_host: str = None,
def __init__(self, host: Optional[str] = None, apikey: Optional[str] = None, play_host: Optional[str] = None,
sync_libraries: list = None, **kwargs):
if not host or not apikey:
logger.error("Jellyfin服务器配置不完整！！")
@@ -113,7 +113,7 @@ class Jellyfin:
logger.error(f"连接Library/VirtualFolders 出错：" + str(e))
return []
def __get_jellyfin_librarys(self, username: str = None) -> List[dict]:
def __get_jellyfin_librarys(self, username: Optional[str] = None) -> List[dict]:
"""
获取Jellyfin媒体库的信息
"""
@@ -136,7 +136,7 @@ class Jellyfin:
logger.error(f"连接Users/Views 出错：" + str(e))
return []
def get_librarys(self, username: str = None, hidden: bool = False) -> List[schemas.MediaServerLibrary]:
def get_librarys(self, username: Optional[str] = None, hidden: Optional[bool] = False) -> List[schemas.MediaServerLibrary]:
"""
获取媒体服务器所有媒体库列表
"""
@@ -193,7 +193,7 @@ class Jellyfin:
logger.error(f"连接Users出错：" + str(e))
return 0
def get_user(self, user_name: str = None) -> Optional[Union[str, int]]:
def get_user(self, user_name: Optional[str] = None) -> Optional[Union[str, int]]:
"""
获得管理员用户
"""
@@ -336,8 +336,8 @@ class Jellyfin:
def get_movies(self,
title: str,
year: str = None,
tmdb_id: int = None) -> Optional[List[schemas.MediaServerItem]]:
year: Optional[str] = None,
tmdb_id: Optional[int] = None) -> Optional[List[schemas.MediaServerItem]]:
"""
根据标题和年份，检查电影是否在Jellyfin中存在，存在则返回列表
:param title: 标题
@@ -379,11 +379,11 @@ class Jellyfin:
return []
def get_tv_episodes(self,
item_id: str = None,
title: str = None,
year: str = None,
tmdb_id: int = None,
season: int = None) -> Tuple[Optional[str], Optional[Dict[int, list]]]:
item_id: Optional[str] = None,
title: Optional[str] = None,
year: Optional[str] = None,
tmdb_id: Optional[int] = None,
season: Optional[int] = None) -> Tuple[Optional[str], Optional[Dict[int, list]]]:
"""
根据标题和年份和季，返回Jellyfin中的剧集列表
:param item_id: Jellyfin中的Id
@@ -761,7 +761,7 @@ class Jellyfin:
logger.error(f"连接Users/{self.user}/Items/{itemid}：" + str(e))
return None
def get_items(self, parent: Union[str, int], start_index: int = 0, limit: Optional[int] = -1) \
def get_items(self, parent: Union[str, int], start_index: Optional[int] = 0, limit: Optional[int] = -1) \
-> Generator[MediaServerItem | None | Any, Any, None]:
"""
获取媒体服务器项目列表，支持分页和不分页逻辑，默认不分页获取所有数据
@@ -817,7 +817,7 @@ class Jellyfin:
logger.error(f"连接Jellyfin出错：" + str(e))
return None
def post_data(self, url: str, data: str = None, headers: dict = None) -> Optional[Response]:
def post_data(self, url: str, data: Optional[str] = None, headers: dict = None) -> Optional[Response]:
"""
自定义URL从媒体服务器获取数据，其中[HOST]、[APIKEY]、[USER]会被替换成实际的值
:param url: 请求地址
@@ -856,7 +856,7 @@ class Jellyfin:
return ""
return "%sItems/%s/Images/Primary" % (self._host, item_id)
def get_backdrop_url(self, item_id: str, image_tag: str, remote: bool = False) -> str:
def get_backdrop_url(self, item_id: str, image_tag: str, remote: Optional[bool] = False) -> str:
"""
获取Backdrop图片地址
:param: item_id: 在Jellyfin中的ID
@@ -874,7 +874,7 @@ class Jellyfin:
return f"{host_url}Items/{item_id}/" \
f"Images/Backdrop?tag={image_tag}&api_key={self._apikey}"
def get_resume(self, num: int = 12, username: str = None) -> Optional[List[schemas.MediaServerPlayItem]]:
def get_resume(self, num: Optional[int] = 12, username: Optional[str] = None) -> Optional[List[schemas.MediaServerPlayItem]]:
"""
获得继续观看
"""
@@ -941,7 +941,7 @@ class Jellyfin:
logger.error(f"连接Users/Items/Resume出错：" + str(e))
return []
def get_latest(self, num=20, username: str = None) -> Optional[List[schemas.MediaServerPlayItem]]:
def get_latest(self, num=20, username: Optional[str] = None) -> Optional[List[schemas.MediaServerPlayItem]]:
"""
获得最近更新
"""

20
app/modules/plex/__init__.py
View File

@@ -139,8 +139,8 @@ class PlexModule(_ModuleBase, _MediaServerBase[Plex]):
return result
return None
def media_exists(self, mediainfo: MediaInfo, itemid: str = None,
server: str = None) -> Optional[schemas.ExistMediaInfo]:
def media_exists(self, mediainfo: MediaInfo, itemid: Optional[str] = None,
server: Optional[str] = None) -> Optional[schemas.ExistMediaInfo]:
"""
判断媒体文件是否存在
:param mediainfo: 识别的媒体信息
@@ -201,7 +201,7 @@ class PlexModule(_ModuleBase, _MediaServerBase[Plex]):
)
return None
def media_statistic(self, server: str = None) -> Optional[List[schemas.Statistic]]:
def media_statistic(self, server: Optional[str] = None) -> Optional[List[schemas.Statistic]]:
"""
媒体数量统计
"""
@@ -221,7 +221,7 @@ class PlexModule(_ModuleBase, _MediaServerBase[Plex]):
media_statistics.append(media_statistic)
return media_statistics
def mediaserver_librarys(self, server: str = None, hidden: bool = False,
def mediaserver_librarys(self, server: Optional[str] = None, hidden: Optional[bool] = False,
**kwargs) -> Optional[List[schemas.MediaServerLibrary]]:
"""
媒体库列表
@@ -231,7 +231,7 @@ class PlexModule(_ModuleBase, _MediaServerBase[Plex]):
return server_obj.get_librarys(hidden)
return None
def mediaserver_items(self, server: str, library_id: Union[str, int], start_index: int = 0,
def mediaserver_items(self, server: str, library_id: Union[str, int], start_index: Optional[int] = 0,
limit: Optional[int] = -1) -> Optional[Generator]:
"""
获取媒体服务器项目列表，支持分页和不分页逻辑，默认不分页获取所有数据
@@ -273,7 +273,7 @@ class PlexModule(_ModuleBase, _MediaServerBase[Plex]):
episodes=episodes
) for season, episodes in seasoninfo.items()]
def mediaserver_playing(self, server: str, count: int = 20, **kwargs) -> List[schemas.MediaServerPlayItem]:
def mediaserver_playing(self, server: str, count: Optional[int] = 20, **kwargs) -> List[schemas.MediaServerPlayItem]:
"""
获取媒体服务器正在播放信息
"""
@@ -282,7 +282,7 @@ class PlexModule(_ModuleBase, _MediaServerBase[Plex]):
return []
return server_obj.get_resume(num=count)
def mediaserver_latest(self, server: str = None, count: int = 20,
def mediaserver_latest(self, server: Optional[str] = None, count: Optional[int] = 20,
**kwargs) -> List[schemas.MediaServerPlayItem]:
"""
获取媒体服务器最新入库条目
@@ -293,9 +293,9 @@ class PlexModule(_ModuleBase, _MediaServerBase[Plex]):
return server_obj.get_latest(num=count)
def mediaserver_latest_images(self,
server: str = None,
count: int = 20,
username: str = None,
server: Optional[str] = None,
count: Optional[int] = 20,
username: Optional[str] = None,
**kwargs
) -> List[str]:
"""

32
app/modules/plex/plex.py
View File

@@ -22,7 +22,7 @@ class Plex:
_session = None
_sync_libraries: List[str] = []
def __init__(self, host: str = None, token: str = None, play_host: str = None,
def __init__(self, host: Optional[str] = None, token: Optional[str] = None, play_host: Optional[str] = None,
sync_libraries: list = None, **kwargs):
if not host or not token:
logger.error("Plex服务器配置不完整！")
@@ -122,7 +122,7 @@ class Plex:
return [f"{self._host.rstrip('/') + url}?X-Plex-Token={self._token}" for url in
list(poster_urls.keys())[:total_size]]
def get_librarys(self, hidden: bool = False) -> List[schemas.MediaServerLibrary]:
def get_librarys(self, hidden: Optional[bool] = False) -> List[schemas.MediaServerLibrary]:
"""
获取媒体服务器所有媒体库列表
"""
@@ -186,9 +186,9 @@ class Plex:
def get_movies(self,
title: str,
original_title: str = None,
year: str = None,
tmdb_id: int = None) -> Optional[List[schemas.MediaServerItem]]:
original_title: Optional[str] = None,
year: Optional[str] = None,
tmdb_id: Optional[int] = None) -> Optional[List[schemas.MediaServerItem]]:
"""
根据标题和年份，检查电影是否在Plex中存在，存在则返回列表
:param title: 标题
@@ -241,12 +241,12 @@ class Plex:
return ret_movies
def get_tv_episodes(self,
item_id: str = None,
title: str = None,
original_title: str = None,
year: str = None,
tmdb_id: int = None,
season: int = None) -> Tuple[Optional[str], Optional[Dict[int, list]]]:
item_id: Optional[str] = None,
title: Optional[str] = None,
original_title: Optional[str] = None,
year: Optional[str] = None,
tmdb_id: Optional[int] = None,
season: Optional[int] = None) -> Tuple[Optional[str], Optional[Dict[int, list]]]:
"""
根据标题、年份、季查询电视剧所有集信息
:param item_id: 媒体ID
@@ -296,8 +296,8 @@ class Plex:
def get_remote_image_by_id(self,
item_id: str,
image_type: str,
depth: int = 0,
plex_url: bool = True) -> Optional[str]:
depth: Optional[int] = 0,
plex_url: Optional[bool] = True) -> Optional[str]:
"""
根据ItemId从Plex查询图片地址
:param item_id: 在Plex中的ID
@@ -511,7 +511,7 @@ class Plex:
user_state=user_state,
)
def get_items(self, parent: Union[str, int], start_index: int = 0, limit: Optional[int] = -1) \
def get_items(self, parent: Union[str, int], start_index: Optional[int] = 0, limit: Optional[int] = -1) \
-> Generator[MediaServerItem | None, Any, None]:
"""
获取媒体服务器项目列表，支持分页和不分页逻辑，默认不分页获取所有数据
@@ -718,7 +718,7 @@ class Plex:
"""
return f'{self._playhost or self._host}web/index.html#!/server/{self._plex.machineIdentifier}/details?key={item_id}'
def get_resume(self, num: int = 12) -> Optional[List[schemas.MediaServerPlayItem]]:
def get_resume(self, num: Optional[int] = 12) -> Optional[List[schemas.MediaServerPlayItem]]:
"""
获取继续观看的媒体
"""
@@ -754,7 +754,7 @@ class Plex:
))
return ret_resume[:num]
def get_latest(self, num: int = 20) -> Optional[List[schemas.MediaServerPlayItem]]:
def get_latest(self, num: Optional[int] = 20) -> Optional[List[schemas.MediaServerPlayItem]]:
"""
获取最近添加媒体
"""

20
app/modules/qbittorrent/__init__.py
View File

@@ -78,8 +78,8 @@ class QbittorrentModule(_ModuleBase, _DownloaderBase[Qbittorrent]):
server.reconnect()
def download(self, content: Union[Path, str], download_dir: Path, cookie: str,
episodes: Set[int] = None, category: str = None, label: str = None,
downloader: str = None) -> Optional[Tuple[Optional[str], Optional[str], Optional[str], str]]:
episodes: Set[int] = None, category: Optional[str] = None, label: Optional[str] = None,
downloader: Optional[str] = None) -> Optional[Tuple[Optional[str], Optional[str], Optional[str], str]]:
"""
根据种子文件，选择并添加下载任务
:param content: 种子文件地址或者磁力链接
@@ -208,7 +208,7 @@ class QbittorrentModule(_ModuleBase, _DownloaderBase[Qbittorrent]):
def list_torrents(self, status: TorrentStatus = None,
hashs: Union[list, str] = None,
downloader: str = None
downloader: Optional[str] = None
) -> Optional[List[Union[TransferTorrent, DownloadingTorrent]]]:
"""
获取下载器种子列表
@@ -293,7 +293,7 @@ class QbittorrentModule(_ModuleBase, _DownloaderBase[Qbittorrent]):
return None
return ret_torrents
def transfer_completed(self, hashs: str, downloader: str = None) -> None:
def transfer_completed(self, hashs: str, downloader: Optional[str] = None) -> None:
"""
转移完成后的处理
:param hashs: 种子Hash
@@ -304,8 +304,8 @@ class QbittorrentModule(_ModuleBase, _DownloaderBase[Qbittorrent]):
return None
server.set_torrents_tag(ids=hashs, tags=['已整理'])
def remove_torrents(self, hashs: Union[str, list], delete_file: bool = True,
downloader: str = None) -> Optional[bool]:
def remove_torrents(self, hashs: Union[str, list], delete_file: Optional[bool] = True,
downloader: Optional[str] = None) -> Optional[bool]:
"""
删除下载器种子
:param hashs: 种子Hash
@@ -319,7 +319,7 @@ class QbittorrentModule(_ModuleBase, _DownloaderBase[Qbittorrent]):
return server.delete_torrents(delete_file=delete_file, ids=hashs)
def start_torrents(self, hashs: Union[list, str],
downloader: str = None) -> Optional[bool]:
downloader: Optional[str] = None) -> Optional[bool]:
"""
开始下载
:param hashs: 种子Hash
@@ -331,7 +331,7 @@ class QbittorrentModule(_ModuleBase, _DownloaderBase[Qbittorrent]):
return None
return server.start_torrents(ids=hashs)
def stop_torrents(self, hashs: Union[list, str], downloader: str = None) -> Optional[bool]:
def stop_torrents(self, hashs: Union[list, str], downloader: Optional[str] = None) -> Optional[bool]:
"""
停止下载
:param hashs: 种子Hash
@@ -343,7 +343,7 @@ class QbittorrentModule(_ModuleBase, _DownloaderBase[Qbittorrent]):
return None
return server.stop_torrents(ids=hashs)
def torrent_files(self, tid: str, downloader: str = None) -> Optional[TorrentFilesList]:
def torrent_files(self, tid: str, downloader: Optional[str] = None) -> Optional[TorrentFilesList]:
"""
获取种子文件列表
"""
@@ -352,7 +352,7 @@ class QbittorrentModule(_ModuleBase, _DownloaderBase[Qbittorrent]):
return None
return server.get_files(tid=tid)
def downloader_info(self, downloader: str = None) -> Optional[List[schemas.DownloaderInfo]]:
def downloader_info(self, downloader: Optional[str] = None) -> Optional[List[schemas.DownloaderInfo]]:
"""
下载器信息
"""

28
app/modules/qbittorrent/qbittorrent.py
View File

@@ -12,20 +12,20 @@ from app.utils.string import StringUtils
class Qbittorrent:
_host: str = None
_host: Optional[str] = None
_port: int = None
_username: str = None
_password: str = None
_category: bool = False
_sequentail: bool = False
_force_resume: bool = False
_username: Optional[str] = None
_password: Optional[str] = None
_category: Optional[bool] = False
_sequentail: Optional[bool] = False
_force_resume: Optional[bool] = False
qbc: Client = None
def __init__(self, host: str = None, port: int = None,
username: str = None, password: str = None,
category: bool = False, sequentail: bool = False,
force_resume: bool = False, first_last_piece=False,
def __init__(self, host: Optional[str] = None, port: int = None,
username: Optional[str] = None, password: Optional[str] = None,
category: Optional[bool] = False, sequentail: Optional[bool] = False,
force_resume: Optional[bool] = False, first_last_piece=False,
**kwargs):
"""
若不设置参数，则创建配置文件设置的下载器
@@ -236,11 +236,11 @@ class Qbittorrent:
def add_torrent(self,
content: Union[str, bytes],
is_paused: bool = False,
download_dir: str = None,
is_paused: Optional[bool] = False,
download_dir: Optional[str] = None,
tag: Union[str, list] = None,
category: str = None,
cookie=None,
category: Optional[str] = None,
cookie: Optional[str] = None,
**kwargs
) -> bool:
"""

9
app/modules/slack/slack.py
View File

@@ -24,7 +24,8 @@ class Slack:
_ds_url = f"http://127.0.0.1:{settings.PORT}/api/v1/message?token={settings.API_TOKEN}"
_channel = ""
def __init__(self, SLACK_OAUTH_TOKEN: str = None, SLACK_APP_TOKEN: str = None, SLACK_CHANNEL: str = "", **kwargs):
def __init__(self, SLACK_OAUTH_TOKEN: Optional[str] = None, SLACK_APP_TOKEN: Optional[str] = None,
SLACK_CHANNEL: Optional[str] = None, **kwargs):
if not SLACK_OAUTH_TOKEN or not SLACK_APP_TOKEN:
logger.error("Slack 配置不完整！")
@@ -100,7 +101,7 @@ class Slack:
"""
return True if self._client else False
def send_msg(self, title: str, text: str = "", image: str = "", link: str = "", userid: str = ""):
def send_msg(self, title: str, text: Optional[str] = None, image: Optional[str] = None, link: Optional[str] = None, userid: Optional[str] = None):
"""
发送Telegram消息
:param title: 消息标题
@@ -168,7 +169,7 @@ class Slack:
logger.error(f"Slack消息发送失败: {msg_e}")
return False, str(msg_e)
def send_medias_msg(self, medias: List[MediaInfo], userid: str = "", title: str = "") -> Optional[bool]:
def send_medias_msg(self, medias: List[MediaInfo], userid: Optional[str] = None, title: Optional[str] = None) -> Optional[bool]:
"""
发送列表类消息
"""
@@ -252,7 +253,7 @@ class Slack:
return False
def send_torrents_msg(self, torrents: List[Context],
userid: str = "", title: str = "") -> Optional[bool]:
userid: Optional[str] = None, title: Optional[str] = None) -> Optional[bool]:
"""
发送列表消息
"""

10
app/modules/synologychat/synologychat.py
View File

@@ -14,7 +14,7 @@ lock = Lock()
class SynologyChat:
def __init__(self, SYNOLOGYCHAT_WEBHOOK: str = None, SYNOLOGYCHAT_TOKEN: str = None, **kwargs):
def __init__(self, SYNOLOGYCHAT_WEBHOOK: Optional[str] = None, SYNOLOGYCHAT_TOKEN: Optional[str] = None, **kwargs):
if not SYNOLOGYCHAT_WEBHOOK or not SYNOLOGYCHAT_TOKEN:
logger.error("SynologyChat配置不完整！")
return
@@ -38,8 +38,8 @@ class SynologyChat:
return True
return False
def send_msg(self, title: str, text: str = "", image: str = "",
userid: str = "", link: str = None) -> Optional[bool]:
def send_msg(self, title: str, text: Optional[str] = None, image: Optional[str] = None,
userid: Optional[str] = None, link: Optional[str] = None) -> Optional[bool]:
"""
发送Telegram消息
:param title: 消息标题
@@ -90,7 +90,7 @@ class SynologyChat:
logger.error(f"SynologyChat发送消息错误：{str(msg_e)}")
return False
def send_medias_msg(self, medias: List[MediaInfo], userid: str = "", title: str = "") -> Optional[bool]:
def send_medias_msg(self, medias: List[MediaInfo], userid: Optional[str] = None, title: Optional[str] = None) -> Optional[bool]:
"""
发送列表类消息
"""
@@ -135,7 +135,7 @@ class SynologyChat:
return False
def send_torrents_msg(self, torrents: List[Context],
userid: str = "", title: str = "", link: str = None) -> Optional[bool]:
userid: Optional[str] = None, title: Optional[str] = None, link: Optional[str] = None) -> Optional[bool]:
"""
发送列表消息
"""

14
app/modules/telegram/telegram.py
View File

@@ -25,7 +25,7 @@ class Telegram:
_event = Event()
_bot: telebot.TeleBot = None
def __init__(self, TELEGRAM_TOKEN: str = None, TELEGRAM_CHAT_ID: str = None, **kwargs):
def __init__(self, TELEGRAM_TOKEN: Optional[str] = None, TELEGRAM_CHAT_ID: Optional[str] = None, **kwargs):
"""
初始化参数
"""
@@ -74,8 +74,8 @@ class Telegram:
"""
return self._bot is not None
def send_msg(self, title: str, text: str = "", image: str = "",
userid: str = "", link: str = None) -> Optional[bool]:
def send_msg(self, title: str, text: Optional[str] = None, image: Optional[str] = None,
userid: Optional[str] = None, link: Optional[str] = None) -> Optional[bool]:
"""
发送Telegram消息
:param title: 消息标题
@@ -114,8 +114,8 @@ class Telegram:
logger.error(f"发送消息失败：{msg_e}")
return False
def send_medias_msg(self, medias: List[MediaInfo], userid: str = "",
title: str = "", link: str = None) -> Optional[bool]:
def send_medias_msg(self, medias: List[MediaInfo], userid: Optional[str] = None,
title: Optional[str] = None, link: Optional[str] = None) -> Optional[bool]:
"""
发送媒体列表消息
"""
@@ -157,7 +157,7 @@ class Telegram:
return False
def send_torrents_msg(self, torrents: List[Context],
userid: str = "", title: str = "", link: str = None) -> Optional[bool]:
userid: Optional[str] = None, title: Optional[str] = None, link: Optional[str] = None) -> Optional[bool]:
"""
发送列表消息
"""
@@ -202,7 +202,7 @@ class Telegram:
return False
@retry(Exception, logger=logger)
def __send_request(self, userid: str = None, image="", caption="") -> bool:
def __send_request(self, userid: Optional[str] = None, image="", caption="") -> bool:
"""
向Telegram发送报文
"""

26
app/modules/themoviedb/__init__.py
View File

@@ -84,8 +84,8 @@ class TheMovieDbModule(_ModuleBase):
def recognize_media(self, meta: MetaBase = None,
mtype: MediaType = None,
tmdbid: int = None,
cache: bool = True,
tmdbid: Optional[int] = None,
cache: Optional[bool] = True,
**kwargs) -> Optional[MediaInfo]:
"""
识别媒体信息
@@ -219,7 +219,7 @@ class TheMovieDbModule(_ModuleBase):
return None
def match_tmdbinfo(self, name: str, mtype: MediaType = None,
year: str = None, season: int = None) -> dict:
year: Optional[str] = None, season: Optional[int] = None) -> dict:
"""
搜索和匹配TMDB信息
:param name: 名称
@@ -239,7 +239,7 @@ class TheMovieDbModule(_ModuleBase):
tmdbid=info.get("id"))
return info
def tmdb_info(self, tmdbid: int, mtype: MediaType, season: int = None) -> Optional[dict]:
def tmdb_info(self, tmdbid: int, mtype: MediaType, season: Optional[int] = None) -> Optional[dict]:
"""
获取TMDB信息
:param tmdbid: int
@@ -334,7 +334,7 @@ class TheMovieDbModule(_ModuleBase):
return []
def metadata_nfo(self, meta: MetaBase, mediainfo: MediaInfo,
season: int = None, episode: int = None) -> Optional[str]:
season: Optional[int] = None, episode: Optional[int] = None) -> Optional[str]:
"""
获取NFO文件内容文本
:param meta: 元数据
@@ -346,7 +346,7 @@ class TheMovieDbModule(_ModuleBase):
return None
return self.scraper.get_metadata_nfo(meta=meta, mediainfo=mediainfo, season=season, episode=episode)
def metadata_img(self, mediainfo: MediaInfo, season: int = None, episode: int = None) -> Optional[dict]:
def metadata_img(self, mediainfo: MediaInfo, season: Optional[int] = None, episode: Optional[int] = None) -> Optional[dict]:
"""
获取图片名称和url
:param mediainfo: 媒体信息
@@ -365,7 +365,7 @@ class TheMovieDbModule(_ModuleBase):
vote_average: float,
vote_count: int,
release_date: str,
page: int = 1) -> Optional[List[MediaInfo]]:
page: Optional[int] = 1) -> Optional[List[MediaInfo]]:
"""
:param mtype: 媒体类型
:param sort_by: 排序方式
@@ -409,7 +409,7 @@ class TheMovieDbModule(_ModuleBase):
return [MediaInfo(tmdb_info=info) for info in infos]
return []
def tmdb_trending(self, page: int = 1) -> List[MediaInfo]:
def tmdb_trending(self, page: Optional[int] = 1) -> List[MediaInfo]:
"""
TMDB流行趋势
:param page: 第几页
@@ -493,8 +493,8 @@ class TheMovieDbModule(_ModuleBase):
return mediainfo
def obtain_specific_image(self, mediaid: Union[str, int], mtype: MediaType,
image_type: MediaImageType, image_prefix: str = "w500",
season: int = None, episode: int = None) -> Optional[str]:
image_type: MediaImageType, image_prefix: Optional[str] = "w500",
season: Optional[int] = None, episode: Optional[int] = None) -> Optional[str]:
"""
获取指定媒体信息图片，返回图片地址
:param mediaid: 媒体ID
@@ -566,7 +566,7 @@ class TheMovieDbModule(_ModuleBase):
return [MediaInfo(tmdb_info=info) for info in recommend]
return []
def tmdb_movie_credits(self, tmdbid: int, page: int = 1) -> List[schemas.MediaPerson]:
def tmdb_movie_credits(self, tmdbid: int, page: Optional[int] = 1) -> List[schemas.MediaPerson]:
"""
根据TMDBID查询电影演职员表
:param tmdbid: TMDBID
@@ -577,7 +577,7 @@ class TheMovieDbModule(_ModuleBase):
return [schemas.MediaPerson(source="themoviedb", **info) for info in credit_infos]
return []
def tmdb_tv_credits(self, tmdbid: int, page: int = 1) -> List[schemas.MediaPerson]:
def tmdb_tv_credits(self, tmdbid: int, page: Optional[int] = 1) -> List[schemas.MediaPerson]:
"""
根据TMDBID查询电视剧演职员表
:param tmdbid: TMDBID
@@ -598,7 +598,7 @@ class TheMovieDbModule(_ModuleBase):
return schemas.MediaPerson(source="themoviedb", **detail)
return schemas.MediaPerson()
def tmdb_person_credits(self, person_id: int, page: int = 1) -> List[MediaInfo]:
def tmdb_person_credits(self, person_id: int, page: Optional[int] = 1) -> List[MediaInfo]:
"""
根据TMDBID查询人物参演作品
:param person_id: 人物ID

4
app/modules/themoviedb/scraper.py
View File

@@ -18,7 +18,7 @@ class TmdbScraper:
self.tmdb = tmdb
def get_metadata_nfo(self, meta: MetaBase, mediainfo: MediaInfo,
season: int = None, episode: int = None) -> Optional[str]:
season: Optional[int] = None, episode: Optional[int] = None) -> Optional[str]:
"""
获取NFO文件内容文本
:param meta: 元数据
@@ -49,7 +49,7 @@ class TmdbScraper:
return None
def get_metadata_img(self, mediainfo: MediaInfo, season: int = None, episode: int = None) -> dict:
def get_metadata_img(self, mediainfo: MediaInfo, season: Optional[int] = None, episode: Optional[int] = None) -> dict:
"""
获取图片名称和url
:param mediainfo: 媒体信息

32
app/modules/themoviedb/tmdbapi.py
View File

@@ -41,8 +41,8 @@ class TmdbApi:
self.search = Search()
self.movie = Movie()
self.tv = TV()
self.season = Season()
self.episode = Episode()
self.season_obj = Season()
self.episode_obj = Episode()
self.discover = Discover()
self.trending = Trending()
self.person = Person()
@@ -185,9 +185,9 @@ class TmdbApi:
def match(self, name: str,
mtype: MediaType,
year: str = None,
season_year: str = None,
season_number: int = None) -> Optional[dict]:
year: Optional[str] = None,
season_year: Optional[str] = None,
season_number: Optional[int] = None) -> Optional[dict]:
"""
搜索tmdb中的媒体信息，匹配返回一条尽可能正确的信息
:param name: 检索的名称
@@ -732,7 +732,7 @@ class TmdbApi:
更新TMDB信息中的其它语种名称
"""
def __get_tmdb_lang_title(tmdbinfo: dict, lang: str = "US") -> Optional[str]:
def __get_tmdb_lang_title(tmdbinfo: dict, lang: Optional[str] = "US") -> Optional[str]:
"""
从译名中获取其它语种标题
"""
@@ -767,7 +767,7 @@ class TmdbApi:
def __get_movie_detail(self,
tmdbid: int,
append_to_response: str = "images,"
append_to_response: Optional[str] = "images,"
"credits,"
"alternative_titles,"
"translations,"
@@ -880,7 +880,7 @@ class TmdbApi:
def __get_tv_detail(self,
tmdbid: int,
append_to_response: str = "images,"
append_to_response: Optional[str] = "images,"
"credits,"
"alternative_titles,"
"translations,"
@@ -1126,11 +1126,11 @@ class TmdbApi:
"season_number": 1
}
"""
if not self.season:
if not self.season_obj:
return {}
try:
logger.debug("正在查询TMDB电视剧：%s，季：%s ..." % (tmdbid, season))
tmdbinfo = self.season.details(tv_id=tmdbid, season_num=season)
tmdbinfo = self.season_obj.details(tv_id=tmdbid, season_num=season)
return tmdbinfo or {}
except Exception as e:
logger.error(str(e))
@@ -1143,11 +1143,11 @@ class TmdbApi:
:param season: 季，数字
:param episode: 集，数字
"""
if not self.episode:
if not self.episode_obj:
return {}
try:
logger.debug("正在查询TMDB集详情：%s，季：%s，集：%s ..." % (tmdbid, season, episode))
tmdbinfo = self.episode.details(tv_id=tmdbid, season_num=season, episode_num=episode)
tmdbinfo = self.episode_obj.details(tv_id=tmdbid, season_num=season, episode_num=episode)
return tmdbinfo or {}
except Exception as e:
logger.error(str(e))
@@ -1191,7 +1191,7 @@ class TmdbApi:
logger.error(str(e))
return []
def discover_trending(self, page: int = 1) -> List[dict]:
def discover_trending(self, page: Optional[int] = 1) -> List[dict]:
"""
流行趋势
"""
@@ -1282,7 +1282,7 @@ class TmdbApi:
logger.error(str(e))
return []
def get_movie_credits(self, tmdbid: int, page: int = 1, count: int = 24) -> List[dict]:
def get_movie_credits(self, tmdbid: int, page: Optional[int] = 1, count: Optional[int] = 24) -> List[dict]:
"""
获取电影的演职员列表
"""
@@ -1299,7 +1299,7 @@ class TmdbApi:
logger.error(str(e))
return []
def get_tv_credits(self, tmdbid: int, page: int = 1, count: int = 24) -> List[dict]:
def get_tv_credits(self, tmdbid: int, page: Optional[int] = 1, count: Optional[int] = 24) -> List[dict]:
"""
获取电视剧的演职员列表
"""
@@ -1349,7 +1349,7 @@ class TmdbApi:
logger.error(str(e))
return {}
def get_person_credits(self, person_id: int, page: int = 1, count: int = 24) -> List[dict]:
def get_person_credits(self, person_id: int, page: Optional[int] = 1, count: Optional[int] = 24) -> List[dict]:
"""
获取人物参演作品
"""

20
app/modules/transmission/__init__.py
View File

@@ -79,8 +79,8 @@ class TransmissionModule(_ModuleBase, _DownloaderBase[Transmission]):
server.reconnect()
def download(self, content: Union[Path, str], download_dir: Path, cookie: str,
episodes: Set[int] = None, category: str = None, label: str = None,
downloader: str = None) -> Optional[Tuple[Optional[str], Optional[str], Optional[str], str]]:
episodes: Set[int] = None, category: Optional[str] = None, label: Optional[str] = None,
downloader: Optional[str] = None) -> Optional[Tuple[Optional[str], Optional[str], Optional[str], str]]:
"""
根据种子文件，选择并添加下载任务
:param content: 种子文件地址或者磁力链接
@@ -200,7 +200,7 @@ class TransmissionModule(_ModuleBase, _DownloaderBase[Transmission]):
def list_torrents(self, status: TorrentStatus = None,
hashs: Union[list, str] = None,
downloader: str = None
downloader: Optional[str] = None
) -> Optional[List[Union[TransferTorrent, DownloadingTorrent]]]:
"""
获取下载器种子列表
@@ -280,7 +280,7 @@ class TransmissionModule(_ModuleBase, _DownloaderBase[Transmission]):
return None
return ret_torrents
def transfer_completed(self, hashs: str, downloader: str = None) -> None:
def transfer_completed(self, hashs: str, downloader: Optional[str] = None) -> None:
"""
转移完成后的处理
:param hashs: 种子Hash
@@ -299,8 +299,8 @@ class TransmissionModule(_ModuleBase, _DownloaderBase[Transmission]):
tags = ['已整理']
server.set_torrent_tag(ids=hashs, tags=tags)
def remove_torrents(self, hashs: Union[str, list], delete_file: bool = True,
downloader: str = None) -> Optional[bool]:
def remove_torrents(self, hashs: Union[str, list], delete_file: Optional[bool] = True,
downloader: Optional[str] = None) -> Optional[bool]:
"""
删除下载器种子
:param hashs: 种子Hash
@@ -315,7 +315,7 @@ class TransmissionModule(_ModuleBase, _DownloaderBase[Transmission]):
return server.delete_torrents(delete_file=delete_file, ids=hashs)
def start_torrents(self, hashs: Union[list, str],
downloader: str = None) -> Optional[bool]:
downloader: Optional[str] = None) -> Optional[bool]:
"""
开始下载
:param hashs: 种子Hash
@@ -329,7 +329,7 @@ class TransmissionModule(_ModuleBase, _DownloaderBase[Transmission]):
return server.start_torrents(ids=hashs)
def stop_torrents(self, hashs: Union[list, str],
downloader: str = None) -> Optional[bool]:
downloader: Optional[str] = None) -> Optional[bool]:
"""
停止下载
:param hashs: 种子Hash
@@ -342,7 +342,7 @@ class TransmissionModule(_ModuleBase, _DownloaderBase[Transmission]):
return None
return server.start_torrents(ids=hashs)
def torrent_files(self, tid: str, downloader: str = None) -> Optional[List[File]]:
def torrent_files(self, tid: str, downloader: Optional[str] = None) -> Optional[List[File]]:
"""
获取种子文件列表
"""
@@ -352,7 +352,7 @@ class TransmissionModule(_ModuleBase, _DownloaderBase[Transmission]):
return None
return server.get_files(tid=tid)
def downloader_info(self, downloader: str = None) -> Optional[List[schemas.DownloaderInfo]]:
def downloader_info(self, downloader: Optional[str] = None) -> Optional[List[schemas.DownloaderInfo]]:
"""
下载器信息
"""

15
app/modules/transmission/transmission.py
View File

@@ -10,10 +10,10 @@ from app.utils.url import UrlUtils
class Transmission:
_protocol: Literal["http", "https"] = "http"
_host: str = None
_port: int = None
_username: str = None
_password: str = None
_host: Optional[str] = None
_port: Optional[int] = None
_username: Optional[str] = None
_password: Optional[str] = None
trc: Optional[Client] = None
@@ -24,7 +24,8 @@ class Transmission:
"peersGettingFromUs", "peersSendingToUs", "uploadRatio", "uploadedEver", "downloadedEver", "downloadDir",
"error", "errorString", "doneDate", "queuePosition", "activityDate", "trackers"]
def __init__(self, host: str = None, port: int = None, username: str = None, password: str = None, **kwargs):
def __init__(self, host: Optional[str] = None, port: Optional[int] = None,
username: Optional[str] = None, password: Optional[str] = None, **kwargs):
"""
若不设置参数，则创建配置文件设置的下载器
"""
@@ -173,8 +174,8 @@ class Transmission:
return []
def add_torrent(self, content: Union[str, bytes],
is_paused: bool = False,
download_dir: str = None,
is_paused: Optional[bool] = False,
download_dir: Optional[str] = None,
labels=None,
cookie=None) -> Optional[Torrent]:
"""

12
app/modules/vocechat/vocechat.py
View File

@@ -22,7 +22,7 @@ class VoceChat:
# 请求对象
_client = None
def __init__(self, VOCECHAT_HOST: str = None, VOCECHAT_API_KEY: str = None, VOCECHAT_CHANNEL_ID: str = None, **kwargs):
def __init__(self, VOCECHAT_HOST: Optional[str] = None, VOCECHAT_API_KEY: Optional[str] = None, VOCECHAT_CHANNEL_ID: Optional[str] = None, **kwargs):
"""
初始化
"""
@@ -60,8 +60,8 @@ class VoceChat:
if result and result.status_code == 200:
return result.json()
def send_msg(self, title: str, text: str = "",
userid: str = None, link: str = None) -> Optional[bool]:
def send_msg(self, title: str, text: Optional[str] = None,
userid: Optional[str] = None, link: Optional[str] = None) -> Optional[bool]:
"""
微信消息发送入口，支持文本、图片、链接跳转、指定发送对象
:param title: 消息标题
@@ -98,7 +98,7 @@ class VoceChat:
return False
def send_medias_msg(self, title: str, medias: List[MediaInfo],
userid: str = "", link: str = None) -> Optional[bool]:
userid: Optional[str] = None, link: Optional[str] = None) -> Optional[bool]:
"""
发送列表类消息
"""
@@ -138,7 +138,9 @@ class VoceChat:
return False
def send_torrents_msg(self, torrents: List[Context],
userid: str = "", title: str = "", link: str = None) -> Optional[bool]:
userid: Optional[str] = None,
title: Optional[str] = None,
link: Optional[str] = None) -> Optional[bool]:
"""
发送列表消息
"""

20
app/modules/wechat/wechat.py
View File

@@ -40,8 +40,8 @@ class WeChat:
# 企业微信删除菜单URL
_delete_menu_url = "cgi-bin/menu/delete?access_token={access_token}&agentid={agentid}"
def __init__(self, WECHAT_CORPID: str = None, WECHAT_APP_SECRET: str = None,
WECHAT_APP_ID: str = None, WECHAT_PROXY: str = None, **kwargs):
def __init__(self, WECHAT_CORPID: Optional[str] = None, WECHAT_APP_SECRET: Optional[str] = None,
WECHAT_APP_ID: Optional[str] = None, WECHAT_PROXY: Optional[str] = None, **kwargs):
"""
初始化
"""
@@ -159,8 +159,8 @@ class WeChat:
return content_chunks
def __send_message(self, title: str, text: str = None,
userid: str = None, link: str = None) -> bool:
def __send_message(self, title: str, text: Optional[str] = None,
userid: Optional[str] = None, link: Optional[str] = None) -> bool:
"""
发送文本消息
:param title: 消息标题
@@ -206,7 +206,7 @@ class WeChat:
return True
def __send_image_message(self, title: str, text: str, image_url: str,
userid: str = None, link: str = None) -> Optional[bool]:
userid: Optional[str] = None, link: Optional[str] = None) -> Optional[bool]:
"""
发送图文消息
:param title: 消息标题
@@ -241,8 +241,8 @@ class WeChat:
logger.error(f"发送图文消息失败：{e}")
return False
def send_msg(self, title: str, text: str = "", image: str = "",
userid: str = None, link: str = None) -> Optional[bool]:
def send_msg(self, title: str, text: Optional[str] = None, image: Optional[str] = None,
userid: Optional[str] = None, link: Optional[str] = None) -> Optional[bool]:
"""
微信消息发送入口，支持文本、图片、链接跳转、指定发送对象
:param title: 消息标题
@@ -267,7 +267,7 @@ class WeChat:
logger.error(f"发送消息失败：{e}")
return False
def send_medias_msg(self, medias: List[MediaInfo], userid: str = "") -> Optional[bool]:
def send_medias_msg(self, medias: List[MediaInfo], userid: Optional[str] = None) -> Optional[bool]:
"""
发送列表类消息
"""
@@ -307,7 +307,7 @@ class WeChat:
return False
def send_torrents_msg(self, torrents: List[Context],
userid: str = "", title: str = "", link: str = None) -> Optional[bool]:
userid: Optional[str] = None, title: Optional[str] = None, link: Optional[str] = None) -> Optional[bool]:
"""
发送列表消息
"""
@@ -416,7 +416,7 @@ class WeChat:
{
"type":"view",
"name":"搜索",
"url":"http://www.soso.com/"
"url":"https://www.soso.com/"
},
{
"type":"click",