add siteuserdata

app/db/__init__.py

@@ -1,3 +1,4 @@
+import json
 from typing import Any, Self, List
 from typing import Tuple, Optional, Generator
 
@@ -7,6 +8,7 @@ from sqlalchemy.orm import declared_attr
 from sqlalchemy.orm import sessionmaker, Session, scoped_session, as_declarative
 
 from app.core.config import settings
+from app.utils.object import ObjectUtils
 
 # 数据库引擎
 Engine = create_engine(f"sqlite:///{settings.CONFIG_PATH}/user.db",
@@ -156,6 +158,8 @@ class Base:
     def update(self, db: Session, payload: dict):
         payload = {k: v for k, v in payload.items() if v is not None}
         for key, value in payload.items():
+            if ObjectUtils.is_obj(value):
+                value = json.dumps(value)
             setattr(self, key, value)
         if inspect(self).detached:
             db.add(self)

app/db/message_oper.py

@@ -1,4 +1,3 @@
-import json
 import time
 from typing import Optional, Union
 
@@ -53,7 +52,7 @@ class MessageOper(DbOper):
             "userid": userid,
             "action": action,
             "reg_time": time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),
-            "note": json.dumps(note) if note else ''
+            "note": note
         })
         Message(**kwargs).create(self._db)
 

app/db/models/siteuserdata.py

@@ -0,0 +1,61 @@
+from datetime import datetime
+
+from sqlalchemy import Column, Integer, String, Sequence
+from sqlalchemy.orm import Session
+
+from app.db import db_query, Base
+
+
+class SiteUserData(Base):
+    """
+    站点数据表
+    """
+    id = Column(Integer, Sequence('id'), primary_key=True, index=True)
+    # 站点域名
+    domain = Column(String, index=True)
+    # 用户名
+    username = Column(String)
+    # 用户ID
+    userid = Column(Integer)
+    # 用户等级
+    user_level = Column(String)
+    # 加入时间
+    join_at = Column(String)
+    # 积分
+    bonus = Column(Integer, default=0)
+    # 上传量
+    upload = Column(Integer, default=0)
+    # 下载量
+    download = Column(Integer, default=0)
+    # 分享率
+    ratio = Column(Integer, default=0)
+    # 做种数
+    seeding = Column(Integer, default=0)
+    # 下载数
+    leeching = Column(Integer, default=0)
+    # 做种体积
+    seeding_size = Column(Integer, default=0)
+    # 下载体积
+    leeching_size = Column(Integer, default=0)
+    # 做种人数, 种子大小 JSON
+    seeding_info = Column(String)
+    # 未读消息
+    message_unread = Column(Integer, default=0)
+    # 未读消息内容 JSON
+    message_unread_contents = Column(String)
+    # 错误信息
+    err_msg = Column(String)
+    # 更新日期
+    updated_day = Column(String, index=True, default=datetime.now().strftime('%Y-%m-%d'))
+    # 更新时间
+    updated_time = Column(String, default=datetime.now().strftime('%H:%M:%S'))
+
+    @staticmethod
+    @db_query
+    def get_by_domain(db: Session, domain: str):
+        return db.query(SiteUserData).filter(SiteUserData.domain == domain).all()
+
+    @staticmethod
+    @db_query
+    def get_by_date(db: Session, date: str):
+        return db.query(SiteUserData).filter(SiteUserData.updated_day == date).all()

app/db/plugindata_oper.py

@@ -18,8 +18,6 @@ class PluginDataOper(DbOper):
         :param key: 数据key
         :param value: 数据值
         """
-        if ObjectUtils.is_obj(value):
-            value = json.dumps(value)
         plugin = PluginData.get_plugin_data_by_key(self._db, plugin_id, key)
         if plugin:
             plugin.update(self._db, {

app/db/site_oper.py

@@ -1,7 +1,9 @@
+from datetime import datetime
 from typing import Tuple, List
 
 from app.db import DbOper
 from app.db.models.site import Site
+from app.db.models.siteuserdata import SiteUserData
 
 
 class SiteOper(DbOper):
@@ -98,3 +100,30 @@ class SiteOper(DbOper):
             "rss": rss
         })
         return True, "更新站点RSS地址成功"
+
+    def update_userdata(self, domain: str, payload: dict) -> Tuple[bool, str]:
+        """
+        更新站点用户数据
+        """
+        site = Site.get_by_domain(self._db, domain)
+        if not site:
+            return False, "站点不存在"
+        payload.update({
+            "domain": domain,
+            "updated_day": datetime.now().strftime('%Y-%m-%d'),
+            "updated_time": datetime.now().strftime('%H:%M:%S')
+        })
+        SiteUserData.update(self._db, payload)
+        return True, "更新站点用户数据成功"
+
+    def get_userdata_by_domain(self, domain: str) -> List[SiteUserData]:
+        """
+        获取站点用户数据
+        """
+        return SiteUserData.get_by_domain(self._db, domain)
+
+    def get_userdata_by_date(self, date: str) -> List[SiteUserData]:
+        """
+        获取站点用户数据
+        """
+        return SiteUserData.get_by_date(self._db, date)

app/db/sitestatistic_oper.py

@@ -30,7 +30,7 @@ class SiteStatisticOper(DbOper):
                 "seconds": avg_seconds or sta.seconds,
                 "lst_state": 0,
                 "lst_mod_date": lst_date,
-                "note": json.dumps(note) if note else sta.note
+                "note": note or sta.note
             })
         else:
             note = {}

app/db/subscribe_oper.py

@@ -1,4 +1,3 @@
-import json
 import time
 from typing import Tuple, List
 
@@ -21,9 +20,6 @@ class SubscribeOper(DbOper):
                                      doubanid=mediainfo.douban_id,
                                      season=kwargs.get('season'))
         if not subscribe:
-            if kwargs.get("sites") and not isinstance(kwargs.get("sites"), str):
-                kwargs["sites"] = json.dumps(kwargs.get("sites"))
-
             subscribe = Subscribe(name=mediainfo.title,
                                   year=mediainfo.year,
                                   type=mediainfo.type.value,