Merge pull request #424 from doubly-yi/main

package.json

@@ -32,11 +32,13 @@
         "name": "站点数据统计",
         "description": "自动统计和展示站点数据。",
         "labels": "站点,仪表板",
-        "version": "3.9.1",
+        "version": "3.9.3",
         "icon": "statistic.png",
         "author": "lightolly",
         "level": 2,
         "history": {
+            "v3.9.3": "修复PTT的用户等级统计",
+            "v3.9.2": "修复YemaPT的上传下载统计错误",
             "v3.9.1": "修复mteam域名地址",
             "v3.9": "修复YemaPT站点数据统计",
             "v3.8": "适配m-team Api地址变化",

plugins/sitestatistic/__init__.py

@@ -43,7 +43,7 @@ class SiteStatistic(_PluginBase):
     # 插件图标
     plugin_icon = "statistic.png"
     # 插件版本
-    plugin_version = "3.9.1"
+    plugin_version = "3.9.3"
     # 插件作者
     plugin_author = "lightolly"
     # 作者主页

plugins/sitestatistic/siteuserinfo/nexus_php.py

@@ -340,6 +340,12 @@ class NexusPhpSiteUserInfo(ISiteUserInfo):
             self.user_level = user_levels_text[0].xpath("string(.)").strip()
             return
 
+        # 适配PTT用户等级
+        user_levels_text = html.xpath('//tr/td[text()="用户等级"]/following-sibling::td[1]/b/@title')
+        if user_levels_text:
+            self.user_level = user_levels_text[0].strip()
+            return
+
         user_levels_text = html.xpath('//a[contains(@href, "userdetails")]/text()')
         if not self.user_level and user_levels_text:
             for user_level_text in user_levels_text:

plugins/sitestatistic/siteuserinfo/yema.py

@@ -62,8 +62,8 @@ class TYemaSiteUserInfo(ISiteUserInfo):
         self.user_level = user_info.get("level")
         self.join_at = StringUtils.unify_datetime_str(user_info.get("registerTime"))
 
-        self.upload = user_info.get('uploadSize')
-        self.download = user_info.get('downloadSize')
+        self.upload = user_info.get('promotionUploadSize')
+        self.download = user_info.get('promotionDownloadSize')
         self.ratio = round(self.upload / (self.download or 1), 2)
         self.bonus = user_info.get("bonus")
         self.message_unread = 0