mirror of
https://github.com/jxxghp/MoviePilot.git
synced 2026-06-09 17:50:23 +08:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e855d8b9af | ||
|
|
171720e629 |
@@ -236,7 +236,7 @@ class SubscribeChain(ChainBase):
|
|||||||
# 已存在
|
# 已存在
|
||||||
if exist_flag:
|
if exist_flag:
|
||||||
logger.info(f'{mediainfo.title_year} 媒体库中已存在')
|
logger.info(f'{mediainfo.title_year} 媒体库中已存在')
|
||||||
self.finish_subscribe_or_not(subscribe=subscribe, meta=meta, mediainfo=mediainfo)
|
self.finish_subscribe_or_not(subscribe=subscribe, meta=meta, mediainfo=mediainfo, force=True)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# 电视剧订阅处理缺失集
|
# 电视剧订阅处理缺失集
|
||||||
@@ -362,18 +362,20 @@ class SubscribeChain(ChainBase):
|
|||||||
|
|
||||||
def finish_subscribe_or_not(self, subscribe: Subscribe, meta: MetaInfo, mediainfo: MediaInfo,
|
def finish_subscribe_or_not(self, subscribe: Subscribe, meta: MetaInfo, mediainfo: MediaInfo,
|
||||||
downloads: List[Context] = None,
|
downloads: List[Context] = None,
|
||||||
lefts: Dict[Union[int | str], Dict[int, NotExistMediaInfo]] = None):
|
lefts: Dict[Union[int | str], Dict[int, NotExistMediaInfo]] = None,
|
||||||
|
force: bool = False):
|
||||||
"""
|
"""
|
||||||
判断是否应完成订阅
|
判断是否应完成订阅
|
||||||
"""
|
"""
|
||||||
mediakey = subscribe.tmdbid or subscribe.doubanid
|
mediakey = subscribe.tmdbid or subscribe.doubanid
|
||||||
# 是否有剩余集
|
# 是否有剩余集
|
||||||
no_lefts = lefts is None or not lefts.get(mediakey)
|
no_lefts = not lefts or not lefts.get(mediakey)
|
||||||
# 是否完成订阅
|
# 是否完成订阅
|
||||||
if not subscribe.best_version:
|
if not subscribe.best_version:
|
||||||
# 非洗板
|
# 非洗板
|
||||||
if ((no_lefts and meta.type == MediaType.TV)
|
if ((no_lefts and meta.type == MediaType.TV)
|
||||||
or ((downloads or no_lefts) and meta.type == MediaType.MOVIE)):
|
or (downloads and meta.type == MediaType.MOVIE)
|
||||||
|
or force):
|
||||||
# 全部下载完成
|
# 全部下载完成
|
||||||
logger.info(f'{mediainfo.title_year} 完成订阅')
|
logger.info(f'{mediainfo.title_year} 完成订阅')
|
||||||
self.subscribeoper.delete(subscribe.id)
|
self.subscribeoper.delete(subscribe.id)
|
||||||
@@ -559,7 +561,7 @@ class SubscribeChain(ChainBase):
|
|||||||
# 已存在
|
# 已存在
|
||||||
if exist_flag:
|
if exist_flag:
|
||||||
logger.info(f'{mediainfo.title_year} 媒体库中已存在')
|
logger.info(f'{mediainfo.title_year} 媒体库中已存在')
|
||||||
self.finish_subscribe_or_not(subscribe=subscribe, meta=meta, mediainfo=mediainfo)
|
self.finish_subscribe_or_not(subscribe=subscribe, meta=meta, mediainfo=mediainfo, force=True)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# 电视剧订阅
|
# 电视剧订阅
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
APP_VERSION = 'v1.5.5'
|
APP_VERSION = 'v1.5.5-1'
|
||||||
|
|||||||
Reference in New Issue
Block a user