diff --git a/package.json b/package.json index 389a2c8..a213093 100644 --- a/package.json +++ b/package.json @@ -227,11 +227,12 @@ "name": "Emby观影报告", "description": "推送Emby观影报告,需Emby安装Playback Report 插件。", "labels": "Emby", - "version": "1.9.2", + "version": "1.9.3", "icon": "Pydiocells_A.png", "author": "thsrite", "level": 1, "history": { + "v1.9.3": "修复观影记录日期获取", "v1.9.2": "媒体库黑名单改为媒体库名称", "v1.9.1": "修复媒体库黑名单设置", "v1.9": "支持媒体库黑名单设置", diff --git a/package.v2.json b/package.v2.json index 8efff85..3c19214 100644 --- a/package.v2.json +++ b/package.v2.json @@ -59,11 +59,12 @@ "name": "Emby观影报告", "description": "推送Emby观影报告,需Emby安装Playback Report插件。", "labels": "Emby", - "version": "2.1.3", + "version": "2.1.4", "icon": "Pydiocells_A.png", "author": "thsrite", "level": 1, "history": { + "v2.1.4": "修复观影记录日期获取", "v2.1.3": "优化执行周期输入,需要MoviePilot v2.2.1+", "v2.1.2": "媒体库黑名单改为媒体库名称", "v2.1.1": "修复媒体库黑名单设置", diff --git a/plugins.v2/embyreporter/__init__.py b/plugins.v2/embyreporter/__init__.py index 8d4e6e0..17099af 100644 --- a/plugins.v2/embyreporter/__init__.py +++ b/plugins.v2/embyreporter/__init__.py @@ -32,7 +32,7 @@ class EmbyReporter(_PluginBase): # 插件图标 plugin_icon = "Pydiocells_A.png" # 插件版本 - plugin_version = "2.1.3" + plugin_version = "2.1.4" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -838,13 +838,12 @@ class EmbyReporter(_PluginBase): except Exception: return False, "🤕Emby 服务器连接失败!" - def get_report(self, days, types=None, user_id=None, end_date=datetime.now(pytz.timezone("Asia/Shanghai")), - limit=10): + def get_report(self, days, types=None, user_id=None,limit=10): if not types: types = self.PLAYBACK_REPORTING_TYPE_MOVIE - sub_date = end_date - timedelta(days=int(days)) + sub_date = datetime.now(pytz.timezone("Asia/Shanghai")) - timedelta(days=int(days)) start_time = sub_date.strftime("%Y-%m-%d 00:00:00") - end_time = end_date.strftime("%Y-%m-%d 23:59:59") + end_time = datetime.now(pytz.timezone("Asia/Shanghai")).strftime("%Y-%m-%d 23:59:59") sql = "SELECT UserId, ItemId, ItemType, " sql += types + " AS name, " sql += "COUNT(1) AS play_count, " diff --git a/plugins/embyreporter/__init__.py b/plugins/embyreporter/__init__.py index 1be676a..5e6be6a 100644 --- a/plugins/embyreporter/__init__.py +++ b/plugins/embyreporter/__init__.py @@ -1,24 +1,22 @@ import os - -from app.core.config import settings -from app.plugins import _PluginBase +import random +from datetime import datetime, timedelta +from io import BytesIO +from pathlib import Path from typing import Any, List, Dict, Tuple, Optional -from app.log import logger + +import pytz +from PIL import Image +from PIL import ImageDraw +from PIL import ImageFont from apscheduler.schedulers.background import BackgroundScheduler from apscheduler.triggers.cron import CronTrigger - -from app.schemas import NotificationType -from pathlib import Path - -import random -from io import BytesIO -from PIL import Image -from PIL import ImageFont -from PIL import ImageDraw -import pytz from cacheout import Cache -from datetime import datetime, timedelta +from app.core.config import settings +from app.log import logger +from app.plugins import _PluginBase +from app.schemas import NotificationType from app.utils.http import RequestUtils from app.utils.string import StringUtils @@ -33,7 +31,7 @@ class EmbyReporter(_PluginBase): # 插件图标 plugin_icon = "Pydiocells_A.png" # 插件版本 - plugin_version = "1.9.2" + plugin_version = "1.9.3" # 插件作者 plugin_author = "thsrite" # 作者主页 @@ -795,13 +793,12 @@ class EmbyReporter(_PluginBase): except Exception: return False, "🤕Emby 服务器连接失败!" - def get_report(self, days, types=None, user_id=None, end_date=datetime.now(pytz.timezone("Asia/Shanghai")), - limit=10): + def get_report(self, days, types=None, user_id=None, limit=10): if not types: types = self.PLAYBACK_REPORTING_TYPE_MOVIE - sub_date = end_date - timedelta(days=int(days)) + sub_date = datetime.now(pytz.timezone("Asia/Shanghai")) - timedelta(days=int(days)) start_time = sub_date.strftime("%Y-%m-%d 00:00:00") - end_time = end_date.strftime("%Y-%m-%d 23:59:59") + end_time = datetime.now(pytz.timezone("Asia/Shanghai")).strftime("%Y-%m-%d 23:59:59") sql = "SELECT UserId, ItemId, ItemType, " sql += types + " AS name, " sql += "COUNT(1) AS play_count, "