From e855d8b9afa31c2c2d74d61db4468d6b10dca38c Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sun, 31 Dec 2023 09:56:46 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=E4=BA=861PTBA=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=AE=A4=E8=AF=81=E7=9A=84=E9=97=AE=E9=A2=98=20-=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=AA=E5=88=AB=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=E4=BB=8D=E6=9C=89=E4=B8=80=E9=9B=86=E7=BC=BA=E5=A4=B1?=
 =?UTF-8?q?=E6=97=B6=E6=8F=90=E5=89=8D=E5=AE=8C=E6=88=90=E8=AE=A2=E9=98=85?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20-=20=E4=BF=AE=E5=A4=8D=E4=BA=86?=
 =?UTF-8?q?=E7=94=B5=E5=BD=B1=E8=AE=A2=E9=98=85=E6=9C=AC=E5=9C=B0=E5=B7=B2?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=97=B6=E4=B8=8D=E5=AE=8C=E6=88=90=E8=AE=A2?=
 =?UTF-8?q?=E9=98=85=E7=9A=84=E9=97=AE=E9=A2=98=20-=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BA=86=E8=B5=84=E6=BA=90=E6=90=9C=E7=B4=A2=E3=80=81=E8=AE=A2?=
 =?UTF-8?q?=E9=98=85=E6=97=A5=E5=8E=86=E3=80=81=E5=8E=86=E5=8F=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/chain/subscribe.py | 10 ++++++----
 version.py             |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

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'