重构订阅和用户相关API，支持异步操作

app/helper/subscribe.py

@@ -3,11 +3,11 @@ from typing import List, Tuple, Optional
 
 from app.core.cache import cached, cache_backend
 from app.core.config import settings
-from app.db.subscribe_oper import SubscribeOper
+from app.db.subscribe_oper import SubscribeOper, AsyncSubscribeOper
 from app.db.systemconfig_oper import SystemConfigOper
 from app.log import logger
 from app.schemas.types import SystemConfigKey
-from app.utils.http import RequestUtils
+from app.utils.http import RequestUtils, AsyncRequestUtils
 from app.utils.singleton import WeakSingleton
 from app.utils.system import SystemUtils
 
@@ -60,7 +60,7 @@ class SubscribeHelper(metaclass=WeakSingleton):
         self.get_user_uuid()
         self.get_github_user()
 
-    @cached(maxsize=5, ttl=1800)
+    @cached(region=_shares_cache_region, maxsize=5, ttl=1800, skip_empty=True)
     def get_statistic(self, stype: str, page: Optional[int] = 1, count: Optional[int] = 30) -> List[dict]:
         """
         获取订阅统计数据
@@ -76,6 +76,22 @@ class SubscribeHelper(metaclass=WeakSingleton):
             return res.json()
         return []
 
+    @cached(region=_shares_cache_region, maxsize=5, ttl=1800, skip_empty=True)
+    async def async_get_statistic(self, stype: str, page: Optional[int] = 1, count: Optional[int] = 30) -> List[dict]:
+        """
+        异步获取订阅统计数据
+        """
+        if not settings.SUBSCRIBE_STATISTIC_SHARE:
+            return []
+        res = await AsyncRequestUtils(proxies=settings.PROXY, timeout=15).get_res(self._sub_statistic, params={
+            "stype": stype,
+            "page": page,
+            "count": count
+        })
+        if res and res.status_code == 200:
+            return res.json()
+        return []
+
     def sub_reg(self, sub: dict) -> bool:
         """
         新增订阅统计
@@ -167,6 +183,37 @@ class SubscribeHelper(metaclass=WeakSingleton):
         else:
             return False, res.json().get("message")
 
+    async def async_sub_share(self, subscribe_id: int,
+                              share_title: str, share_comment: str, share_user: str) -> Tuple[bool, str]:
+        """
+        异步分享订阅
+        """
+        if not settings.SUBSCRIBE_STATISTIC_SHARE:
+            return False, "当前没有开启订阅数据共享功能"
+        subscribe = await AsyncSubscribeOper().get(subscribe_id)
+        if not subscribe:
+            return False, "订阅不存在"
+        subscribe_dict = subscribe.to_dict()
+        subscribe_dict.pop("id")
+        cache_backend.clear(region=self._shares_cache_region)
+        res = await AsyncRequestUtils(proxies=settings.PROXY, content_type="application/json",
+                                      timeout=10).post(self._sub_share,
+                                                       json={
+                                                           "share_title": share_title,
+                                                           "share_comment": share_comment,
+                                                           "share_user": share_user,
+                                                           "share_uid": self._share_user_id,
+                                                           **subscribe_dict
+                                                       })
+        if res is None:
+            return False, "连接MoviePilot服务器失败"
+        if res.status_code == 200:
+            # 清除 get_shares 的缓存，以便实时看到结果
+            cache_backend.clear(region=self._shares_cache_region)
+            return True, ""
+        else:
+            return False, res.json().get("message")
+
     def share_delete(self, share_id: int) -> Tuple[bool, str]:
         """
         删除分享
@@ -185,6 +232,24 @@ class SubscribeHelper(metaclass=WeakSingleton):
         else:
             return False, res.json().get("message")
 
+    async def async_share_delete(self, share_id: int) -> Tuple[bool, str]:
+        """
+        异步删除分享
+        """
+        if not settings.SUBSCRIBE_STATISTIC_SHARE:
+            return False, "当前没有开启订阅数据共享功能"
+        res = await AsyncRequestUtils(proxies=settings.PROXY,
+                                      timeout=5).delete_res(f"{self._sub_share}/{share_id}",
+                                                            params={"share_uid": self._share_user_id})
+        if res is None:
+            return False, "连接MoviePilot服务器失败"
+        if res.status_code == 200:
+            # 清除 get_shares 的缓存，以便实时看到结果
+            cache_backend.clear(region=self._shares_cache_region)
+            return True, ""
+        else:
+            return False, res.json().get("message")
+
     def sub_fork(self, share_id: int) -> Tuple[bool, str]:
         """
         复用分享的订阅
@@ -201,6 +266,22 @@ class SubscribeHelper(metaclass=WeakSingleton):
         else:
             return False, res.json().get("message")
 
+    async def async_sub_fork(self, share_id: int) -> Tuple[bool, str]:
+        """
+        异步复用分享的订阅
+        """
+        if not settings.SUBSCRIBE_STATISTIC_SHARE:
+            return False, "当前没有开启订阅数据共享功能"
+        res = await AsyncRequestUtils(proxies=settings.PROXY, timeout=5, headers={
+            "Content-Type": "application/json"
+        }).get_res(self._sub_fork % share_id)
+        if res is None:
+            return False, "连接MoviePilot服务器失败"
+        if res.status_code == 200:
+            return True, ""
+        else:
+            return False, res.json().get("message")
+
     @cached(region=_shares_cache_region, maxsize=1, ttl=1800, skip_empty=True)
     def get_shares(self, name: Optional[str] = None, page: Optional[int] = 1, count: Optional[int] = 30) -> List[dict]:
         """
@@ -217,6 +298,23 @@ class SubscribeHelper(metaclass=WeakSingleton):
             return res.json()
         return []
 
+    @cached(region=_shares_cache_region, maxsize=1, ttl=1800, skip_empty=True)
+    async def async_get_shares(self, name: Optional[str] = None, page: Optional[int] = 1, count: Optional[int] = 30) -> \
+            List[dict]:
+        """
+        异步获取订阅分享数据
+        """
+        if not settings.SUBSCRIBE_STATISTIC_SHARE:
+            return []
+        res = await AsyncRequestUtils(proxies=settings.PROXY, timeout=15).get_res(self._sub_shares, params={
+            "name": name,
+            "page": page,
+            "count": count
+        })
+        if res and res.status_code == 200:
+            return res.json()
+        return []
+
     @cached(region=_shares_cache_region, maxsize=1, ttl=1800, skip_empty=True)
     def get_share_statistics(self) -> List[dict]:
         """
@@ -229,6 +327,18 @@ class SubscribeHelper(metaclass=WeakSingleton):
             return res.json()
         return []
 
+    @cached(region=_shares_cache_region, maxsize=1, ttl=1800, skip_empty=True)
+    async def async_get_share_statistics(self) -> List[dict]:
+        """
+        异步获取订阅分享统计数据
+        """
+        if not settings.SUBSCRIBE_STATISTIC_SHARE:
+            return []
+        res = await AsyncRequestUtils(proxies=settings.PROXY, timeout=15).get_res(self._sub_share_statistic)
+        if res and res.status_code == 200:
+            return res.json()
+        return []
+
     def get_user_uuid(self) -> str:
         """
         获取用户uuid