From ac04bb809f54714de809f04dbff619ffcd0c3538 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sat, 9 Nov 2024 17:51:11 +0800
Subject: [PATCH] fix #543

---
 package.json                   | 29 +++++++++++++++--------------
 plugins/doubansync/__init__.py | 16 ++++++++++++----
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 3c15381..4d332fa 100644
--- a/package.json
+++ b/package.json
@@ -74,12 +74,13 @@
         "name": "豆瓣想看",
         "description": "同步豆瓣想看数据，自动添加订阅。",
         "labels": "订阅",
-        "version": "1.9",
+        "version": "1.9.1",
         "icon": "douban.png",
         "author": "jxxghp",
         "level": 2,
         "v2": true,
         "history": {
+            "v1.9.1": "修复版本兼容问题",
             "v1.9": "请求豆瓣RSS时增加请求头",
             "v1.8": "不同步在看条目",
             "v1.7": "增强API安全性",
@@ -887,18 +888,18 @@
         }
     },
   "BangumiColl": {
-    "name": "Bangumi收藏订阅",
-    "description": "Bangumi用户收藏添加到订阅",
-    "labels": "订阅",
-    "version": "1.5.2",
-    "icon": "bangumi_b.png",
-    "author": "Attente",
-    "level": 1,
-    "v2": true,
-    "history": {
-     "v1.5.2": "修复定时任务未正确注册的问题",
-      "v1.5.1": "修复季度信息未传递的问题. 新增站点列表同步删除",
-      "v1.5": "修复总集数会同步TMDB变动的问题,增加开关选项"
-    }
+        "name": "Bangumi收藏订阅",
+        "description": "Bangumi用户收藏添加到订阅",
+        "labels": "订阅",
+        "version": "1.5.2",
+        "icon": "bangumi_b.png",
+        "author": "Attente",
+        "level": 1,
+        "v2": true,
+        "history": {
+            "v1.5.2": "修复定时任务未正确注册的问题",
+            "v1.5.1": "修复季度信息未传递的问题. 新增站点列表同步删除",
+            "v1.5": "修复总集数会同步TMDB变动的问题,增加开关选项"
+        }
   }
 }
diff --git a/plugins/doubansync/__init__.py b/plugins/doubansync/__init__.py
index ffb6570..1c3508d 100644
--- a/plugins/doubansync/__init__.py
+++ b/plugins/doubansync/__init__.py
@@ -34,7 +34,7 @@ class DoubanSync(_PluginBase):
     # 插件图标
     plugin_icon = "douban.png"
     # 插件版本
-    plugin_version = "1.9"
+    plugin_version = "1.9.1"
     # 插件作者
     plugin_author = "jxxghp"
     # 作者主页
@@ -498,6 +498,11 @@ class DoubanSync(_PluginBase):
         """
         if not self._users:
             return
+        # 版本
+        if hasattr(settings, 'VERSION_FLAG'):
+            version = settings.VERSION_FLAG  # V2
+        else:
+            version = "v1"
         # 读取历史记录
         if self._clearflag:
             history = []
@@ -509,9 +514,12 @@ class DoubanSync(_PluginBase):
                 continue
             logger.info(f"开始同步用户 {user_id} 的豆瓣想看数据 ...")
             url = self._interests_url % user_id
-            results = self.rsshelper.parse(url, headers={
-                "User-Agent": settings.USER_AGENT
-            })
+            if version == "v2":
+                results = self.rsshelper.parse(url, headers={
+                    "User-Agent": settings.USER_AGENT
+                })
+            else:
+                results = self.rsshelper.parse(url)
             if not results:
                 logger.warn(f"未获取到用户 {user_id} 豆瓣RSS数据：{url}")
                 continue