GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-08-25 02:00: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

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]:
"""
获取人物参演作品
"""