codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 自定义订阅 Api

Browse Source
This commit is contained in:
jxxghp
2023-08-10 12:41:38 +08:00
parent eea508b05a
commit eb9ec11153
16 changed files with 141 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/core/meta/metaanime.py
View File

@ -112,9 +112,9 @@ class MetaAnime(MetaBase):
self.begin_episode = int(begin_episode)
if end_episode and int(end_episode) != self.begin_episode:
self.end_episode = int(end_episode)
self.total_episodes = (self.end_episode - self.begin_episode) + 1
self.total_episode = (self.end_episode - self.begin_episode) + 1
else:
self.total_episodes = 1
self.total_episode = 1
except Exception as err:
print(str(err))
self.begin_episode = None

8
app/core/meta/metabase.py
View File

@ -36,7 +36,7 @@ class MetaBase(object):
# 识别的结束季 数字
end_season: Optional[int] = None
# 总集数
total_episodes: int = 0
total_episode: int = 0
# 识别的开始集
begin_episode: Optional[int] = None
# 识别的结束集
@ -146,13 +146,13 @@ class MetaBase(object):
return
if self.begin_episode is None and isinstance(begin_episode, int):
self.begin_episode = begin_episode
self.total_episodes = 1
self.total_episode = 1
if self.begin_episode is not None \
and self.end_episode is None \
and isinstance(end_episode, int) \
and end_episode != self.begin_episode:
self.end_episode = end_episode
self.total_episodes = (self.end_episode - self.begin_episode) + 1
self.total_episode = (self.end_episode - self.begin_episode) + 1
self.type = MediaType.TV
self._subtitle_flag = True
# x集全
@ -163,7 +163,7 @@ class MetaBase(object):
episode_all = episode_all_str.group(2)
if episode_all and self.begin_episode is None:
try:
self.total_episodes = int(cn2an.cn2an(episode_all.strip(), mode='smart'))
self.total_episode = int(cn2an.cn2an(episode_all.strip(), mode='smart'))
except Exception as err:
print(str(err))
return

18
app/core/meta/metavideo.py
View File

@ -394,14 +394,14 @@ class MetaVideo(MetaBase):
se = int(se)
if self.begin_episode is None:
self.begin_episode = se
self.total_episodes = 1
self.total_episode = 1
else:
if se > self.begin_episode:
self.end_episode = se
self.total_episodes = (self.end_episode - self.begin_episode) + 1
if self.isfile and self.total_episodes > 2:
self.total_episode = (self.end_episode - self.begin_episode) + 1
if self.isfile and self.total_episode > 2:
self.end_episode = None
self.total_episodes = 1
self.total_episode = 1
elif token.isdigit():
try:
int(token)
@ -413,10 +413,10 @@ class MetaVideo(MetaBase):
and int(token) > self.begin_episode \
and self._last_token_type == "episode":
self.end_episode = int(token)
self.total_episodes = (self.end_episode - self.begin_episode) + 1
if self.isfile and self.total_episodes > 2:
self.total_episode = (self.end_episode - self.begin_episode) + 1
if self.isfile and self.total_episode > 2:
self.end_episode = None
self.total_episodes = 1
self.total_episode = 1
self._continue_flag = False
self.type = MediaType.TV
elif self.begin_episode is None \
@ -425,7 +425,7 @@ class MetaVideo(MetaBase):
and self._last_token_type != "videoencode" \
and token != self._unknown_name_str:
self.begin_episode = int(token)
self.total_episodes = 1
self.total_episode = 1
self._last_token_type = "episode"
self._continue_flag = False
self._stop_name_flag = True
@ -434,7 +434,7 @@ class MetaVideo(MetaBase):
and self.begin_episode is None \
and len(token) < 5:
self.begin_episode = int(token)
self.total_episodes = 1
self.total_episode = 1
self._last_token_type = "episode"
self._continue_flag = False
self._stop_name_flag = True