From d9c75ce446cd9da8261ef86935a22ea8a968b420 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Tue, 20 Jun 2023 18:06:41 +0800
Subject: [PATCH] fix douban

---
 app/chain/douban.py      |  2 ++
 app/chain/subscribe.py   | 14 ++++++++------
 app/db/subscribe_oper.py |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/chain/douban.py b/app/chain/douban.py
index 768fc61d..ac2ccb0f 100644
--- a/app/chain/douban.py
+++ b/app/chain/douban.py
@@ -161,6 +161,7 @@ class DoubanChain(ChainBase):
                                             mtype=mediainfo.type,
                                             tmdbid=mediainfo.tmdb_id,
                                             season=meta.begin_season,
+                                            exist_ok=True,
                                             username="豆瓣想看")
                     continue
                 # 自动下载
@@ -177,6 +178,7 @@ class DoubanChain(ChainBase):
                                             mtype=mediainfo.type,
                                             tmdbid=mediainfo.tmdb_id,
                                             season=meta.begin_season,
+                                            exist_ok=True,
                                             username="豆瓣想看")
 
             logger.info(f"用户 {user_id} 豆瓣想看同步完成")
diff --git a/app/chain/subscribe.py b/app/chain/subscribe.py
index 85965c3a..8b0f4c9d 100644
--- a/app/chain/subscribe.py
+++ b/app/chain/subscribe.py
@@ -36,6 +36,7 @@ class SubscribeChain(ChainBase):
             season: int = None,
             userid: str = None,
             username: str = None,
+            exist_ok: bool = False,
             **kwargs) -> Optional[int]:
         """
         识别媒体信息并添加订阅
@@ -93,12 +94,13 @@ class SubscribeChain(ChainBase):
         sid, err_msg = self.subscribehelper.add(mediainfo, season=season, **kwargs)
         if not sid:
             logger.error(f'{mediainfo.title_year} {err_msg}')
-            # 发回原用户
-            self.post_message(title=f"{mediainfo.title_year}{metainfo.season} "
-                                    f"添加订阅失败！",
-                              text=f"{err_msg}",
-                              image=mediainfo.get_message_image(),
-                              userid=userid)
+            if not exist_ok:
+                # 发回原用户
+                self.post_message(title=f"{mediainfo.title_year}{metainfo.season} "
+                                        f"添加订阅失败！",
+                                  text=f"{err_msg}",
+                                  image=mediainfo.get_message_image(),
+                                  userid=userid)
         else:
             logger.info(f'{mediainfo.title_year}{metainfo.season} 添加订阅成功')
             # 广而告之
diff --git a/app/db/subscribe_oper.py b/app/db/subscribe_oper.py
index 32fb873a..19b15f3e 100644
--- a/app/db/subscribe_oper.py
+++ b/app/db/subscribe_oper.py
@@ -27,7 +27,7 @@ class SubscribeOper(DbOper):
             subscribe.create(self._db)
             return subscribe.id, "新增订阅成功"
         else:
-            return subscribe.id, "订阅已存在"
+            return 0, "订阅已存在"
 
     def get(self, sid: int) -> Subscribe:
         """