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

Merge pull request #1923 from thsrite/main

Browse Source
This commit is contained in:
jxxghp 2024-04-19 11:50:31 +08:00 committed by GitHub
commit 148984ad0e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,7 +291,7 @@ class MetaBase(object):
return self.season return self.season
else: else:
return "" return ""
@property @property
def season_seq(self) -> str: def season_seq(self) -> str:
""" """
@ -334,7 +334,7 @@ class MetaBase(object):
str(self.end_episode).rjust(2, "0")) str(self.end_episode).rjust(2, "0"))
else: else:
return "" return ""
@property @property
def episode_list(self) -> List[int]: def episode_list(self) -> List[int]:
""" """
@ -532,7 +532,7 @@ class MetaBase(object):
self.end_episode = end self.end_episode = end
if self.begin_episode and self.end_episode: if self.begin_episode and self.end_episode:
self.total_episode = (self.end_episode - self.begin_episode) + 1 self.total_episode = (self.end_episode - self.begin_episode) + 1
def merge(self, meta: Self): def merge(self, meta: Self):
""" """
全并Meta信息 全并Meta信息
@ -551,9 +551,12 @@ class MetaBase(object):
# 季 # 季
if (self.type == MediaType.TV if (self.type == MediaType.TV
and not self.begin_season): and not self.begin_season):
self.begin_season = meta.begin_season if self.begin_season is None and meta.begin_season is not None:
self.end_season = meta.end_season self.begin_season = meta.begin_season
self.total_season = meta.total_season if self.end_season is None and meta.end_season is not None:
self.end_season = meta.end_season
if self.total_season is None and meta.total_season is not None:
self.total_season = meta.total_season
# 开始集 # 开始集
if (self.type == MediaType.TV if (self.type == MediaType.TV
and not self.begin_episode): and not self.begin_episode):