diff --git a/app/chain/subscribe.py b/app/chain/subscribe.py index dc4a54b8..dba5314a 100644 --- a/app/chain/subscribe.py +++ b/app/chain/subscribe.py @@ -236,7 +236,7 @@ class SubscribeChain(ChainBase): # 已存在 if exist_flag: 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 # 电视剧订阅处理缺失集 @@ -362,7 +362,8 @@ class SubscribeChain(ChainBase): def finish_subscribe_or_not(self, subscribe: Subscribe, meta: MetaInfo, mediainfo: MediaInfo, 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): """ 判断是否应完成订阅 """ @@ -373,7 +374,8 @@ class SubscribeChain(ChainBase): if not subscribe.best_version: # 非洗板 if ((no_lefts and meta.type == MediaType.TV) - or ((downloads or no_lefts) and lefts is not None and meta.type == MediaType.MOVIE)): + or (downloads and meta.type == MediaType.MOVIE) + or force): # 全部下载完成 logger.info(f'{mediainfo.title_year} 完成订阅') self.subscribeoper.delete(subscribe.id) @@ -559,7 +561,7 @@ class SubscribeChain(ChainBase): # 已存在 if exist_flag: 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 # 电视剧订阅 diff --git a/version.py b/version.py index 36941820..0f8cb1ca 100644 --- a/version.py +++ b/version.py @@ -1 +1 @@ -APP_VERSION = 'v1.5.5' +APP_VERSION = 'v1.5.5-1'