From 2e820bfcf9d15e479c84cff8c1006fd9a67fcbff Mon Sep 17 00:00:00 2001 From: thsrite Date: Mon, 11 Mar 2024 16:57:12 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=97=A0=E8=AE=A2=E9=98=85=E7=AB=99?= =?UTF-8?q?=E7=82=B9=E4=B9=9F=E7=BB=9F=E8=AE=A1=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- docs/SubscribeStatistic.md | 1 + package.json | 2 +- plugins/subscribestatistic/__init__.py | 8 +++++++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 207fc96..9398662 100644 --- a/README.md +++ b/README.md @@ -28,5 +28,5 @@ MoviePilot三方插件市场：https://github.com/thsrite/MoviePilot-Plugins/ - [云盘实时链接 1.2](docs%2FCloudLinkMonitor.md) - [源文件恢复 1.2](docs%2FLinkToSrc.md) - [微信消息转发 1.0](docs%2FWeChatForward.md) -- [订阅下载统计 1.3](docs%2FSubscribeStatistic.md) +- [订阅下载统计 1.4](docs%2FSubscribeStatistic.md) diff --git a/docs/SubscribeStatistic.md b/docs/SubscribeStatistic.md index 63e0856..f8996a8 100644 --- a/docs/SubscribeStatistic.md +++ b/docs/SubscribeStatistic.md @@ -2,6 +2,7 @@ ### 更新记录 +- 1.4 无订阅站点也统计数量 - 1.3 fix bug - 1.2 fix bug - 1.1 站点去重 diff --git a/package.json b/package.json index 17a63a6..42cc5ec 100644 --- a/package.json +++ b/package.json @@ -146,7 +146,7 @@ "SubscribeStatistic": { "name": "订阅下载统计", "description": "统计指定时间内各站点订阅及下载情况。", - "version": "1.3", + "version": "1.4", "icon": "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/subscribestatistic.png", "author": "thsrite", "level": 1 diff --git a/plugins/subscribestatistic/__init__.py b/plugins/subscribestatistic/__init__.py index 383cf15..17925fb 100644 --- a/plugins/subscribestatistic/__init__.py +++ b/plugins/subscribestatistic/__init__.py @@ -6,6 +6,8 @@ from app.plugins import _PluginBase from app.db.subscribe_oper import SubscribeOper from typing import Any, List, Dict, Tuple +from app.schemas.types import SystemConfigKey + class SubscribeStatistic(_PluginBase): # 插件名称 @@ -15,7 +17,7 @@ class SubscribeStatistic(_PluginBase): # 插件图标 plugin_icon = "https://raw.githubusercontent.com/thsrite/MoviePilot-Plugins/main/icons/subscribestatistic.png" # 插件版本 - plugin_version = "1.3" + plugin_version = "1.4" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -265,6 +267,8 @@ class SubscribeStatistic(_PluginBase): for movie_subscribe in movie_subscribes: if movie_subscribe.sites: movie_subscribe_site_ids += [site for site in json.loads(movie_subscribe.sites)] + else: + movie_subscribe_site_ids += self.systemconfig.get(SystemConfigKey.RssSites) or [] for movie_subscribe_site_id in movie_subscribe_site_ids: site = self.siteoper.get(movie_subscribe_site_id) @@ -282,6 +286,8 @@ class SubscribeStatistic(_PluginBase): for tv_subscribe in tv_subscribes: if tv_subscribe.sites: tv_subscribe_site_ids += [site for site in json.loads(tv_subscribe.sites)] + else: + tv_subscribe_site_ids += self.systemconfig.get(SystemConfigKey.RssSites) or [] for tv_subscribe_site_id in tv_subscribe_site_ids: site = self.siteoper.get(tv_subscribe_site_id)