From a36c58986b97516448f40ca7aa3cc5c343cd609e Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Fri, 28 Nov 2025 10:33:09 +0800 Subject: [PATCH 01/34] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=85=83=E6=95=B0=E6=8D=AE=E5=90=8E=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=E9=9B=86=E6=95=B0=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9C=AA=E6=9B=B4=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 问题： - 手动刷新节目的元数据后，追剧日历的集数显示更新了，但任务列表的集数没有更新 - 只有在追剧日历刷新的定时任务刷新后，任务列表的集数数据才正确刷新 原因： - refreshSeasonMetadata 函数刷新成功后，虽然更新了 calendar.tasks，但缺少更新 progressByShowName - 任务列表和管理视图的集数数据依赖于 progressByShowName，因此没有正确更新 修复： - 在 refreshSeasonMetadata 函数中，刷新成功后添加了更新 progressByShowName 的步骤 - 确保任务列表和管理视图的集数数据（已转存集数/已播出集数/节目总集数）能立即正确更新 --- app/templates/index.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/templates/index.html b/app/templates/index.html index 25a30e5..ff7d6f2 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -5541,11 +5541,18 @@ this.showToast(response.data.message || '季元数据刷新成功'); // 刷新任务数据，确保节目状态（如 本季终/已完结/已取消）及时更新 + // 同时更新集数数据（已转存集数/已播出集数/节目总集数） try { const tasksResponse = await axios.get('/api/calendar/tasks'); if (tasksResponse.data && tasksResponse.data.success) { this.calendar.tasks = tasksResponse.data.data.tasks; this.calendar.taskNames = this.calendar.tasks.map(task => task.task_name); + // 重新构建进度映射，确保任务列表和管理视图的集数数据正确更新 + this.calendar.progressByShowName = this.buildProgressByShowNameFromTasks(this.calendar.tasks || [], this.calendar.progressByTaskName); + + // 重新计算内容类型，确保类型按钮能热更新 + const rawTypes = tasksResponse.data.data.content_types || []; + this.updateContentTypes(rawTypes); } } catch (e) {} From 9f2b2c7bfefd92e0f4eb34ea02aece0355faa692 Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Fri, 28 Nov 2025 11:00:46 +0800 Subject: [PATCH 02/34] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AD=A4=E7=AB=8B?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=B8=85=E7=90=86=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=B8=85=E7=90=86=E5=AD=A4=E7=AB=8B=E7=9A=84?= =?UTF-8?q?=20shows=20=E5=92=8C=E6=B5=B7=E6=8A=A5=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 cleanup_orphan_data 中添加清理孤立 shows 的逻辑 - 当任务被删除或修改时，自动清理不再被任何任务引用的 shows - 在清理孤立数据后自动清理孤立的海报文件 - 确保数据库和文件系统中的孤立数据都能被及时清理 --- app/run.py | 15 +++++++++++++++ app/sdk/db.py | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/app/run.py b/app/run.py index 19b0b16..5941b5f 100644 --- a/app/run.py +++ b/app/run.py @@ -1771,6 +1771,11 @@ def update(): try: from app.sdk.db import CalendarDB as _CalDB _CalDB().cleanup_orphan_data(valid_pairs, valid_names) + # 清理孤立数据后，也清理可能残留的孤立海报文件 + try: + cleanup_orphaned_posters() + except Exception: + pass except Exception: pass except Exception as e: @@ -6336,6 +6341,11 @@ def calendar_edit_metadata(): except Exception: pass CalendarDB().cleanup_orphan_data(_valid_pairs, _valid_names) + # 清理孤立数据后，也清理可能残留的孤立海报文件 + try: + cleanup_orphaned_posters() + except Exception: + pass except Exception: pass # 场景二：未提供 new_tmdb_id，但提供了 new_season_number（仅修改季数） @@ -6435,6 +6445,11 @@ def calendar_edit_metadata(): except Exception: pass CalendarDB().cleanup_orphan_data(_valid_pairs, _valid_names) + # 清理孤立数据后，也清理可能残留的孤立海报文件 + try: + cleanup_orphaned_posters() + except Exception: + pass except Exception: pass diff --git a/app/sdk/db.py b/app/sdk/db.py index 3f70771..dc1d86b 100644 --- a/app/sdk/db.py +++ b/app/sdk/db.py @@ -642,7 +642,7 @@ class CalendarDB: result.append(item) return result - # --------- 孤儿数据清理（seasons / episodes / season_metrics / task_metrics） --------- + # --------- 孤儿数据清理（seasons / episodes / season_metrics / task_metrics / shows） --------- @retry_on_locked(max_retries=3, base_delay=0.1) def cleanup_orphan_data(self, valid_task_pairs, valid_task_names): """清理不再与任何任务对应的数据 @@ -655,6 +655,7 @@ class CalendarDB: - task_metrics: 删除 task_name 不在当前任务列表中的记录 - seasons/episodes: 仅保留出现在 valid_task_pairs 内的季与对应所有集；其余删除 - season_metrics: 仅保留出现在 valid_task_pairs 内的记录；其余删除 + - shows: 仅保留出现在 valid_task_pairs 内的 tmdb_id；其余删除（连带删除对应的 seasons/episodes） """ try: cursor = self.conn.cursor() @@ -719,6 +720,47 @@ class CalendarDB: except Exception: pass + # 3) 清理孤立的 shows（仅保留出现在 valid_task_pairs 中的 tmdb_id） + # 从 valid_task_pairs 中提取所有有效的 tmdb_id + valid_tmdb_ids = set() + for tid, sn in pairs: + if tid: + valid_tmdb_ids.add(int(tid)) + + if not valid_tmdb_ids: + # 没有任何有效的 tmdb_id：清空所有 shows + # 注意：episodes 和 seasons 已经在步骤 2 中被清理了 + try: + cursor.execute('DELETE FROM shows') + except Exception: + pass + else: + # 删除不在有效 tmdb_id 列表中的 shows + # 注意：对应的 episodes 和 seasons 在步骤 2 中应该已经被清理了 + # 但为了确保没有残留数据，我们再次清理可能残留的孤立数据 + try: + placeholders = ','.join(['?'] * len(valid_tmdb_ids)) + # 先清理可能残留的孤立 episodes、seasons 和 season_metrics（针对被删除的 shows） + cursor.execute( + f'DELETE FROM episodes WHERE tmdb_id NOT IN ({placeholders})', + list(valid_tmdb_ids) + ) + cursor.execute( + f'DELETE FROM seasons WHERE tmdb_id NOT IN ({placeholders})', + list(valid_tmdb_ids) + ) + cursor.execute( + f'DELETE FROM season_metrics WHERE tmdb_id NOT IN ({placeholders})', + list(valid_tmdb_ids) + ) + # 最后删除孤立的 shows + cursor.execute( + f'DELETE FROM shows WHERE tmdb_id NOT IN ({placeholders})', + list(valid_tmdb_ids) + ) + except Exception: + pass + self.conn.commit() return True except Exception: From e6e1f95a8cac9fc97d8da68354afde8690f9aad3 Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Sat, 29 Nov 2025 21:04:38 +0800 Subject: [PATCH 03/34] =?UTF-8?q?=E5=9C=A8=20WebUI=20=E4=B8=8A=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E8=BF=90=E8=A1=8C=E6=97=A5=E5=BF=97=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/run.py | 75 ++++++++ app/static/css/main.css | 85 ++++++++- app/templates/index.html | 396 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 551 insertions(+), 5 deletions(-) diff --git a/app/run.py b/app/run.py index 5941b5f..daa7a14 100644 --- a/app/run.py +++ b/app/run.py @@ -18,6 +18,7 @@ from apscheduler.triggers.cron import CronTrigger from apscheduler.triggers.interval import IntervalTrigger from apscheduler.triggers.date import DateTrigger from queue import Queue +from collections import deque from sdk.cloudsaver import CloudSaver try: from sdk.pansou import PanSou @@ -28,6 +29,7 @@ import subprocess import requests import hashlib import logging +from logging.handlers import RotatingFileHandler import base64 import sys import os @@ -889,6 +891,13 @@ PLUGIN_FLAGS = os.environ.get("PLUGIN_FLAGS", "") DEBUG = os.environ.get("DEBUG", "false").lower() == "true" # 从环境变量获取端口，默认为5005 PORT = int(os.environ.get("PORT", "5005")) +LOG_DIR = os.path.join(parent_dir, "config", "logs") +LOG_FILE_PATH = os.path.join(LOG_DIR, "runtime.log") +MAX_RUNTIME_LOG_LINES = 2000 +RUNTIME_LOG_PATTERN = re.compile( + r'^\[(?P\d{2}-\d{2} \d{2}:\d{2}:\d{2})\]\[(?P[A-Z]+)\]\s?(?P.*)$' +) +os.makedirs(LOG_DIR, exist_ok=True) config_data = {} task_plugins_config_default = {} @@ -1140,6 +1149,63 @@ for _name in ("werkzeug", "apscheduler", "gunicorn.error", "gunicorn.access"): except Exception: pass +# 写入运行日志文件，便于前端实时查看 +try: + _runtime_log_handler = RotatingFileHandler( + LOG_FILE_PATH, + maxBytes=5 * 1024 * 1024, + backupCount=5, + encoding="utf-8" + ) + _runtime_log_handler.setFormatter(_standard_formatter) + _root_logger.addHandler(_runtime_log_handler) +except Exception as e: + logging.warning(f"初始化运行日志文件处理器失败: {e}") + + +def _parse_runtime_log_line(line: str) -> dict: + """解析单行日志文本，提取时间、级别与内容。""" + text = (line or "").rstrip("\n") + entry = { + "raw": text, + "timestamp": "", + "level": "INFO", + "message": text + } + if not text: + return entry + match = RUNTIME_LOG_PATTERN.match(text.strip()) + if match: + entry["timestamp"] = match.group("timestamp") + entry["level"] = match.group("level") + entry["message"] = match.group("message") + return entry + + +def get_recent_runtime_logs(limit: int = 600) -> list: + """获取最近的运行日志行，默认返回 600 条。""" + try: + limit_int = int(limit) + except (ValueError, TypeError): + limit_int = 600 + limit_int = max(100, min(limit_int, MAX_RUNTIME_LOG_LINES)) + if not os.path.exists(LOG_FILE_PATH): + return [] + lines = deque(maxlen=limit_int) + try: + with open(LOG_FILE_PATH, "r", encoding="utf-8", errors="replace") as fp: + for raw_line in fp: + lines.append(raw_line.rstrip("\n")) + except Exception as exc: + logging.warning(f"读取运行日志失败: {exc}") + return [] + logs = [] + for idx, raw_line in enumerate(lines): + entry = _parse_runtime_log_line(raw_line) + entry["id"] = f"{idx}-{hashlib.md5((raw_line + str(idx)).encode('utf-8', 'ignore')).hexdigest()}" + logs.append(entry) + return logs + # --------- 每日任务：在用户设置的刷新时间重算所有季的已播出集数并更新进度 --------- def recompute_all_seasons_aired_daily(): @@ -1915,6 +1981,15 @@ def run_script_now(): ) +@app.route("/api/runtime_logs") +def api_runtime_logs(): + if not is_login(): + return jsonify({"success": False, "message": "未登录"}), 401 + limit = request.args.get("limit", 600) + logs = get_recent_runtime_logs(limit) + return jsonify({"success": True, "logs": logs}) + + # -------------------- 追剧日历：任务提取与匹配辅助 -------------------- def purge_calendar_by_tmdb_id_internal(tmdb_id: int, force: bool = False) -> bool: """内部工具：按 tmdb_id 清理 shows/seasons/episodes，并尝试删除本地海报文件 diff --git a/app/static/css/main.css b/app/static/css/main.css index 85e8db1..2333ff1 100644 --- a/app/static/css/main.css +++ b/app/static/css/main.css @@ -19,7 +19,7 @@ /* --------------- 基础样式 --------------- */ body { font-size: 1rem; - padding-bottom: 110px; + padding-bottom: 15px; color: var(--dark-text-color); } @@ -2394,7 +2394,7 @@ div.jsoneditor-tree button.jsoneditor-button:focus { transition: color 0.2s; /* 添加颜色过渡效果 */ } -/* 侧边栏菜单项图标样式 */ +/* 侧边栏菜导航图标样式 */ .sidebar .nav-link .bi-list-ul { font-size: 1.1rem; position: relative; @@ -2423,8 +2423,12 @@ div.jsoneditor-tree button.jsoneditor-button:focus { font-size: 0.94rem; } +.sidebar .nav-link .bi-terminal { + font-size: 0.95rem; +} + .sidebar .nav-link .bi-power { - font-size: 1.27rem; + font-size: 1.26rem; } .bottom-links .nav-link .bi-book { @@ -6791,6 +6795,12 @@ body .selectable-files tr.selected-file:has([style*="white-space: normal"]) .fil } } +/* 影视发现页面与任务列表海报视图统一底部边距 */ +/* 使用 .discovery-controls 作为标识，因为只有影视发现页面有这个class */ +.discovery-controls ~ * .discovery-grid { + margin-bottom: 0.5px; +} + /* 文件整理页面命名预览模式下的展开状态文本位置调整 - 最高优先级 */ #fileSelectModal[data-modal-type="preview-filemanager"] .table td.col-rename > div[style*="white-space: normal"][style*="word-break: break-word"] { position: relative !important; @@ -7897,7 +7907,7 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { /* TMDB 说明文本样式与链接样式（继承颜色、无下划线、悬停不变） */ .tmdb-attribution { margin-top: 4px; - margin-bottom: 4px; + margin-bottom: 2px; color: var(--light-text-color); } .tmdb-attribution a { @@ -8413,6 +8423,71 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { user-select: text; } +/* 运行日志页面日志行样式：与运行日志弹窗保持一致 */ +.runlog-content .runlog-line { + margin: 0; + padding: 0 0 0 1.5px; /* 桌面端日志行左边距 */ + font-family: monospace; + font-size: 0.85rem; /* 与 #logModal pre 字号一致 */ + line-height: 1.5; /* 行高与弹窗一致 */ + color: var(--dark-text-color); + /* 桌面端：超长内容不换行，直接截断显示 */ + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + +/* 运行日志页面：级别可点击筛选样式 */ +.runlog-content .log-level-clickable { + cursor: pointer; + transition: color 0.2s ease-in-out; + user-select: text; /* 允许选中文本，确保复制时包含级别信息 */ +} + +.runlog-content .log-level-clickable:hover { + color: var(--focus-border-color) !important; +} + +/* --------------- 页面底部元素统一间距 --------------- */ +/* 转存记录和文件整理页面：分页控制区域距离页面底部统一为 20px */ +.pagination-container { + margin-bottom: -90px !important; +} + +/* 日历表格距离页面底部为 20px */ +/* 同时覆盖 padding-bottom，确保样式生效 */ +.calendar-month-mode { + margin-bottom: -86px !important; + padding-bottom: 20px !important; +} + .calendar-filter-row { - margin-bottom: 20px; /* 桌面端保持与下方组件净间距 8px（抵消分类与控制按钮的 -12px 上移） */ + margin-bottom: 20px; +} + +/* --------------- 运行日志页面 --------------- */ +.runlog-content { + min-height: 360px; + max-height: calc(100vh - 146px); + overflow-y: auto; + /* 通过负margin抵消body的padding-bottom(15px)，确保日志显示区域底部距离页面底部为20px */ + margin-bottom: -15px !important; + padding: 0 0 20px 0; +} + +@media (max-width: 768px) { + .runlog-content { + max-height: none; + min-height: 240px; + /* 窄屏设备：支持横向滚动，完整显示超长内容 */ + overflow-x: auto; + } + + /* 窄屏设备：日志行允许横向滚动，完整显示内容 */ + .runlog-content .runlog-line { + white-space: nowrap; /* 不换行，保持单行 */ + overflow: unset; /* 移除overflow限制，允许内容溢出到父容器 */ + text-overflow: unset; /* 移除省略号，完整显示 */ + padding-left: 5.5px; /* 窄屏设备日志行左边距 */ + } } \ No newline at end of file diff --git a/app/templates/index.html b/app/templates/index.html index ff7d6f2..d42d3dd 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -389,6 +389,11 @@ 系统配置 +
  • + + 运行日志 + +
  • 退出 @@ -965,6 +970,78 @@ +
    +
    +
    +
    +
    +
    + 内容筛选 +
    + +
    + +
    +
    +
    +
    +
    +
    + 任务筛选 +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    + 级别筛选 +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    + + 加载日志中... +
    +
    + 暂无匹配的日志 +
    +
    +
    + [{{ log.timestamp || '--' }}][{{ log.level || 'INFO' }}] + +
    +
    +
    +
    +
    +
    +
    @@ -3052,6 +3129,17 @@ execution_mode: null // 将在openCreateTaskModal中设置为formData.execution_mode }, run_log: "", + runtimeLogs: [], + runtimeLogLoading: false, + runtimeLogFilters: { + keyword: '', + task: '', + level: '' + }, + runtimeLogScrollPositionBeforeTaskFilter: null, // 保存应用任务筛选之前的滚动位置 + runtimeLogLevels: ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'], + runtimeLogPollingTimer: null, + runtimeLogInitialized: false, // 跟踪运行日志是否已初始化（用于避免首次加载时的闪现） taskDirs: [""], taskDirSelected: "", taskNameFilter: "", @@ -3640,6 +3728,64 @@ return this.sortTaskNamesByPinyin([...taskNames]); }, + filteredRuntimeLogs() { + try { + let logs = Array.isArray(this.runtimeLogs) ? this.runtimeLogs.slice() : []; + const keyword = (this.runtimeLogFilters.keyword || '').trim().toLowerCase(); + const taskName = (this.runtimeLogFilters.task || '').trim(); + const level = (this.runtimeLogFilters.level || '').trim().toUpperCase(); + + // 如果指定了任务筛选，需要按任务块进行完整筛选 + if (taskName) { + // 首先解析所有任务块 + const taskBlocks = this.parseTaskBlocks(logs); + + // 找出所有匹配任务名称的任务块索引 + const matchedBlockIndices = new Set(); + taskBlocks.forEach((block, index) => { + if (block.taskName === taskName) { + matchedBlockIndices.add(index); + } + }); + + // 筛选出所有匹配任务块的日志行 + const filteredLogs = []; + logs.forEach((log, logIndex) => { + const blockIndex = taskBlocks.findIndex(block => + logIndex >= block.startIndex && logIndex <= block.endIndex + ); + if (blockIndex !== -1 && matchedBlockIndices.has(blockIndex)) { + filteredLogs.push(log); + } + }); + + logs = filteredLogs; + } + + // 关键词筛选（在任务块筛选之后进行） + if (keyword) { + logs = logs.filter(log => { + const text = this.getRuntimeLogText(log).toLowerCase(); + return text.includes(keyword); + }); + } + + // 日志级别筛选 + if (level) { + logs = logs.filter(log => (log.level || '').toUpperCase() === level); + } + + // 移动端（窄屏设备）：倒序显示，让最新日志在顶部 + const isMobile = window.innerWidth <= 768; + if (isMobile) { + logs = logs.reverse(); + } + return logs; + } catch (e) { + console.error('筛选运行日志时出错:', e); + return this.runtimeLogs || []; + } + }, totalPages() { // 直接使用后端返回的total_pages if (this.history.pagination && this.history.pagination.total_pages) { @@ -3776,7 +3922,58 @@ this.loadHistoryRecords(); } }, + 'runtimeLogFilters.task': function(newVal, oldVal) { + const viewport = this.$refs.runtimeLogViewport; + if (!viewport) return; + + // 当应用任务筛选时（从空变为有值），保存当前的滚动位置 + if (!oldVal && newVal) { + this.runtimeLogScrollPositionBeforeTaskFilter = { + scrollTop: viewport.scrollTop, + scrollHeight: viewport.scrollHeight + }; + } + // 当清空任务筛选时（从有值变为空），恢复之前保存的滚动位置 + else if (oldVal && !newVal && this.runtimeLogScrollPositionBeforeTaskFilter) { + this.$nextTick(() => { + const savedPosition = this.runtimeLogScrollPositionBeforeTaskFilter; + if (savedPosition && viewport && savedPosition.scrollHeight > 0) { + // 计算滚动位置的相对比例，以适应内容高度可能的变化 + const ratio = savedPosition.scrollTop / savedPosition.scrollHeight; + const newScrollTop = viewport.scrollHeight * ratio; + // 确保滚动位置在有效范围内 + viewport.scrollTop = Math.max(0, Math.min(newScrollTop, viewport.scrollHeight - viewport.clientHeight)); + // 清空保存的位置 + this.runtimeLogScrollPositionBeforeTaskFilter = null; + } else if (savedPosition && viewport) { + // 如果保存的 scrollHeight 为 0，直接使用保存的 scrollTop（如果有效） + if (savedPosition.scrollTop >= 0) { + viewport.scrollTop = Math.min(savedPosition.scrollTop, viewport.scrollHeight); + } + this.runtimeLogScrollPositionBeforeTaskFilter = null; + } + }); + } + }, activeTab(newValue, oldValue) { + if (newValue === 'runlogs') { + // 如果已经有日志，立即显示并滚动到底部，避免空白 + const hasLogs = Array.isArray(this.runtimeLogs) && this.runtimeLogs.length > 0; + if (hasLogs && !this.runtimeLogInitialized) { + this.runtimeLogInitialized = true; + this.$nextTick(() => { + const viewport = this.$refs.runtimeLogViewport; + if (viewport) { + viewport.scrollTop = viewport.scrollHeight; + } + }); + } + this.startRuntimeLogPolling(); + } else if (oldValue === 'runlogs') { + this.stopRuntimeLogPolling(); + // 离开运行日志页面时重置初始化标志，下次进入时会重新初始化 + this.runtimeLogInitialized = false; + } // 如果切换到任务列表页面，则刷新任务最新信息和元数据 if (newValue === 'tasklist') { // 确保全局 SSE 已建立 @@ -4014,6 +4211,9 @@ // 添加移动端任务列表展开/收起状态监听 this.setupMobileTaskListToggle(); }, 500); + if (this.activeTab === 'runlogs') { + this.startRuntimeLogPolling(); + } }, beforeDestroy() { window.removeEventListener('beforeunload', this.handleBeforeUnload); @@ -4030,6 +4230,7 @@ document.removeEventListener('click', this.handleOutsideClick); // 清理日历后台监听 this.stopCalendarAutoWatch(); + this.stopRuntimeLogPolling(); }, methods: { // 计算来源徽标 class：多来源时使用 multi-source，单来源使用小写来源名 @@ -8104,6 +8305,201 @@ clearData(target) { this[target] = ""; }, + clearRuntimeLogFilter(field) { + if (!this.runtimeLogFilters) return; + if (Object.prototype.hasOwnProperty.call(this.runtimeLogFilters, field)) { + this.$set(this.runtimeLogFilters, field, ''); + } + }, + filterByLogLevel(level, event) { + // 防止事件冒泡 + if (event) { + event.stopPropagation(); + } + + // 如果当前已经筛选了该级别，则取消筛选 + if (this.runtimeLogFilters.level === level) { + this.$set(this.runtimeLogFilters, 'level', ''); + } else { + // 设置级别筛选值 + this.$set(this.runtimeLogFilters, 'level', level); + } + }, + getRuntimeLogText(log) { + // 统一获取日志展示文本，避免空字符串被误判为无内容 + if (!log) { + return ''; + } + if (Object.prototype.hasOwnProperty.call(log, 'message')) { + const message = log.message; + if (message !== undefined && message !== null) { + return String(message); + } + } + return log.raw ? String(log.raw) : ''; + }, + parseTaskBlocks(logs) { + // 解析日志中的任务块，返回任务块数组 + // 每个任务块包含：startIndex, endIndex, taskName, taskNumber + const blocks = []; + let currentBlock = null; + + for (let i = 0; i < logs.length; i++) { + const log = logs[i]; + const text = this.getRuntimeLogText(log); + + // 检查是否是任务块开始标记：格式为 #数字------------------ + const taskStartMatch = text.match(/^#(\d+)------------------/); + if (taskStartMatch) { + // 如果之前有未完成的任务块，先结束它（结束于上一个日志行） + if (currentBlock && currentBlock.endIndex === -1) { + currentBlock.endIndex = Math.max(i - 1, currentBlock.startIndex); + } + + // 开始新的任务块 + const taskNumber = taskStartMatch[1]; + currentBlock = { + startIndex: i, + endIndex: -1, // 暂时设为-1，表示未结束 + taskName: '', + taskNumber: taskNumber + }; + blocks.push(currentBlock); + continue; + } + + // 如果当前在任务块中，检查是否是任务名称行 + if (currentBlock && currentBlock.taskName === '') { + const taskNameMatch = text.match(/^任务名称:\s*(.+)$/); + if (taskNameMatch) { + currentBlock.taskName = taskNameMatch[1].trim(); + } + } + + // 检查是否是任务块结束标记 + if (currentBlock && currentBlock.endIndex === -1) { + // 检查是否是程序结束相关标记（这些标记表示任务块应该结束） + // 任务块应该在推送通知之前结束，包括推送通知之前的空行 + if (text.includes('===============推送通知===============') || + text.includes('===============程序结束===============')) { + // 任务块结束于推送通知之前的最后一行（包括空行） + // 如果上一行是空行，则包含它；否则结束于上一行 + currentBlock.endIndex = i - 1; + currentBlock = null; + continue; + } + + // 检查是否是程序执行成功标记（这些标记不属于任务块） + if (text.match(/^>>>\s+(定时运行全部任务|手动运行任务\s+\[.+\])\s+执行成功$/)) { + // 执行成功标记不属于任务块，所以任务块结束于上一行 + currentBlock.endIndex = Math.max(i - 1, currentBlock.startIndex); + currentBlock = null; + continue; + } + } + } + + // 处理最后一个未结束的任务块 + if (currentBlock && currentBlock.endIndex === -1) { + currentBlock.endIndex = logs.length - 1; + } + + return blocks; + }, + fetchRuntimeLogs(force = false) { + const hasLogs = Array.isArray(this.runtimeLogs) && this.runtimeLogs.length > 0; + const shouldShowLoading = force || (!hasLogs && !this.runtimeLogLoading); + const isInitialLoad = force && !hasLogs; // 判断是否是首次加载（强制刷新且没有现有日志） + + // 首次加载时先隐藏内容，避免闪现 + if (isInitialLoad) { + this.runtimeLogInitialized = false; + } else if (!this.runtimeLogInitialized && hasLogs) { + // 如果不是首次加载但日志被隐藏了（比如从其他页面切换回来），立即显示 + this.runtimeLogInitialized = true; + } + + if (shouldShowLoading) { + this.runtimeLogLoading = true; + } + + // 记录刷新前的滚动位置和内容高度 + const viewport = this.$refs.runtimeLogViewport; + let previousScrollTop = 0; + let previousScrollHeight = 0; + let wasNearBottom = false; + + if (viewport) { + previousScrollTop = viewport.scrollTop; + previousScrollHeight = viewport.scrollHeight; + // 判断用户是否接近底部（距离底部小于50像素视为接近底部） + const distanceFromBottom = previousScrollHeight - previousScrollTop - viewport.clientHeight; + wasNearBottom = distanceFromBottom < 50; + } + + axios.get('/api/runtime_logs', { params: { limit: 800 } }) + .then(res => { + if (res.data && res.data.success) { + this.runtimeLogs = res.data.logs || []; + this.$nextTick(() => { + const viewport = this.$refs.runtimeLogViewport; + if (viewport) { + if (isInitialLoad || wasNearBottom) { + // 首次加载或用户接近底部时，滚动到底部（保持自动跟随最新日志） + viewport.scrollTop = viewport.scrollHeight; + // 首次加载时，滚动完成后再显示内容，避免闪现 + if (isInitialLoad) { + // 使用 requestAnimationFrame 确保滚动完成后再显示 + requestAnimationFrame(() => { + requestAnimationFrame(() => { + this.runtimeLogInitialized = true; + }); + }); + } + } else { + // 否则保持用户的滚动位置 + const newScrollHeight = viewport.scrollHeight; + const heightDiff = newScrollHeight - previousScrollHeight; + viewport.scrollTop = previousScrollTop + heightDiff; + } + // 确保如果不是首次加载，日志是显示的 + if (!isInitialLoad && !this.runtimeLogInitialized) { + this.runtimeLogInitialized = true; + } + } + }); + } + }) + .catch(error => { + console.error('获取运行日志失败:', error); + // 出错时也要显示内容 + if (isInitialLoad) { + this.runtimeLogInitialized = true; + } else if (!this.runtimeLogInitialized) { + this.runtimeLogInitialized = true; + } + }) + .finally(() => { + if (shouldShowLoading) { + this.runtimeLogLoading = false; + } + }); + }, + startRuntimeLogPolling() { + if (this.runtimeLogPollingTimer) { + return; + } + this.fetchRuntimeLogs(true); + this.runtimeLogPollingTimer = setInterval(() => { + this.fetchRuntimeLogs(false); + }, 5000); + }, + stopRuntimeLogPolling() { + if (this.runtimeLogPollingTimer) { + clearInterval(this.runtimeLogPollingTimer); + this.runtimeLogPollingTimer = null; + } + }, async runScriptNow(task_index = null) { body = {}; if (task_index != null) { From b8e278fadb79dac952d68ce108279a4a987e90a8 Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Sat, 29 Nov 2025 21:55:14 +0800 Subject: [PATCH 04/34] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=A1=B5=E9=9D=A2=E7=AD=9B=E9=80=89=E5=99=A8?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=90=8E=E6=BB=9A=E5=8A=A8=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为级别筛选和内容筛选添加滚动位置保存和恢复功能，确保清空筛选后始终回到筛选前的位置，无论筛选是否有结果，与任务筛选保持一致的交互体验 --- app/templates/index.html | 68 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/app/templates/index.html b/app/templates/index.html index d42d3dd..12bef9d 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -3137,6 +3137,8 @@ level: '' }, runtimeLogScrollPositionBeforeTaskFilter: null, // 保存应用任务筛选之前的滚动位置 + runtimeLogScrollPositionBeforeLevelFilter: null, // 保存应用级别筛选之前的滚动位置 + runtimeLogScrollPositionBeforeKeywordFilter: null, // 保存应用内容筛选之前的滚动位置 runtimeLogLevels: ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'], runtimeLogPollingTimer: null, runtimeLogInitialized: false, // 跟踪运行日志是否已初始化（用于避免首次加载时的闪现） @@ -3955,6 +3957,72 @@ }); } }, + 'runtimeLogFilters.level': function(newVal, oldVal) { + const viewport = this.$refs.runtimeLogViewport; + if (!viewport) return; + + // 当应用级别筛选时（从空变为有值），保存当前的滚动位置 + if (!oldVal && newVal) { + this.runtimeLogScrollPositionBeforeLevelFilter = { + scrollTop: viewport.scrollTop, + scrollHeight: viewport.scrollHeight + }; + } + // 当清空级别筛选时（从有值变为空），恢复之前保存的滚动位置 + else if (oldVal && !newVal && this.runtimeLogScrollPositionBeforeLevelFilter) { + this.$nextTick(() => { + const savedPosition = this.runtimeLogScrollPositionBeforeLevelFilter; + if (savedPosition && viewport && savedPosition.scrollHeight > 0) { + // 计算滚动位置的相对比例，以适应内容高度可能的变化 + const ratio = savedPosition.scrollTop / savedPosition.scrollHeight; + const newScrollTop = viewport.scrollHeight * ratio; + // 确保滚动位置在有效范围内 + viewport.scrollTop = Math.max(0, Math.min(newScrollTop, viewport.scrollHeight - viewport.clientHeight)); + // 清空保存的位置 + this.runtimeLogScrollPositionBeforeLevelFilter = null; + } else if (savedPosition && viewport) { + // 如果保存的 scrollHeight 为 0，直接使用保存的 scrollTop（如果有效） + if (savedPosition.scrollTop >= 0) { + viewport.scrollTop = Math.min(savedPosition.scrollTop, viewport.scrollHeight); + } + this.runtimeLogScrollPositionBeforeLevelFilter = null; + } + }); + } + }, + 'runtimeLogFilters.keyword': function(newVal, oldVal) { + const viewport = this.$refs.runtimeLogViewport; + if (!viewport) return; + + // 当应用内容筛选时（从空变为有值），保存当前的滚动位置 + if (!oldVal && newVal) { + this.runtimeLogScrollPositionBeforeKeywordFilter = { + scrollTop: viewport.scrollTop, + scrollHeight: viewport.scrollHeight + }; + } + // 当清空内容筛选时（从有值变为空），恢复之前保存的滚动位置 + else if (oldVal && !newVal && this.runtimeLogScrollPositionBeforeKeywordFilter) { + this.$nextTick(() => { + const savedPosition = this.runtimeLogScrollPositionBeforeKeywordFilter; + if (savedPosition && viewport && savedPosition.scrollHeight > 0) { + // 计算滚动位置的相对比例，以适应内容高度可能的变化 + const ratio = savedPosition.scrollTop / savedPosition.scrollHeight; + const newScrollTop = viewport.scrollHeight * ratio; + // 确保滚动位置在有效范围内 + viewport.scrollTop = Math.max(0, Math.min(newScrollTop, viewport.scrollHeight - viewport.clientHeight)); + // 清空保存的位置 + this.runtimeLogScrollPositionBeforeKeywordFilter = null; + } else if (savedPosition && viewport) { + // 如果保存的 scrollHeight 为 0，直接使用保存的 scrollTop（如果有效） + if (savedPosition.scrollTop >= 0) { + viewport.scrollTop = Math.min(savedPosition.scrollTop, viewport.scrollHeight); + } + this.runtimeLogScrollPositionBeforeKeywordFilter = null; + } + }); + } + }, activeTab(newValue, oldValue) { if (newValue === 'runlogs') { // 如果已经有日志，立即显示并滚动到底部，避免空白 From 1045fa193475c4f19bf2445eb86c68aa0f513bac Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Sun, 30 Nov 2025 20:45:01 +0800 Subject: [PATCH 05/34] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E4=BD=93=E9=AA=8C=EF=BC=9A=E7=A7=BB=E9=99=A4=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E5=8A=A8=E7=94=BB=E5=92=8C=E6=8F=90=E7=A4=BA=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E9=9D=99=E9=BB=98=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除首次加载和刷新时显示的 Spinner 动画和 '加载日志中...' 提示 - 优化 '暂无匹配的日志' 提示的显示逻辑：仅在加载完成且确实无匹配日志时显示 - 加载过程中保持静默，不显示任何提示信息 - 保持日志筛选、轮询、页面切换等所有功能正常工作 --- app/templates/index.html | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/templates/index.html b/app/templates/index.html index 12bef9d..4b3dd62 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -1022,14 +1022,10 @@
    -
    - - 加载日志中... -
    -
    +
    暂无匹配的日志
    -
    +
    From 12cf1bb19060ebcc437bd05610f7341a0a049788 Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Sun, 30 Nov 2025 21:41:35 +0800 Subject: [PATCH 06/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=98=BE=E7=A4=BA=E8=8C=83=E5=9B=B4=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=80=89=E9=A1=B9=EF=BC=8C=E6=94=AF=E6=8C=81=E6=8C=89?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=98=BE=E7=A4=BA=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将日志显示方式从按条数限制改为按时间范围限制（默认显示最近 3 天的日志） - 在系统配置的性能设置中添加 '运行日志显示范围' 配置项，允许用户自定义天数 - 保持向后兼容：API 仍支持 limit 参数，旧配置自动使用默认值 --- app/run.py | 130 ++++++++++++++++++++++++++++++++++----- app/templates/index.html | 28 +++++++-- 2 files changed, 138 insertions(+), 20 deletions(-) diff --git a/app/run.py b/app/run.py index daa7a14..b60d5b9 100644 --- a/app/run.py +++ b/app/run.py @@ -1182,28 +1182,111 @@ def _parse_runtime_log_line(line: str) -> dict: return entry -def get_recent_runtime_logs(limit: int = 600) -> list: - """获取最近的运行日志行，默认返回 600 条。""" - try: - limit_int = int(limit) - except (ValueError, TypeError): - limit_int = 600 - limit_int = max(100, min(limit_int, MAX_RUNTIME_LOG_LINES)) +def get_recent_runtime_logs(limit: int = None, days: float = None) -> list: + """获取最近的运行日志行。 + + Args: + limit: 按条数限制，默认 None（不使用条数限制） + days: 按时间范围限制（天数），默认 None（不使用时间限制） + 如果同时指定 limit 和 days，优先使用 days 参数 + + Returns: + 日志条目列表 + """ if not os.path.exists(LOG_FILE_PATH): return [] - lines = deque(maxlen=limit_int) + + # 如果指定了 days 参数，按时间范围筛选 + if days is not None: + try: + days_float = float(days) + if days_float <= 0: + days_float = 1.0 # 默认1天 + except (ValueError, TypeError): + days_float = 1.0 + + # 计算时间阈值（当前时间往前推指定天数） + time_threshold = datetime.now() - timedelta(days=days_float) + current_year = datetime.now().year + + logs = [] + try: + with open(LOG_FILE_PATH, "r", encoding="utf-8", errors="replace") as fp: + for raw_line in fp: + line = raw_line.rstrip("\n") + if not line: + continue + + entry = _parse_runtime_log_line(line) + timestamp_str = entry.get("timestamp", "") + + # 解析时间戳（格式：MM-DD HH:MM:SS） + if timestamp_str: + try: + # 尝试解析时间戳，需要加上当前年份 + log_time = datetime.strptime(f"{current_year}-{timestamp_str}", "%Y-%m-%d %H:%M:%S") + + # 如果解析出的时间比当前时间还晚（跨年情况），则减一年 + if log_time > datetime.now(): + log_time = datetime.strptime(f"{current_year - 1}-{timestamp_str}", "%Y-%m-%d %H:%M:%S") + + # 只保留在时间范围内的日志 + if log_time >= time_threshold: + entry["id"] = f"{len(logs)}-{hashlib.md5((line + str(len(logs))).encode('utf-8', 'ignore')).hexdigest()}" + logs.append(entry) + except (ValueError, TypeError): + # 如果时间戳解析失败，保留该日志（兼容没有时间戳的日志） + entry["id"] = f"{len(logs)}-{hashlib.md5((line + str(len(logs))).encode('utf-8', 'ignore')).hexdigest()}" + logs.append(entry) + else: + # 没有时间戳的日志也保留 + entry["id"] = f"{len(logs)}-{hashlib.md5((line + str(len(logs))).encode('utf-8', 'ignore')).hexdigest()}" + logs.append(entry) + except Exception as exc: + logging.warning(f"读取运行日志失败: {exc}") + return [] + + return logs + + # 如果指定了 limit 参数，按条数限制（保持向后兼容） + if limit is not None: + try: + limit_int = int(limit) + except (ValueError, TypeError): + limit_int = 600 + limit_int = max(100, min(limit_int, MAX_RUNTIME_LOG_LINES)) + + lines = deque(maxlen=limit_int) + try: + with open(LOG_FILE_PATH, "r", encoding="utf-8", errors="replace") as fp: + for raw_line in fp: + lines.append(raw_line.rstrip("\n")) + except Exception as exc: + logging.warning(f"读取运行日志失败: {exc}") + return [] + + logs = [] + for idx, raw_line in enumerate(lines): + entry = _parse_runtime_log_line(raw_line) + entry["id"] = f"{idx}-{hashlib.md5((raw_line + str(idx)).encode('utf-8', 'ignore')).hexdigest()}" + logs.append(entry) + return logs + + # 如果两个参数都没有指定，返回所有日志（不推荐，但保持兼容性） + logs = [] try: with open(LOG_FILE_PATH, "r", encoding="utf-8", errors="replace") as fp: for raw_line in fp: - lines.append(raw_line.rstrip("\n")) + line = raw_line.rstrip("\n") + if not line: + continue + entry = _parse_runtime_log_line(line) + entry["id"] = f"{len(logs)}-{hashlib.md5((line + str(len(logs))).encode('utf-8', 'ignore')).hexdigest()}" + logs.append(entry) except Exception as exc: logging.warning(f"读取运行日志失败: {exc}") return [] - logs = [] - for idx, raw_line in enumerate(lines): - entry = _parse_runtime_log_line(raw_line) - entry["id"] = f"{idx}-{hashlib.md5((raw_line + str(idx)).encode('utf-8', 'ignore')).hexdigest()}" - logs.append(entry) + return logs @@ -1985,8 +2068,23 @@ def run_script_now(): def api_runtime_logs(): if not is_login(): return jsonify({"success": False, "message": "未登录"}), 401 - limit = request.args.get("limit", 600) - logs = get_recent_runtime_logs(limit) + # 优先使用 days 参数（按时间范围），如果没有则使用 limit 参数（按条数，保持向后兼容） + days = request.args.get("days") + limit = request.args.get("limit") + + if days is not None: + try: + days_float = float(days) + logs = get_recent_runtime_logs(days=days_float) + except (ValueError, TypeError): + # 如果 days 参数无效，回退到 limit 参数 + limit = limit or 600 + logs = get_recent_runtime_logs(limit=limit) + else: + # 如果没有 days 参数，使用 limit 参数（保持向后兼容） + limit = limit or 600 + logs = get_recent_runtime_logs(limit=limit) + return jsonify({"success": True, "logs": logs}) diff --git a/app/templates/index.html b/app/templates/index.html index 4b3dd62..5493374 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -918,7 +918,7 @@
    -
    +
    追剧日历刷新周期
    @@ -936,6 +936,17 @@
    +
    +
    +
    + 运行日志显示范围 +
    + +
    + 天 +
    +
    +
    @@ -3082,7 +3093,9 @@ // 追剧日历刷新周期（秒），默认6小时（21600秒） calendar_refresh_interval_seconds: 21600, // 已播出集数刷新时间，24小时制，格式：HH:MM，默认00:00 - aired_refresh_time: "00:00" + aired_refresh_time: "00:00", + // 运行日志显示范围（天），默认3天 + runtime_log_display_days: 3 }, plugin_config_mode: { aria2: "independent", @@ -7635,7 +7648,7 @@ } // 确保性能设置存在并补默认值（单位：秒） if (!config_data.performance) { - config_data.performance = { calendar_refresh_interval_seconds: 21600, aired_refresh_time: "00:00" }; + config_data.performance = { calendar_refresh_interval_seconds: 21600, aired_refresh_time: "00:00", runtime_log_display_days: 3 }; } else { if (config_data.performance.calendar_refresh_interval_seconds === undefined || config_data.performance.calendar_refresh_interval_seconds === null) { config_data.performance.calendar_refresh_interval_seconds = 21600; @@ -7643,6 +7656,9 @@ if (config_data.performance.aired_refresh_time === undefined || config_data.performance.aired_refresh_time === null) { config_data.performance.aired_refresh_time = "00:00"; } + if (config_data.performance.runtime_log_display_days === undefined || config_data.performance.runtime_log_display_days === null) { + config_data.performance.runtime_log_display_days = 3; + } } // 确保execution_mode有默认值 if (!config_data.execution_mode) { @@ -8501,7 +8517,11 @@ wasNearBottom = distanceFromBottom < 50; } - axios.get('/api/runtime_logs', { params: { limit: 800 } }) + // 获取运行日志显示范围配置（天数），默认3天 + const displayDays = this.formData.performance && this.formData.performance.runtime_log_display_days + ? parseFloat(this.formData.performance.runtime_log_display_days) || 3 + : 3; + axios.get('/api/runtime_logs', { params: { days: displayDays } }) .then(res => { if (res.data && res.data.success) { this.runtimeLogs = res.data.logs || []; From 9269f66cd5991fab08ca5d529a3e1c8f1dcb09d8 Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Sun, 30 Nov 2025 22:34:53 +0800 Subject: [PATCH 07/34] =?UTF-8?q?=E5=B0=86=E6=97=A5=E5=BF=97=E5=A4=87?= =?UTF-8?q?=E4=BB=BD=E6=96=87=E4=BB=B6=E6=95=B0=E9=87=8F=E4=BB=8E=205=20?= =?UTF-8?q?=E4=B8=AA=E6=94=B9=E4=B8=BA=202=20=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/run.py b/app/run.py index b60d5b9..ab4e4d3 100644 --- a/app/run.py +++ b/app/run.py @@ -1154,7 +1154,7 @@ try: _runtime_log_handler = RotatingFileHandler( LOG_FILE_PATH, maxBytes=5 * 1024 * 1024, - backupCount=5, + backupCount=2, encoding="utf-8" ) _runtime_log_handler.setFormatter(_standard_formatter) From 8c08b00db707fa96d48f8d92ec1e9a2ec9e4a28f Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Mon, 1 Dec 2025 20:32:49 +0800 Subject: [PATCH 08/34] =?UTF-8?q?=E5=9C=A8=E8=BF=90=E8=A1=8C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=20>>>=20=E4=B8=8E?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=90=8D=E7=A7=B0=E5=BF=AB=E9=80=9F=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为运行日志中的 >>> 增加点击快速内容筛选，重复点击可清除筛选 - 为 “任务名称: xxxx” 中的任务名增加点击快速任务筛选，复用原有任务块筛选逻辑 --- app/static/css/main.css | 12 ++++++ app/templates/index.html | 86 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 95 insertions(+), 3 deletions(-) diff --git a/app/static/css/main.css b/app/static/css/main.css index 2333ff1..5a2d7e1 100644 --- a/app/static/css/main.css +++ b/app/static/css/main.css @@ -8448,6 +8448,18 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { color: var(--focus-border-color) !important; } +/* 运行日志页面：内容中可点击的快速筛选元素样式（>>> 和任务名称） */ +.runlog-content .runtime-log-arrow-clickable, +.runlog-content .runtime-log-taskname-clickable { + cursor: pointer; + user-select: text; /* 允许正常选中复制文本 */ +} + +.runlog-content .runtime-log-arrow-clickable:hover, +.runlog-content .runtime-log-taskname-clickable:hover { + color: var(--focus-border-color); +} + /* --------------- 页面底部元素统一间距 --------------- */ /* 转存记录和文件整理页面：分页控制区域距离页面底部统一为 20px */ .pagination-container { diff --git a/app/templates/index.html b/app/templates/index.html index 5493374..41f8d05 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -1031,7 +1031,7 @@
    -
    +
    暂无匹配的日志 @@ -1039,9 +1039,10 @@
    + class="runlog-line" + @click="handleRuntimeLogClick(log, $event)"> [{{ log.timestamp || '--' }}][{{ log.level || 'INFO' }}] - +
    @@ -8391,6 +8392,7 @@ this.$set(this.runtimeLogFilters, field, ''); } }, + // 运行日志：日志级别点击筛选 filterByLogLevel(level, event) { // 防止事件冒泡 if (event) { @@ -8405,6 +8407,7 @@ this.$set(this.runtimeLogFilters, 'level', level); } }, + // 运行日志：统一获取日志原始文本 getRuntimeLogText(log) { // 统一获取日志展示文本，避免空字符串被误判为无内容 if (!log) { @@ -8418,6 +8421,83 @@ } return log.raw ? String(log.raw) : ''; }, + // 运行日志：将日志文本转换为带可点击区域的 HTML + getRuntimeLogDisplayHtml(log) { + // 使用 v-html 时，先对原始文本进行转义，再插入自定义的可点击 span + const text = this.getRuntimeLogText(log) || ''; + const escapeHtml = (str) => { + return String(str) + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') + .replace(/'/g, '''); + }; + const escapeAttr = (str) => { + // 属性用的简单转义，避免引号破坏属性 + return String(str) + .replace(/&/g, '&') + .replace(/"/g, '"') + .replace(/'/g, ''') + .replace(//g, '>'); + }; + + let html = escapeHtml(text); + + // 1. 任务名称: xxxx 中的 xxxx 可点击 —— 只处理首个“任务名称:”匹配，避免误伤其他内容 + html = html.replace(/(任务名称:\s*)(.+)/, (match, prefix, name) => { + const trimmedName = name.trim(); + if (!trimmedName) return match; + const safeName = escapeHtml(trimmedName); + const safeAttr = escapeAttr(trimmedName); + return `${prefix}${safeName}`; + }); + + // 2. 将所有 >>> 替换为可点击的 span（在转义后的文本中是 >>>） + html = html.replace(/>>>/g, '>>>'); + + return html; + }, + // 运行日志：统一处理内容区域点击（事件委托，避免影响复制） + handleRuntimeLogClick(log, event) { + if (!event || !event.target) return; + const target = event.target; + + // 点击 >>> 触发内容关键词快速筛选（再次点击则清空） + if (target.classList && target.classList.contains('runtime-log-arrow-clickable')) { + event.stopPropagation(); + this.toggleRuntimeLogKeywordFilter('>>>'); + return; + } + + // 点击任务名称触发任务筛选（再次点击则清空） + if (target.classList && target.classList.contains('runtime-log-taskname-clickable')) { + event.stopPropagation(); + const taskName = (target.getAttribute('data-taskname') || target.textContent || '').trim(); + if (taskName) { + this.toggleRuntimeLogTaskFilter(taskName); + } + } + }, + // 运行日志：基于固定关键词（例如 >>>）的内容筛选开关 + toggleRuntimeLogKeywordFilter(keyword) { + const current = (this.runtimeLogFilters.keyword || '').trim(); + if (current === keyword) { + this.$set(this.runtimeLogFilters, 'keyword', ''); + } else { + this.$set(this.runtimeLogFilters, 'keyword', keyword); + } + }, + // 运行日志：基于任务名称的任务筛选开关（与任务下拉保持一致） + toggleRuntimeLogTaskFilter(taskName) { + const current = (this.runtimeLogFilters.task || '').trim(); + if (current === taskName) { + this.$set(this.runtimeLogFilters, 'task', ''); + } else { + this.$set(this.runtimeLogFilters, 'task', taskName); + } + }, parseTaskBlocks(logs) { // 解析日志中的任务块，返回任务块数组 // 每个任务块包含：startIndex, endIndex, taskName, taskNumber From 8f0b079059079995b91960201c535b34e787fd3d Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Tue, 2 Dec 2025 21:00:56 +0800 Subject: [PATCH 09/34] =?UTF-8?q?=E6=8A=8A=E8=BF=90=E8=A1=8C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=98=BE=E7=A4=BA=E8=8C=83=E5=9B=B4=E7=9A=84=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=E6=94=B9=E4=B8=BA=201=20=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/templates/index.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/templates/index.html b/app/templates/index.html index 41f8d05..8fbe371 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -896,7 +896,7 @@
    -
    +
    文件列表缓存时长
    @@ -937,11 +937,11 @@
    -
    +
    运行日志显示范围
    - +
    天
    @@ -3095,8 +3095,8 @@ calendar_refresh_interval_seconds: 21600, // 已播出集数刷新时间，24小时制，格式：HH:MM，默认00:00 aired_refresh_time: "00:00", - // 运行日志显示范围（天），默认3天 - runtime_log_display_days: 3 + // 运行日志显示范围（天），默认1天 + runtime_log_display_days: 1 }, plugin_config_mode: { aria2: "independent", @@ -7649,7 +7649,7 @@ } // 确保性能设置存在并补默认值（单位：秒） if (!config_data.performance) { - config_data.performance = { calendar_refresh_interval_seconds: 21600, aired_refresh_time: "00:00", runtime_log_display_days: 3 }; + config_data.performance = { calendar_refresh_interval_seconds: 21600, aired_refresh_time: "00:00", runtime_log_display_days: 1 }; } else { if (config_data.performance.calendar_refresh_interval_seconds === undefined || config_data.performance.calendar_refresh_interval_seconds === null) { config_data.performance.calendar_refresh_interval_seconds = 21600; @@ -7658,7 +7658,7 @@ config_data.performance.aired_refresh_time = "00:00"; } if (config_data.performance.runtime_log_display_days === undefined || config_data.performance.runtime_log_display_days === null) { - config_data.performance.runtime_log_display_days = 3; + config_data.performance.runtime_log_display_days = 1; } } // 确保execution_mode有默认值 @@ -8597,10 +8597,10 @@ wasNearBottom = distanceFromBottom < 50; } - // 获取运行日志显示范围配置（天数），默认3天 + // 获取运行日志显示范围配置（天数），默认1天 const displayDays = this.formData.performance && this.formData.performance.runtime_log_display_days - ? parseFloat(this.formData.performance.runtime_log_display_days) || 3 - : 3; + ? parseFloat(this.formData.performance.runtime_log_display_days) || 1 + : 1; axios.get('/api/runtime_logs', { params: { days: displayDays } }) .then(res => { if (res.data && res.data.success) { From 07abca763e742ee0fe0b1dbb40cdb8bb0e320d6c Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Fri, 12 Dec 2025 18:17:20 +0800 Subject: [PATCH 10/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9F=BA=E4=BA=8E=20Tr?= =?UTF-8?q?akt=20=E7=B2=BE=E7=A1=AE=E6=92=AD=E5=87=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=9A=84=E6=9C=AC=E5=9C=B0=E6=97=B6=E5=8C=BA=E5=B7=B2=E6=92=AD?= =?UTF-8?q?=E5=87=BA=E7=BB=9F=E8=AE=A1=E4=B8=8E=E6=98=BE=E7=A4=BA=E5=8F=8A?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/run.py | 1526 ++++++++++++++++++++++++++++++----- app/sdk/db.py | 132 ++- app/sdk/tmdb_service.py | 14 + app/sdk/trakt_service.py | 189 +++++ app/templates/index.html | 390 ++++++--- app/utils/task_extractor.py | 23 +- 6 files changed, 1941 insertions(+), 333 deletions(-) create mode 100644 app/sdk/trakt_service.py diff --git a/app/run.py b/app/run.py index ab4e4d3..70f7cfd 100644 --- a/app/run.py +++ b/app/run.py @@ -55,45 +55,201 @@ from sdk.douban_service import douban_service # 导入追剧日历相关模块 from utils.task_extractor import TaskExtractor from sdk.tmdb_service import TMDBService +from sdk.trakt_service import TraktService from sdk.db import CalendarDB from sdk.db import RecordDB from utils.task_extractor import TaskExtractor -def get_effective_date_for_aired_count(): +def _get_local_timezone() -> str: """ - 根据用户设置的播出集数刷新时间，返回应该用于计算已播出集数的日期。 - 如果在刷新时间之前，返回昨天的日期；如果在刷新时间之后，返回今天的日期。 - 这样可以确保在刷新时间之前，已播出集数不会被提前更新。 + 获取本地时区配置，用于 Trakt 播出时间转换与本地时间判断。 + 默认为 Asia/Shanghai（北京时间），保证向后兼容。 """ - from datetime import datetime as _dt, timedelta - now = _dt.now() - today = now.strftime('%Y-%m-%d') - - # 获取用户配置的刷新时间，默认 00:00 - perf = config_data.get('performance', {}) if isinstance(config_data, dict) else {} - refresh_time_str = perf.get('aired_refresh_time', '00:00') - try: - refresh_parts = refresh_time_str.split(':') - if len(refresh_parts) == 2: - refresh_hour = int(refresh_parts[0]) - refresh_minute = int(refresh_parts[1]) - current_hour = now.hour - current_minute = now.minute - - # 当前时间 >= 刷新时间，使用今天的日期 - if current_hour > refresh_hour or (current_hour == refresh_hour and current_minute >= refresh_minute): - return today - else: - # 当前时间 < 刷新时间，使用昨天的日期 - yesterday = (now - timedelta(days=1)).strftime('%Y-%m-%d') - return yesterday - else: - # 解析失败时默认使用今天的日期（向后兼容） - return today + if isinstance(config_data, dict): + tz = config_data.get("local_timezone") or "Asia/Shanghai" + return str(tz) or "Asia/Shanghai" except Exception: - # 解析失败时默认使用今天的日期（向后兼容） - return today + pass + return "Asia/Shanghai" + + +def is_episode_aired(tmdb_id: int, season_number: int, episode_number: int, now_local_dt) -> bool: + """ + 通用“单集是否已播出”判定： + 优先使用 Trakt 写入的本地播出时间，其次使用本地日期 + 节目级/全局播出时间， + 最后退回原有的“TMDB 日期 + 播出集数刷新时间”口径。 + """ + try: + tmdb_id = int(tmdb_id) + season_number = int(season_number) + episode_number = int(episode_number) + except Exception: + return False + + try: + cal_db = CalendarDB() + cur = cal_db.conn.cursor() + cur.execute( + """ + SELECT air_datetime_utc, air_datetime_local, air_date_local, air_date + FROM episodes + WHERE tmdb_id=? AND season_number=? AND episode_number=? + """, + (tmdb_id, season_number, episode_number), + ) + row = cur.fetchone() + if not row: + return False + air_datetime_utc, air_datetime_local, air_date_local, air_date = row + except Exception: + return False + + # 1) 优先使用本地时区精确时间（来自 Trakt first_aired 转换） + try: + if air_datetime_local: + dt_local = datetime.fromisoformat(str(air_datetime_local)) + try: + return dt_local.timestamp() <= now_local_dt.timestamp() + except Exception: + # 若 now_local_dt 非 datetime，退化为直接比较字符串（保底，精度较差） + return str(air_datetime_local) <= str(now_local_dt) + except Exception: + pass + + # 获取节目级播出时间配置： + # - local_air_time: 本地播出时间（HH:MM） + # - air_time_source: 源时区播出时间（HH:MM） + # - air_timezone: 源时区名称（例如 America/New_York） + schedule = {} + try: + schedule = CalendarDB().get_show_air_schedule(tmdb_id) or {} + except Exception: + schedule = {} + local_air_time = (schedule.get("local_air_time") or "").strip() or None + air_time_source = (schedule.get("air_time_source") or "").strip() or None + air_timezone = (schedule.get("air_timezone") or "").strip() or None + + # 全局播出集数刷新时间作为兜底 + perf = config_data.get("performance", {}) if isinstance(config_data, dict) else {} + refresh_time_str = perf.get("aired_refresh_time", "00:00") + time_fallback = local_air_time or refresh_time_str or "00:00" + + # 2) 若有 Trakt 节目级源时区播出时间：使用“源时区日期 + 源时区时间”做完整时区转换 + # 这一步会自然包含日期的前后偏移（例如美东周日 21:00 -> 北京时间周一 10:00） + try: + if air_date and air_time_source and air_timezone: + try: + from zoneinfo import ZoneInfo as _ZoneInfo + except Exception: + _ZoneInfo = None # type: ignore + if _ZoneInfo is not None: + # air_date 视为源时区日期，air_time_source 视为源时区时间 + try: + src_date = datetime.strptime(str(air_date), "%Y-%m-%d").date() + except Exception: + src_date = None + if src_date is not None: + try: + hh_s, mm_s = [int(x) for x in str(air_time_source).split(":")] + except Exception: + hh_s, mm_s = 0, 0 + try: + from datetime import time as _dtime + src_time = _dtime(hour=hh_s, minute=mm_s) + src_dt_naive = datetime.combine(src_date, src_time) + src_dt = src_dt_naive.replace(tzinfo=_ZoneInfo(air_timezone)) + local_tz = _get_local_timezone() + local_dt = src_dt.astimezone(_ZoneInfo(local_tz)) + return local_dt.timestamp() <= now_local_dt.timestamp() + except Exception as _e: + # 源时区无效或转换失败，继续走后续兜底逻辑 + logging.debug(f"时区转换失败 tmdb_id={tmdb_id}, season={season_number}, ep={episode_number}: {_e}") + import traceback + logging.debug(f"时区转换异常堆栈: {traceback.format_exc()}") + pass + except Exception: + pass + + # 3) 退回到“本地日期 + 节目级/全局播出时间”（若已有本地日期字段，则继续利用） + try: + if air_date_local: + hh, mm = 0, 0 + try: + parts = str(time_fallback).split(":") + if len(parts) == 2: + hh = int(parts[0]) + mm = int(parts[1]) + except Exception: + hh, mm = 0, 0 + dt_str = f"{air_date_local} {hh:02d}:{mm:02d}:00" + try: + dt_ep_local = datetime.strptime(dt_str, "%Y-%m-%d %H:%M:%S") + if getattr(now_local_dt, "tzinfo", None) is not None: + dt_ep_local = dt_ep_local.replace(tzinfo=now_local_dt.tzinfo) + return dt_ep_local.timestamp() <= now_local_dt.timestamp() + except Exception as _e: + logging.debug(f"is_episode_aired 本地日期+播出时间判定异常: tmdb_id={tmdb_id}, season={season_number}, ep={episode_number}, error={_e}") + import traceback + logging.debug(f"本地日期+播出时间判定异常堆栈: {traceback.format_exc()}") + pass + except Exception: + pass + + # 3.1) 若只有 air_date 但存在节目级/全局播出时间，也按时间维度判定 + try: + if air_date and time_fallback: + hh, mm = 0, 0 + try: + parts = str(time_fallback).split(":") + if len(parts) == 2: + hh = int(parts[0]) + mm = int(parts[1]) + except Exception: + hh, mm = 0, 0 + dt_str = f"{air_date} {hh:02d}:{mm:02d}:00" + try: + dt_ep_local = datetime.strptime(dt_str, "%Y-%m-%d %H:%M:%S") + if getattr(now_local_dt, "tzinfo", None) is not None: + dt_ep_local = dt_ep_local.replace(tzinfo=now_local_dt.tzinfo) + return dt_ep_local.timestamp() <= now_local_dt.timestamp() + except Exception: + pass + except Exception: + pass + + # 4) 最后一层兜底：优先使用 air_date_local（如果存在），否则使用 TMDB 原始日期 + # 注意：现在集的播出日期已经是本地日期，需要结合播出时间来判断是否已播出 + # time_fallback 已经包含了节目级播出时间或全局播出集数刷新时间，应该总是使用它来判断 + try: + # 优先使用 air_date_local（已考虑时区转换的本地日期） + date_to_compare = air_date_local if air_date_local else air_date + if not date_to_compare: + return False + + # 总是使用 time_fallback（节目级播出时间或全局播出集数刷新时间）来判断 + # time_fallback 已经在前面定义为：local_air_time or refresh_time_str or "00:00" + hh, mm = 0, 0 + try: + parts = str(time_fallback).split(":") + if len(parts) == 2: + hh = int(parts[0]) + mm = int(parts[1]) + except Exception: + hh, mm = 0, 0 + dt_str = f"{date_to_compare} {hh:02d}:{mm:02d}:00" + try: + dt_ep_local = datetime.strptime(dt_str, "%Y-%m-%d %H:%M:%S") + if getattr(now_local_dt, "tzinfo", None) is not None: + dt_ep_local = dt_ep_local.replace(tzinfo=now_local_dt.tzinfo) + return dt_ep_local.timestamp() <= now_local_dt.timestamp() + except Exception: + # 如果时间构建失败，退化为只比较日期（保底逻辑） + from datetime import datetime as _dt + today = _dt.now().strftime('%Y-%m-%d') + return str(date_to_compare) <= today + except Exception: + return False def enrich_tasks_with_calendar_meta(tasks_info: list) -> list: """为任务列表注入日历相关元数据：节目状态、最新季处理后名称、已转存/已播出/本季总集数。 @@ -186,40 +342,23 @@ def enrich_tasks_with_calendar_meta(tasks_info: list) -> list: except Exception: transferred_by_task = {} - # 统计"已播出集数"：读取本地 episodes 表中有 air_date 且 <= 有效日期的集数 - # 有效日期根据播出集数刷新时间确定：刷新时间之前使用昨天的日期，之后使用今天的日期 + # 统计"已播出集数"：读取本地 episodes 表中有 air_date 且 <= 今天的集数 + # 注意：现在集的播出日期已经是本地日期，不需要通过播出集数刷新时间限制，直接使用今天的日期比较即可 from datetime import datetime as _dt now = _dt.now() today = now.strftime('%Y-%m-%d') - effective_date = get_effective_date_for_aired_count() # 获取应该用于计算已播出集数的有效日期 - current_time_str = now.strftime('%H:%M') - # 获取用户配置的刷新时间，默认 00:00 - perf = config_data.get('performance', {}) if isinstance(config_data, dict) else {} - refresh_time_str = perf.get('aired_refresh_time', '00:00') - # 判断当前时间是否已经过了用户设置的刷新时间 - allow_refresh = False - try: - refresh_parts = refresh_time_str.split(':') - if len(refresh_parts) == 2: - refresh_hour = int(refresh_parts[0]) - refresh_minute = int(refresh_parts[1]) - current_hour = now.hour - current_minute = now.minute - # 当前时间 >= 刷新时间，允许刷新 - if current_hour > refresh_hour or (current_hour == refresh_hour and current_minute >= refresh_minute): - allow_refresh = True - except Exception: - # 解析失败时默认允许刷新（向后兼容） - allow_refresh = True aired_by_show_season = {} try: + # 优先使用 air_date_local（已考虑时区转换的本地日期），如果为空则使用 air_date + # 直接使用今天的日期进行比较，不再通过播出集数刷新时间限制 cur.execute( """ SELECT tmdb_id, season_number, COUNT(1) FROM episodes - WHERE air_date IS NOT NULL AND air_date != '' AND air_date <= ? + WHERE (air_date_local IS NOT NULL AND air_date_local != '' AND air_date_local <= ?) + OR (air_date_local IS NULL OR air_date_local = '') AND (air_date IS NOT NULL AND air_date != '' AND air_date <= ?) GROUP BY tmdb_id, season_number """, - (effective_date,) + (today, today) ) for tid, sn, cnt in (cur.fetchall() or []): aired_by_show_season[(int(tid), int(sn))] = int(cnt or 0) @@ -568,14 +707,18 @@ def recompute_task_metrics_and_notify(task_name: str) -> bool: aired = metrics.get('aired_count') total = metrics.get('total_count') if aired in (None, 0) or total in (None, 0): - # 动态回退：使用有效日期计算已播出集数 - effective_date = get_effective_date_for_aired_count() + # 动态回退：使用今天的日期计算已播出集数，优先使用 air_date_local（已考虑时区转换） + # 注意：现在集的播出日期已经是本地日期，不需要通过播出集数刷新时间限制，直接使用今天的日期比较即可 + from datetime import datetime as _dt + today = _dt.now().strftime('%Y-%m-%d') cur.execute( """ SELECT COUNT(1) FROM episodes - WHERE tmdb_id=? AND season_number=? AND air_date IS NOT NULL AND air_date != '' AND air_date <= ? + WHERE tmdb_id=? AND season_number=? + AND ((air_date_local IS NOT NULL AND air_date_local != '' AND air_date_local <= ?) + OR (air_date_local IS NULL OR air_date_local = '') AND (air_date IS NOT NULL AND air_date != '' AND air_date <= ?)) """, - (tmdb_id, season_no, effective_date) + (tmdb_id, season_no, today, today) ) aired = int((cur.fetchone() or [0])[0]) cur.execute('SELECT episode_count FROM seasons WHERE tmdb_id=? AND season_number=?', (tmdb_id, season_no)) @@ -995,14 +1138,14 @@ def ensure_today_aired_done_if_due_once(trigger_reason: str = ''): """仅在需要时、且至多每日一次按需补算。无定时轮询，无高频检查。""" global _aired_on_demand_checked_date try: - # 计算当前应生效的有效日期 - current_effective = str(get_effective_date_for_aired_count()) - # 进程内已检查过本有效期，直接跳过 - if _aired_on_demand_checked_date == current_effective: - return - # 仅当已过刷新时间时才允许补算（避免提前） + # 直接使用今天的日期作为标记（现在集的播出日期已经是本地日期，不需要通过播出集数刷新时间限制） from datetime import datetime as _dt now = _dt.now() + today = now.strftime('%Y-%m-%d') + # 进程内已检查过今日，直接跳过 + if _aired_on_demand_checked_date == today: + return + # 仅当已过刷新时间时才允许补算（避免提前） perf = config_data.get('performance', {}) if isinstance(config_data, dict) else {} time_str = perf.get('aired_refresh_time', '00:00') try: @@ -1015,15 +1158,15 @@ def ensure_today_aired_done_if_due_once(trigger_reason: str = ''): return # 已记录的上次完成日期 stamped = _read_aired_effective_stamp() - if stamped != current_effective: + if stamped != today: # 需要补算一次 logging.debug(f"检测到当日尚未生效（触发:{trigger_reason or 'on_demand'}），执行一次补偿刷新…") recompute_all_seasons_aired_daily() # 成功后 recompute 内部会写 stamp；此处将进程内记为已检查，避免多次触发 - _aired_on_demand_checked_date = current_effective + _aired_on_demand_checked_date = today else: # 已完成，标记今日已检查，避免重复 - _aired_on_demand_checked_date = current_effective + _aired_on_demand_checked_date = today except Exception: pass @@ -1043,9 +1186,10 @@ def _is_today_aired_done() -> bool: now = _dt.now() if not _is_after_refresh_time(now): return False - current_effective = str(get_effective_date_for_aired_count()) + # 直接使用今天的日期作为标记（现在集的播出日期已经是本地日期，不需要通过播出集数刷新时间限制） + today = now.strftime('%Y-%m-%d') stamped = _read_aired_effective_stamp() - return stamped == current_effective + return stamped == today except Exception: return False @@ -1073,6 +1217,31 @@ def _schedule_aired_retry_in(minutes_delay: int = 10): except Exception as e: logging.warning(f"安排播出集数补偿重试任务失败: {e}") +def _schedule_show_retry_in(tmdb_id: int, minutes_delay: int = 10): + """为单个节目安排播出进度刷新重试任务""" + try: + from datetime import datetime as _dt, timedelta as _td + job_id = f'show_aired_retry_{tmdb_id}' + # 移除已有的重试任务，避免重复堆积 + try: + scheduler.remove_job(job_id) + except Exception: + pass + run_at = _dt.now() + _td(minutes=max(1, int(minutes_delay))) + scheduler.add_job( + func=lambda _tid=int(tmdb_id): recompute_show_aired_progress(_tid), + trigger=DateTrigger(run_date=run_at), + id=job_id, + replace_existing=True, + coalesce=True, + max_instances=1, + ) + if scheduler.state == 0: + scheduler.start() + logging.debug(f"已安排节目播出进度补偿重试任务 tmdb_id={tmdb_id}，时间 {run_at.strftime('%Y-%m-%d %H:%M')}" ) + except Exception as e: + logging.warning(f"安排节目播出进度补偿重试任务失败 tmdb_id={tmdb_id}: {e}") + # 是否为 Flask 主服务进程（仅该进程输出某些提示） IS_FLASK_SERVER_PROCESS = False @@ -1120,14 +1289,41 @@ try: _urllib3_logger.addFilter(_RetryWarningToDebug()) except Exception: pass -# 过滤werkzeug日志输出 -if not DEBUG: - logging.getLogger("werkzeug").setLevel(logging.ERROR) - # 静音 APScheduler 的普通信息日志，避免 "Adding job tentatively" 等噪音 - try: - logging.getLogger("apscheduler").setLevel(logging.WARNING) - except Exception: - pass +# 添加过滤器，过滤HTTP访问日志（格式：IP - - [时间] "METHOD /path HTTP/1.1" 状态码） +class _HTTPAccessLogFilter(logging.Filter): + """过滤HTTP访问日志，避免输出到日志文件""" + def filter(self, record: logging.LogRecord) -> bool: + try: + msg = str(record.getMessage()) + # 匹配HTTP访问日志格式：IP - - [时间] "METHOD /path HTTP/1.1" 状态码 + if re.match(r'^\d+\.\d+\.\d+\.\d+\s+-\s+-\s+\[.*?\]\s+"(GET|POST|PUT|DELETE|PATCH|HEAD|OPTIONS)\s+.*?\s+HTTP/1\.\d"\s+\d+', msg): + return False # 过滤掉HTTP访问日志 + except Exception: + pass + return True + +# 过滤werkzeug日志输出（包括HTTP访问日志） +# 无论是否DEBUG模式，都禁用werkzeug的访问日志，只保留ERROR级别以上的日志 +_werkzeug_logger = logging.getLogger("werkzeug") +_werkzeug_logger.setLevel(logging.ERROR) +# 将过滤器添加到werkzeug日志记录器，过滤HTTP访问日志 +try: + _werkzeug_logger.addFilter(_HTTPAccessLogFilter()) +except Exception: + pass + +# 将过滤器也添加到根日志记录器，确保所有HTTP访问日志都被过滤 +try: + _root_logger = logging.getLogger() + _root_logger.addFilter(_HTTPAccessLogFilter()) +except Exception: + pass + +# 静音 APScheduler 的普通信息日志，避免 "Adding job tentatively" 等噪音 +try: + logging.getLogger("apscheduler").setLevel(logging.WARNING) +except Exception: + pass # 统一所有已有处理器（包括 werkzeug、apscheduler）的日志格式 _root_logger = logging.getLogger() @@ -1294,11 +1490,17 @@ def get_recent_runtime_logs(limit: int = None, days: float = None) -> list: def recompute_all_seasons_aired_daily(): logging.info(f">>> 开始执行播出集数自动刷新") try: - from datetime import datetime as _dt from time import time as _now now_ts = int(_now()) - # 获取应该用于计算已播出集数的有效日期（根据播出集数刷新时间确定） - effective_date = get_effective_date_for_aired_count() + + # 当前本地时间（用于精确“是否已播出”判断） + try: + from zoneinfo import ZoneInfo as _ZoneInfo + local_tz = _get_local_timezone() + now_local_dt = datetime.now(_ZoneInfo(local_tz)) + except Exception: + now_local_dt = datetime.now() + cal_db = CalendarDB() cur = cal_db.conn.cursor() # 遍历本地所有季 @@ -1309,15 +1511,23 @@ def recompute_all_seasons_aired_daily(): tmdb_id_i = int(tmdb_id) season_no_i = int(season_no) total_i = int(total or 0) - # 使用有效日期计算已播出集数 + + # 逐集判断是否已播出（优先使用 Trakt 本地时间，其次节目级本地时间，最后 TMDB 日期） + aired_i = 0 cur.execute( """ - SELECT COUNT(1) FROM episodes - WHERE tmdb_id=? AND season_number=? AND air_date IS NOT NULL AND air_date != '' AND air_date <= ? + SELECT episode_number FROM episodes + WHERE tmdb_id=? AND season_number=? """, - (tmdb_id_i, season_no_i, effective_date) + (tmdb_id_i, season_no_i), ) - aired_i = int((cur.fetchone() or [0])[0]) + for (ep_no,) in cur.fetchall() or []: + try: + if is_episode_aired(tmdb_id_i, season_no_i, int(ep_no), now_local_dt): + aired_i += 1 + except Exception: + continue + # 取已转存集数用于计算进度 metrics = cal_db.get_season_metrics(tmdb_id_i, season_no_i) or {} transferred_i = int(metrics.get('transferred_count') or 0) @@ -1329,7 +1539,10 @@ def recompute_all_seasons_aired_daily(): continue # 成功后写入当日完成标记（使用 stamp 文件，避免引入 DB 结构变更） try: - _write_aired_effective_stamp(str(effective_date)) + # 直接使用今天的日期作为标记（现在集的播出日期已经是本地日期，不需要通过播出集数刷新时间限制） + from datetime import datetime as _dt + today = _dt.now().strftime('%Y-%m-%d') + _write_aired_effective_stamp(today) except Exception: pass try: @@ -1357,6 +1570,284 @@ def recompute_all_seasons_aired_daily(): pass +def recompute_show_aired_progress(tmdb_id: int, now_local_dt=None): + """按节目维度重算播出/进度，供按播出时间触发与补偿使用""" + try: + from time import time as _now + now_ts = int(_now()) + try: + from zoneinfo import ZoneInfo as _ZoneInfo + local_tz = _ZoneInfo(_get_local_timezone()) + if now_local_dt is None: + now_local_dt = datetime.now(local_tz) + except Exception: + if now_local_dt is None: + now_local_dt = datetime.now() + + cal_db = CalendarDB() + cur = cal_db.conn.cursor() + cur.execute( + "SELECT season_number, episode_count FROM seasons WHERE tmdb_id=?", + (int(tmdb_id),), + ) + rows = cur.fetchall() or [] + for season_no, total in rows: + try: + season_no_i = int(season_no) + total_i = int(total or 0) + aired_i = 0 + cur.execute( + """ + SELECT episode_number FROM episodes + WHERE tmdb_id=? AND season_number=? + """, + (int(tmdb_id), season_no_i), + ) + for (ep_no,) in cur.fetchall() or []: + try: + if is_episode_aired(int(tmdb_id), season_no_i, int(ep_no), now_local_dt): + aired_i += 1 + except Exception: + continue + metrics = cal_db.get_season_metrics(int(tmdb_id), season_no_i) or {} + transferred_i = int(metrics.get('transferred_count') or 0) + denom = min(int(aired_i or 0), int(total_i or 0)) + progress_pct = (100 * min(transferred_i, denom) // denom) if denom > 0 else 0 + cal_db.upsert_season_metrics(int(tmdb_id), season_no_i, None, aired_i, total_i, progress_pct, now_ts) + except Exception: + continue + try: + notify_calendar_changed('aired_on_demand') + except Exception: + pass + # 成功后清理该节目的重试任务 + try: + job_id = f'show_aired_retry_{int(tmdb_id)}' + scheduler.remove_job(job_id) + except Exception: + pass + except Exception as e: + logging.warning(f">>> 节目播出进度刷新执行异常 tmdb_id={tmdb_id}: {e}") + # 发生异常也安排一次补偿重试 + try: + _schedule_show_retry_in(int(tmdb_id), minutes_delay=10) + except Exception: + pass + + +def _build_episode_local_air_dt(tmdb_id, air_datetime_local, air_date_local, air_date): + """ + 根据本地播出时间字段和兜底配置生成本地播出 datetime + 返回 (datetime_or_none, used_time_str_or_none)，用于上层判断是否与全局刷新时间重叠 + """ + try: + from zoneinfo import ZoneInfo as _ZoneInfo + local_tz = _ZoneInfo(_get_local_timezone()) + except Exception: + local_tz = None + + try: + if air_datetime_local: + dt = datetime.fromisoformat(str(air_datetime_local)) + if dt.tzinfo is None and local_tz: + dt = dt.replace(tzinfo=local_tz) + return dt, None + except Exception: + pass + + date_str = (air_date_local or air_date or '').strip() + if not date_str: + return None, None + try: + date_obj = datetime.strptime(date_str, "%Y-%m-%d").date() + except Exception: + return None, None + + schedule = {} + try: + schedule = CalendarDB().get_show_air_schedule(int(tmdb_id)) or {} + except Exception: + schedule = {} + perf = config_data.get('performance', {}) if isinstance(config_data, dict) else {} + fallback_time = (schedule.get("local_air_time") or perf.get("aired_refresh_time") or "00:00").strip() + try: + hh, mm = [int(x) for x in str(fallback_time).split(":")] + except Exception: + hh, mm = 0, 0 + try: + dt = datetime.combine(date_obj, datetime.min.time()).replace(hour=hh, minute=mm, second=0) + if local_tz: + dt = dt.replace(tzinfo=local_tz) + return dt, fallback_time + except Exception: + return None, fallback_time + + +def schedule_airtime_based_refresh_jobs(days_back: int = 2, days_forward: int = 14, tmdb_id: int = None): + """ + 为每个节目按本地播出时间调度单节目刷新，含错过补偿： + - 未来的播出时间：注册 DateTrigger，确保到点立即重算 + - 已经过期但当天未刷新：立即重算一次补偿 + """ + try: + try: + from zoneinfo import ZoneInfo as _ZoneInfo + local_tz = _ZoneInfo(_get_local_timezone()) + now_local = datetime.now(local_tz) + except Exception: + local_tz = None + now_local = datetime.now() + + cal_db = CalendarDB() + cur = cal_db.conn.cursor() + base_sql = """ + SELECT tmdb_id, season_number, episode_number, air_datetime_local, air_date_local, air_date + FROM episodes + WHERE ((air_datetime_local IS NOT NULL AND air_datetime_local != '') + OR (air_date_local IS NOT NULL AND air_date_local != '') + OR (air_date IS NOT NULL AND air_date != '')) + """ + params = [] + if tmdb_id is not None: + base_sql += " AND tmdb_id = ?" + params.append(int(tmdb_id)) + cur.execute(base_sql, params) + rows = cur.fetchall() or [] + if not rows: + return + + # 全局播出集数刷新时间，用于与节目级时间对比，避免重复调度 + perf = config_data.get('performance', {}) if isinstance(config_data, dict) else {} + global_refresh_time = (perf.get('aired_refresh_time') or "00:00").strip() + + # 清理旧的播出时间调度，避免单一 job 覆盖多集 + try: + _removed = 0 + prefix = f"aired_refresh_{int(tmdb_id)}_" if tmdb_id is not None else "aired_refresh_" + for _job in scheduler.get_jobs(): + try: + if str(getattr(_job, "id", "")).startswith(prefix): + scheduler.remove_job(_job.id) + _removed += 1 + except Exception: + continue + if _removed > 0: + if tmdb_id is None: + logging.debug(f"已清理 {_removed} 个旧节目播出集数刷新任务") + else: + logging.debug(f"已清理 {_removed} 个旧节目播出集数刷新任务 (tmdb_id={int(tmdb_id)})") + except Exception: + pass + + min_date = (now_local.date() - timedelta(days=max(0, days_back))).isoformat() + max_date = (now_local.date() + timedelta(days=max(0, days_forward))).isoformat() + # 用于记录需要补偿刷新的节目，key 为 tmdb_id，value 为最早需要补偿的播出时间 + shows_need_catch = {} + scheduled = 0 + + # 预加载所有季的刷新时间戳，用于检查是否已经刷新过 + season_refresh_times = {} + try: + cur.execute('SELECT tmdb_id, season_number, updated_at FROM season_metrics') + for tid, sn, ua in (cur.fetchall() or []): + key = (int(tid), int(sn)) + if ua: + season_refresh_times[key] = int(ua) + except Exception: + pass + + for tmdb_id, season_number, episode_number, air_dt_local, air_date_local, air_date in rows: + target_dt, used_time = _build_episode_local_air_dt(tmdb_id, air_dt_local, air_date_local, air_date) + if not target_dt: + continue + # 若使用的播出时间与全局刷新时间相同，则交由全局任务处理，避免重复调度 + try: + if used_time and str(used_time).strip() == global_refresh_time: + continue + except Exception: + pass + try: + d_str = target_dt.date().isoformat() + if d_str < min_date or d_str > max_date: + continue + except Exception: + pass + + job_id = f"aired_refresh_{tmdb_id}_{season_number}_{episode_number}_{target_dt.strftime('%Y%m%d%H%M')}" + + # 对于已过期的播出时间，检查是否需要补偿刷新 + if target_dt <= now_local: + tmdb_id_i = int(tmdb_id) + season_no_i = int(season_number) + + # 检查该季是否已经刷新过（通过 season_metrics 的 updated_at） + need_refresh = True + try: + refresh_ts = season_refresh_times.get((tmdb_id_i, season_no_i)) + if refresh_ts: + # 将播出时间转换为时间戳进行比较 + target_ts = int(target_dt.timestamp()) + # 如果刷新时间晚于播出时间，说明已经刷新过，不需要补偿 + if refresh_ts >= target_ts: + need_refresh = False + except Exception: + # 检查失败，保守处理：执行补偿刷新 + pass + + if need_refresh: + # 记录需要补偿的节目，并记录最早需要补偿的播出时间（用于日志） + if tmdb_id_i not in shows_need_catch: + shows_need_catch[tmdb_id_i] = target_dt + elif target_dt < shows_need_catch[tmdb_id_i]: + shows_need_catch[tmdb_id_i] = target_dt + continue + + # 未来的播出时间：注册 DateTrigger + try: + scheduler.add_job( + func=lambda _tmdb_id=int(tmdb_id): recompute_show_aired_progress(_tmdb_id), + trigger=DateTrigger(run_date=target_dt), + id=job_id, + replace_existing=True, + coalesce=True, + max_instances=1, + misfire_grace_time=None, + ) + scheduled += 1 + except Exception as _e: + logging.debug(f"安排节目播出集数刷新失败 tmdb_id={tmdb_id}: {_e}") + continue + + # 执行补偿刷新：对于需要补偿的节目，立即刷新 + if shows_need_catch: + for tid, earliest_dt in shows_need_catch.items(): + try: + logging.debug(f"补偿刷新节目 tmdb_id={tid}，最早错过播出时间: {earliest_dt.strftime('%Y-%m-%d %H:%M')}") + recompute_show_aired_progress(int(tid), now_local_dt=now_local) + except Exception as _e: + logging.debug(f"补偿刷新失败 tmdb_id={tid}: {_e}") + + if scheduler.state == 0: + scheduler.start() + if scheduled > 0: + logging.debug(f"已更新 {scheduled} 个节目播出集数刷新任务") + except Exception as e: + logging.warning(f"按播出时间调度刷新失败: {e}") + + +def _trigger_airtime_reschedule(reason: str = "", tmdb_id: int = None): + """统一包装，便于在数据更新后重新计算播出时间调度""" + try: + schedule_airtime_based_refresh_jobs(tmdb_id=tmdb_id) + if reason: + if tmdb_id is None: + logging.debug(f"已重新安排节目播出集数刷新任务，原因: {reason}") + else: + logging.debug(f"已重新安排节目播出集数刷新任务，原因: {reason}, tmdb_id={int(tmdb_id)}") + except Exception as e: + logging.debug(f"重新安排节目播出集数刷新任务失败({reason}): {e}") + + def restart_daily_aired_update_job(): try: global _daily_aired_last_time_str @@ -1413,6 +1904,8 @@ try: restart_daily_aired_update_job() # 启动时做一次极简按需补偿检查（仅一次） ensure_today_aired_done_if_due_once('startup') + # 启动时同步一次播出时间触发调度，确保新一集能按播出时间刷新 + _trigger_airtime_reschedule('startup') # 取消低频健康检查方案，改为失败后按需重试调度 except Exception: pass @@ -1615,6 +2108,20 @@ def get_data(): if 'poster_language' not in data: data['poster_language'] = 'zh-CN' + # 初始化追剧日历时区模式（原始时区 / 本地时区） + if 'calendar_timezone_mode' not in data: + data['calendar_timezone_mode'] = 'original' + # 初始化本地时区（用于 Trakt 播出时间转换与本地时间判断） + if 'local_timezone' not in data: + # 默认按照北京时间处理，也支持用户后续在配置文件中手动修改 + data['local_timezone'] = 'Asia/Shanghai' + + # 初始化 Trakt 配置 + if 'trakt' not in data or not isinstance(data.get('trakt'), dict): + data['trakt'] = {'client_id': ''} + else: + data['trakt'].setdefault('client_id', '') + # 处理插件配置中的多账号支持字段，将数组格式转换为逗号分隔的字符串用于显示 if "plugins" in data: # 处理Plex的quark_root_path @@ -1810,6 +2317,13 @@ def update(): elif key == "tmdb_api_key": # 更新TMDB API密钥 config_data[key] = value + elif key == "trakt": + # 更新 Trakt 配置，仅接收 client_id 字段，其它字段忽略 + if not isinstance(value, dict): + value = {} + trakt_cfg = config_data.get("trakt") if isinstance(config_data.get("trakt"), dict) else {} + trakt_cfg["client_id"] = (value.get("client_id") or "").strip() + config_data["trakt"] = trakt_cfg else: config_data.update({key: value}) @@ -2174,6 +2688,7 @@ def sync_content_type_between_config_and_database() -> bool: tasks = config_data.get('tasklist', []) changed = False + local_air_time_changed = False synced_count = 0 for task in tasks: @@ -2237,8 +2752,6 @@ def sync_content_type_between_config_and_database() -> bool: logging.debug(f"建立绑定关系并同步内容类型 - 任务: '{task_name}', 类型: '{config_content_type}', tmdb_id: {tmdb_id}") else: logging.debug(f"任务配置中的 TMDB ID 在数据库中不存在 - 任务: '{task_name}', tmdb_id: {tmdb_id}") - else: - logging.debug(f"任务无 TMDB 匹配信息，无法建立绑定关系 - 任务: '{task_name}'") if changed: logging.debug(f"内容类型同步完成，共同步了 {synced_count} 个任务") @@ -2409,9 +2922,9 @@ def ensure_calendar_info_for_tasks() -> bool: logging.debug(f"TMDB季数数据: {seasons}") # 选择已播出的季中最新的一季 - # 使用有效日期判断季是否已播出（考虑播出集数刷新时间） - effective_date_str = get_effective_date_for_aired_count() - effective_date = datetime.strptime(effective_date_str, '%Y-%m-%d').date() + # 使用今天的日期判断季是否已播出（现在集的播出日期已经是本地日期，不需要通过播出集数刷新时间限制） + from datetime import datetime as _dt + today_date = _dt.now().date() latest_season_number = 0 latest_air_date = None @@ -2420,11 +2933,11 @@ def ensure_calendar_info_for_tasks() -> bool: air_date = s.get('air_date') logging.debug(f"季数: {sn}, 播出日期: {air_date}, 类型: {type(sn)}") - # 只考虑已播出的季（有air_date且早于或等于有效日期） + # 只考虑已播出的季（有air_date且早于或等于今天的日期） if sn and sn > 0 and air_date: # 排除第0季（特殊季） try: season_air_date = datetime.strptime(air_date, '%Y-%m-%d').date() - if season_air_date <= effective_date: + if season_air_date <= today_date: # 选择播出日期最新的季 if latest_air_date is None or season_air_date > latest_air_date: latest_season_number = sn @@ -3735,6 +4248,20 @@ def init(): if "execution_mode" not in config_data: config_data["execution_mode"] = "manual" + # 初始化追剧日历时区模式（原始时区 / 本地时区） + if "calendar_timezone_mode" not in config_data: + config_data["calendar_timezone_mode"] = "original" + # 初始化本地时区（用于 Trakt 播出时间转换与本地时间判断） + if "local_timezone" not in config_data: + # 默认按照北京时间处理，也支持用户后续在配置文件中手动修改 + config_data["local_timezone"] = "Asia/Shanghai" + + # 初始化 Trakt 配置（仅存储 Client ID，用于调用节目播出时间 API） + if "trakt" not in config_data or not isinstance(config_data.get("trakt"), dict): + config_data["trakt"] = {"client_id": ""} + else: + config_data["trakt"].setdefault("client_id", "") + # 初始化插件配置 _, plugins_config_default, task_plugins_config_default = Config.load_plugins() plugins_config_default.update(config_data.get("plugins", {})) @@ -4884,10 +5411,6 @@ def sync_content_type_api(): def get_calendar_tasks(): """获取追剧日历任务信息""" try: - logging.debug("进入get_calendar_tasks函数") - logging.debug(f"config_data类型: {type(config_data)}") - logging.debug(f"config_data内容: {config_data}") - # 获取任务列表 tasks = config_data.get('tasklist', []) @@ -4948,26 +5471,12 @@ def get_calendar_tasks(): db.close() - # 提取任务信息 - logging.debug("开始提取任务信息") - logging.debug(f"tasks数量: {len(tasks)}") - logging.debug(f"task_latest_files数量: {len(task_latest_files)}") - try: extractor = TaskExtractor() - logging.debug("TaskExtractor创建成功") tasks_info = extractor.extract_all_tasks_info(tasks, task_latest_files) - logging.debug("extract_all_tasks_info调用成功") except Exception as e: - logging.debug(f"TaskExtractor相关操作失败: {e}") - import traceback - traceback.print_exc() raise - logging.debug(f"提取的任务信息数量: {len(tasks_info)}") - if tasks_info: - logging.debug(f"第一个任务信息: {tasks_info[0]}") - # 首先同步数据库绑定关系到任务配置 sync_task_config_with_database_bindings() @@ -4984,13 +5493,57 @@ def get_calendar_tasks(): cursor.execute('SELECT tmdb_id, name, year, poster_local_path, bound_task_names FROM shows') all_shows = cursor.fetchall() shows_by_name = {s[1]: {'tmdb_id': s[0], 'name': s[1], 'year': s[2], 'poster_local_path': s[3], 'bound_task_names': s[4]} for s in all_shows} - + + # 计算有效“最新季”：若第一集未定档或在未来，则回退到已播季 + def determine_effective_latest_season(tmdb_id, fallback_latest): + try: + cur = cal_db.conn.cursor() + cur.execute(""" + SELECT season_number, + MIN( + COALESCE( + NULLIF(air_date_local, ''), + NULLIF(air_date, '') + ) + ) as first_air + FROM episodes + WHERE tmdb_id=? + GROUP BY season_number + ORDER BY season_number DESC + """, (int(tmdb_id),)) + rows = cur.fetchall() or [] + from datetime import datetime as _dt + today = _dt.utcnow().strftime('%Y-%m-%d') + for sn, first_air in rows: + try: + if not sn: + continue + fa = (first_air or '').strip() + if not fa: + # 无首播日期视为未定档季，跳过 + continue + if fa > today: + # 首集在未来，视为未开播季，跳过 + continue + return int(sn) + except Exception: + continue + except Exception: + pass + try: + if fallback_latest and int(fallback_latest) > 0: + return int(fallback_latest) + except Exception: + pass + return None + for idx, t in enumerate(tasks_info): # 1) 优先通过 calendar_info.match.tmdb_id 查找 raw = tasks[idx] if idx < len(tasks) else None cal = (raw or {}).get('calendar_info') or {} match = cal.get('match') or {} - tmdb_id = match.get('tmdb_id') + tmdb_id = match.get('tmdb_id') or (cal.get('tmdb_id') if isinstance(cal, dict) else None) + legacy_match = raw.get('match') if isinstance(raw.get('match'), dict) else {} task_name = t.get('task_name', '').strip() matched_show = None @@ -5001,12 +5554,8 @@ def get_calendar_tasks(): show = cal_db.get_show(int(tmdb_id)) or {} if show: matched_show = show - logging.debug(f"通过任务 TMDB 匹配结果找到节目 - 任务: '{task_name}', tmdb_id: {tmdb_id}, 节目: '{show.get('name', '')}'") except Exception as e: - logging.debug(f"通过任务 TMDB 匹配结果查找失败 - 任务: '{task_name}', tmdb_id: {tmdb_id}, 错误: {e}") pass - else: - logging.debug(f"任务配置中无 TMDB 匹配结果，尝试通过已绑定关系查找 - 任务: '{task_name}'") # 2) 如果找到匹配的节目，检查是否需要建立绑定关系 if matched_show: @@ -5015,24 +5564,33 @@ def get_calendar_tasks(): # 清理空格，确保比较准确 bound_tasks_clean = [task.strip() for task in bound_tasks if task.strip()] needs_binding = task_name not in bound_tasks_clean - - logging.debug(f"检查绑定状态 - 任务: '{task_name}', 已绑定任务: {bound_tasks_clean}, 需要绑定: {needs_binding}") - + if needs_binding: # 建立任务与节目的绑定关系，同时设置内容类型 task_content_type = t.get('content_type', '') cal_db.bind_task_and_content_type(matched_show['tmdb_id'], task_name, task_content_type) - logging.debug(f"成功绑定任务到节目 - 任务: '{task_name}', 节目: '{matched_show['name']}', tmdb_id: {matched_show['tmdb_id']}") - else: - logging.debug(f"任务已绑定到节目，跳过重复绑定 - 任务: '{task_name}', 节目: '{matched_show['name']}', tmdb_id: {matched_show['tmdb_id']}") t['match_tmdb_id'] = matched_show['tmdb_id'] t['matched_show_name'] = matched_show['name'] t['matched_year'] = matched_show['year'] t['matched_poster_local_path'] = matched_show['poster_local_path'] - # 提供最新季数用于前端展示 + # 提供最新季数用于前端展示：优先保留用户设定的匹配季，其次依据有效最新季规则 try: - t['matched_latest_season_number'] = matched_show.get('latest_season_number') + manual_season = ( + match.get('latest_season_number') + or cal.get('latest_season_number') + or legacy_match.get('latest_season_number') + or t.get('matched_latest_season_number') + ) + if manual_season: + t['matched_latest_season_number'] = int(manual_season) + else: + effective_latest = determine_effective_latest_season( + matched_show['tmdb_id'], + matched_show.get('latest_season_number') + ) + if effective_latest: + t['matched_latest_season_number'] = effective_latest except Exception: pass # 从数据库获取实际的内容类型（如果已设置） @@ -5044,6 +5602,14 @@ def get_calendar_tasks(): if not (config_ct and str(config_ct).strip()): if t.get('matched_content_type'): t['content_type'] = t['matched_content_type'] + # 从数据库获取 local_air_time 并添加到 calendar_info 中供前端读取 + try: + local_air_time = matched_show.get('local_air_time') or '' + if not t.get('calendar_info'): + t['calendar_info'] = {} + t['calendar_info']['local_air_time'] = local_air_time + except Exception: + pass else: # 如果任务配置中没有 TMDB 匹配结果，检查是否已通过其他方式绑定到节目 # 通过任务名称在数据库中搜索已绑定的节目 @@ -5058,8 +5624,27 @@ def get_calendar_tasks(): # 查询完整信息以提供最新季数 try: full_show = cal_db.get_show(int(bound_show[0])) - if full_show and 'latest_season_number' in full_show: - t['matched_latest_season_number'] = full_show['latest_season_number'] + if full_show: + manual_season = ( + match.get('latest_season_number') + or cal.get('latest_season_number') + or legacy_match.get('latest_season_number') + or t.get('matched_latest_season_number') + ) + if manual_season: + t['matched_latest_season_number'] = int(manual_season) + else: + effective_latest = determine_effective_latest_season( + int(bound_show[0]), + full_show.get('latest_season_number') + ) + if effective_latest: + t['matched_latest_season_number'] = effective_latest + # 从完整信息中获取 local_air_time + local_air_time = full_show.get('local_air_time') or '' + if not t.get('calendar_info'): + t['calendar_info'] = {} + t['calendar_info']['local_air_time'] = local_air_time except Exception: pass # 从数据库获取实际的内容类型（如果已设置） @@ -5072,17 +5657,13 @@ def get_calendar_tasks(): if t.get('matched_content_type'): t['content_type'] = t['matched_content_type'] - logging.debug(f"通过已绑定关系找到节目 - 任务: '{task_name}', 节目: '{bound_show[1]}', tmdb_id: {bound_show[0]}") else: t['match_tmdb_id'] = None t['matched_show_name'] = '' t['matched_year'] = '' t['matched_poster_local_path'] = '' t['matched_content_type'] = t.get('content_type', '') - - logging.debug(f"任务未绑定到任何节目 - 任务: '{task_name}'") except Exception as e: - logging.debug(f"搜索已绑定节目失败 - 任务: '{task_name}', 错误: {e}") t['match_tmdb_id'] = None t['matched_show_name'] = '' t['matched_year'] = '' @@ -5092,7 +5673,6 @@ def get_calendar_tasks(): tasks_info = enriched except Exception as _e: # 若补充失败，不影响主流程 - print(f"补充匹配结果失败: {_e}") pass return jsonify({ @@ -5269,30 +5849,98 @@ def process_single_task_async(task, tmdb_service, cal_db): # 如果还没有 TMDB 匹配，进行匹配 if not tmdb_id and extracted.get('show_name'): try: - search = tmdb_service.search_tv_show(extracted.get('show_name'), extracted.get('year') or None) - if search and search.get('id'): - tmdb_id = search['id'] + show_name = extracted.get('show_name', '') + year = extracted.get('year') or None + search_result = None + match_type = None # 'exact' 或 'name_only' + + # 优先级匹配逻辑：先尝试精准匹配（名称+年份），无结果时再按名称匹配 + if year: + # 第一步：尝试精准匹配（名称+年份） + search_results = tmdb_service.search_tv_show_all(show_name, year) + if search_results: + # 从结果中找到年份完全匹配的 + for result in search_results: + result_year = None + first_air_date = result.get('first_air_date', '') + if first_air_date: + try: + result_year = first_air_date[:4] if len(first_air_date) >= 4 else None + except Exception: + pass + + if result_year == year and result.get('id'): + search_result = result + match_type = 'exact' + logging.debug(f"TMDB 匹配成功: 任务名称={task.get('taskname', '')}, 节目名称={show_name}, 年份={year}") + break + + # 第二步：如果精准匹配没有结果，尝试仅名称匹配 + if not search_result: + search_results = tmdb_service.search_tv_show_all(show_name, None) + if search_results: + # 如果有年份信息，选择年份最接近的结果 + if year: + try: + target_year = int(year) + best_match = None + min_year_diff = float('inf') + + for result in search_results: + if not result.get('id'): + continue + result_year = None + first_air_date = result.get('first_air_date', '') + if first_air_date: + try: + result_year = int(first_air_date[:4]) if len(first_air_date) >= 4 else None + except Exception: + pass + + if result_year: + year_diff = abs(result_year - target_year) + if year_diff < min_year_diff: + min_year_diff = year_diff + best_match = result + + if best_match: + search_result = best_match + match_type = 'name_only' + matched_year = best_match.get('first_air_date', '')[:4] if best_match.get('first_air_date') else '未知' + logging.debug(f"TMDB 匹配成功（年份不一致）: 任务名称={task.get('taskname', '')}, 节目名称={show_name}, 期望年份={year}, 匹配年份={matched_year}, 年份差异={min_year_diff}") + except (ValueError, TypeError) as e: + # 年份解析失败，使用第一个结果 + search_result = search_results[0] if search_results else None + match_type = 'name_only' + logging.debug(f"TMDB 匹配成功（年份解析失败）: 任务名称={task.get('taskname', '')}, 节目名称={show_name}, 错误={e}") + else: + # 没有年份信息，直接使用第一个结果 + search_result = search_results[0] if search_results else None + match_type = 'name_only' + logging.debug(f"TMDB 匹配成功（无年份信息）: 任务名称={task.get('taskname', '')}, 节目名称={show_name}") + + # 如果找到了匹配结果，继续处理 + if search_result and search_result.get('id'): + tmdb_id = search_result['id'] details = tmdb_service.get_tv_show_details(tmdb_id) or {} seasons = details.get('seasons', []) - logging.debug(f"process_single_task_async - TMDB季数数据: {seasons}") # 选择已播出的季中最新的一季 - # 使用有效日期判断季是否已播出（考虑播出集数刷新时间） - effective_date_str = get_effective_date_for_aired_count() - effective_date = datetime.strptime(effective_date_str, '%Y-%m-%d').date() + # 使用今天的日期判断季是否已播出（现在集的播出日期已经是本地日期，不需要通过播出集数刷新时间限制） + from datetime import datetime as _dt + today_date = _dt.now().date() latest_season_number = 0 latest_air_date = None for s in seasons: sn = s.get('season_number', 0) air_date = s.get('air_date') - logging.debug(f"process_single_task_async - 季数: {sn}, 播出日期: {air_date}, 类型: {type(sn)}") - # 只考虑已播出的季（有air_date且早于或等于有效日期） + # 只考虑已播出的季（有air_date且早于或等于今天的日期） if sn and sn > 0 and air_date: # 排除第0季（特殊季） try: season_air_date = datetime.strptime(air_date, '%Y-%m-%d').date() - if season_air_date <= effective_date: + if season_air_date <= today_date: # 选择播出日期最新的季 if latest_air_date is None or season_air_date > latest_air_date: latest_season_number = sn @@ -5301,12 +5949,9 @@ def process_single_task_async(task, tmdb_service, cal_db): # 日期格式错误，跳过 continue - logging.debug(f"process_single_task_async - 计算出的最新已播季数: {latest_season_number}") - # 如果没有找到已播出的季，回退到第1季 if latest_season_number == 0: latest_season_number = 1 - logging.debug(f"process_single_task_async - 没有找到已播出的季，回退到第1季: {latest_season_number}") chinese_title = tmdb_service.get_chinese_title_with_fallback(tmdb_id, extracted.get('show_name', '')) @@ -5324,11 +5969,26 @@ def process_single_task_async(task, tmdb_service, cal_db): notify_calendar_changed('edit_metadata') except Exception: pass + else: + # 没有找到任何匹配结果 + year_info = f", 年份={year}" if year else "" + logging.warning(f"TMDB 匹配失败 - 任务名称: {task.get('taskname', '')}, 搜索的节目名称: {show_name}{year_info}, 失败原因: TMDB 搜索无结果，可能节目名称不匹配或 TMDB 中不存在该节目") except Exception as e: - logging.warning(f"TMDB 匹配失败: task={task.get('taskname', '')}, err={e}") + # 捕获异常并输出详细的失败原因 + task_name = task.get('taskname') or task.get('task_name') or '' + show_name = extracted.get('show_name', '') + year = extracted.get('year') or None + year_info = f", 年份={year}" if year else "" + import traceback + error_detail = str(e) + error_type = type(e).__name__ + # 获取异常堆栈信息的前几行，用于诊断 + tb_lines = traceback.format_exc().split('\n') + tb_summary = '; '.join([line.strip() for line in tb_lines[:3] if line.strip()][:2]) + logging.warning(f"TMDB 匹配失败 - 任务名称: {task_name}, 搜索的节目名称: {show_name}{year_info}, 失败原因: 异常类型={error_type}, 错误信息={error_detail}, 堆栈摘要={tb_summary}") - # 如果现在有 TMDB ID，下载海报并更新数据库 + # 如果现在有 TMDB ID，下载海报并更新数据库，并在可能的情况下同步 Trakt 播出时间信息 if tmdb_id: try: # 重新获取更新后的match信息 @@ -5422,6 +6082,53 @@ def process_single_task_async(task, tmdb_service, cal_db): ep_type=(ep.get('episode_type') or ep.get('type')), updated_at=now_ts, ) + + # 使用 Trakt 同步节目级播出时间（如已配置 Client ID） + try: + trakt_cfg = config_data.get("trakt", {}) if isinstance(config_data, dict) else {} + client_id = (trakt_cfg.get("client_id") or "").strip() + if client_id: + local_tz = config_data.get("local_timezone", "Asia/Shanghai") + tsvc = TraktService(client_id=client_id) + if tsvc.is_configured(): + logging.debug(f"开始同步 Trakt 播出时间 tmdb_id={tmdb_id}") + show_info = tsvc.get_show_by_tmdb_id(int(tmdb_id)) + if show_info and show_info.get("trakt_id"): + trakt_id = show_info.get("trakt_id") + logging.debug(f"找到 Trakt 节目 tmdb_id={tmdb_id}, trakt_id={trakt_id}") + # 1) 节目级播出时间 -> 本地时区 HH:MM，写入 shows.local_air_time + airtime = tsvc.get_show_airtime(trakt_id) + if airtime and airtime.get("aired_time") and airtime.get("timezone"): + local_air_time = tsvc.convert_show_airtime_to_local( + airtime.get("aired_time"), airtime.get("timezone"), local_tz + ) or airtime.get("aired_time") + logging.debug(f"获取到播出时间 tmdb_id={tmdb_id}, aired_time={airtime.get('aired_time')}, timezone={airtime.get('timezone')}, local_air_time={local_air_time}") + try: + from sdk.db import CalendarDB as _CalDB + _CalDB().update_show_air_schedule( + int(tmdb_id), + local_air_time=local_air_time or "", + air_time_source=airtime.get("aired_time") or "", + air_timezone=airtime.get("timezone") or "", + ) + logging.debug(f"成功写入播出时间到数据库 tmdb_id={tmdb_id}") + except Exception as _db_err: + logging.warning(f"写入播出时间到数据库失败 tmdb_id={tmdb_id}: {_db_err}") + else: + logging.warning(f"未获取到完整的播出时间信息 tmdb_id={tmdb_id}, airtime={airtime}") + else: + logging.debug(f"未找到 Trakt 节目映射 tmdb_id={tmdb_id}, show_info={show_info}") + else: + logging.debug(f"TraktService 未配置 tmdb_id={tmdb_id}") + else: + logging.debug(f"Trakt Client ID 未配置，跳过同步 tmdb_id={tmdb_id}") + except Exception as _te_outer: + logging.warning(f"同步 Trakt 播出时间失败 tmdb_id={tmdb_id}: {_te_outer}") + import traceback + logging.debug(f"异常堆栈: {traceback.format_exc()}") + + # 2) 如果有 Trakt 的源时间/时区，计算每集的本地播出日期并更新 air_date_local + update_episodes_air_date_local(cal_db, int(tmdb_id), int(latest_season_number), episodes) except Exception as _e: logging.warning(f"写入剧集失败 tmdb_id={tmdb_id}: {_e}") @@ -5549,6 +6256,8 @@ def do_calendar_bootstrap() -> tuple: ep_type=(ep.get('episode_type') or ep.get('type')), updated_at=now_ts, ) + # 如果有 Trakt 的源时间/时区，计算每集的本地播出日期并更新 air_date_local + update_episodes_air_date_local(cal_db, int(tmdb_id), int(latest_season_number), episodes) any_written = True except Exception as _e: logging.warning(f"bootstrap 写入剧集失败 tmdb_id={tmdb_id}: {_e}") @@ -5578,6 +6287,78 @@ def details_of_season_episode_count(tmdb_service: TMDBService, tmdb_id: int, sea return 0 +def update_episodes_air_date_local(cal_db: CalendarDB, tmdb_id: int, season_number: int, episodes: list): + """ + 辅助函数：如果有 Trakt 的源时间/时区，计算每集的本地播出日期并更新 air_date_local + + Args: + cal_db: CalendarDB 实例 + tmdb_id: 节目 TMDB ID + season_number: 季号 + episodes: 集列表（包含 air_date 字段） + """ + try: + # 从 shows 表读取 Trakt 的源时间/时区 + show = cal_db.get_show(int(tmdb_id)) + if not show: + return + air_time_source = show.get('air_time_source') or '' + air_timezone = show.get('air_timezone') or '' + if not air_time_source or not air_timezone: + # 修复：当没有 Trakt 时区信息时，将 air_date_local 设置为与 air_date 相同的值 + # 这样可以确保前端显示正确的日期（当 calendar_timezone_mode='local' 时） + for ep in episodes: + ep_air_date = ep.get('air_date') or '' + ep_number = ep.get('episode_number') or 0 + if ep_air_date and ep_number: + try: + cal_db.update_episode_air_date_local( + int(tmdb_id), + int(season_number), + int(ep_number), + ep_air_date + ) + except Exception as _e_sync: + logging.debug(f"同步 air_date 到 air_date_local 失败 tmdb_id={tmdb_id}, season={season_number}, ep={ep_number}: {_e_sync}") + return + + # 获取本地时区配置 + local_tz = config_data.get("local_timezone", "Asia/Shanghai") + + try: + from zoneinfo import ZoneInfo as _ZoneInfo + from datetime import datetime as _dt, time as _dtime + for ep in episodes: + ep_air_date = ep.get('air_date') or '' + ep_number = ep.get('episode_number') or 0 + if ep_air_date and ep_number: + try: + # 解析 TMDB air_date 作为源时区日期 + src_date = _dt.strptime(ep_air_date, '%Y-%m-%d').date() + # 解析源时区时间 + hh, mm = [int(x) for x in air_time_source.split(':')] + src_time = _dtime(hour=hh, minute=mm) + # 组合成源时区 datetime + src_dt = _dt.combine(src_date, src_time) + src_dt = src_dt.replace(tzinfo=_ZoneInfo(air_timezone)) + # 转换到本地时区 + local_dt = src_dt.astimezone(_ZoneInfo(local_tz)) + air_date_local = local_dt.strftime('%Y-%m-%d') + # 更新数据库 + cal_db.update_episode_air_date_local( + int(tmdb_id), + int(season_number), + int(ep_number), + air_date_local + ) + except Exception as _e_local: + logging.debug(f"计算本地播出日期失败 tmdb_id={tmdb_id}, season={season_number}, ep={ep_number}: {_e_local}") + except Exception as _e_batch: + logging.debug(f"批量更新本地播出日期失败 tmdb_id={tmdb_id}, season={season_number}: {_e_batch}") + except Exception as _e: + logging.debug(f"更新本地播出日期失败 tmdb_id={tmdb_id}: {_e}") + + def get_poster_language_setting(): """获取海报语言设置""" return config_data.get('poster_language', 'zh-CN') @@ -5896,6 +6677,12 @@ def calendar_refresh_latest_season(): if not show: return jsonify({"success": False, "message": "未初始化该剧（请先 bootstrap）"}) + try: + show_name_for_log = show.get('name') or f"tmdb:{tmdb_id}" + logging.info(f">>> 开始执行刷新最新季元数据 [{show_name_for_log}]") + except Exception: + pass + latest_season = int(show['latest_season_number']) season = tmdb_service.get_tv_show_episodes(tmdb_id, latest_season) or {} episodes = season.get('episodes', []) or [] @@ -5929,7 +6716,9 @@ def calendar_refresh_latest_season(): ep_type=(ep.get('episode_type') or ep.get('type')), updated_at=now_ts, ) - any_written = True + # 如果有 Trakt 的源时间/时区，计算每集的本地播出日期并更新 air_date_local + update_episodes_air_date_local(cal_db, int(tmdb_id), latest_season, episodes) + any_written = True # 同步更新 seasons 表的季名称与总集数 try: @@ -5947,13 +6736,15 @@ def calendar_refresh_latest_season(): ) # 写回 season_metrics（air/total），transferred 留待聚合更新 try: - # 使用有效日期计算已播出集数 - effective_date = get_effective_date_for_aired_count() + # 使用今天的日期计算已播出集数 + # 注意：现在集的播出日期已经是本地日期，不需要通过播出集数刷新时间限制，直接使用今天的日期比较即可 + from datetime import datetime as _dt + today = _dt.now().strftime('%Y-%m-%d') cur = cal_db.conn.cursor() cur.execute(""" SELECT COUNT(1) FROM episodes WHERE tmdb_id=? AND season_number=? AND air_date IS NOT NULL AND air_date != '' AND air_date <= ? - """, (int(tmdb_id), int(latest_season), effective_date)) + """, (int(tmdb_id), int(latest_season), today)) aired_cnt = int((cur.fetchone() or [0])[0]) progress_pct = 0 from time import time as _now @@ -5962,18 +6753,76 @@ def calendar_refresh_latest_season(): pass except Exception: pass + # 单节目手动刷新完成后，立即重算已播出/进度并同步前后端 + try: + recompute_show_aired_progress(int(tmdb_id)) + except Exception as _recalc_err: + logging.debug(f"刷新后重算播出进度失败 tmdb_id={tmdb_id}: {_recalc_err}") try: if any_written: notify_calendar_changed('refresh_latest_season') except Exception: pass + try: + _trigger_airtime_reschedule('refresh_latest_season', tmdb_id) + except Exception: + pass + try: + logging.info(f">>> 刷新最新季元数据 [{show_name_for_log}] 执行成功") + except Exception: + pass return jsonify({"success": True, "updated": len(episodes)}) except Exception as e: return jsonify({"success": False, "message": f"刷新失败: {str(e)}"}) -# 强制刷新单集或合并集的元数据（海报视图使用） +# 工具函数：格式化集范围用于日志 +def format_episode_range_for_log(episodes): + try: + eps = sorted(set(int(x) for x in episodes if x is not None)) + except Exception: + return '' + if not eps: + return '' + if len(eps) == 1: + return f"第 {eps[0]} 集" + # 检测连续 + is_consecutive = all(eps[i] + 1 == eps[i + 1] for i in range(len(eps) - 1)) + if is_consecutive: + return f"第 {eps[0]} 至 {eps[-1]} 集" + return "第 " + "、".join(str(e) for e in eps) + " 集" + + +def _refresh_single_episode(cal_db, tmdb_id: int, season_number: int, episode_number: int, tmdb_service): + season = tmdb_service.get_tv_show_episodes(tmdb_id, season_number) or {} + episodes = season.get('episodes', []) or [] + target_episode = None + for ep in episodes: + if int(ep.get('episode_number') or 0) == episode_number: + target_episode = ep + break + if not target_episode: + raise ValueError(f"未找到第 {season_number} 季第 {episode_number} 集") + + from time import time as _now + now_ts = int(_now()) + cal_db.upsert_episode( + tmdb_id=int(tmdb_id), + season_number=season_number, + episode_number=episode_number, + name=target_episode.get('name') or '', + overview=target_episode.get('overview') or '', + air_date=target_episode.get('air_date') or '', + runtime=target_episode.get('runtime'), + ep_type=(target_episode.get('episode_type') or target_episode.get('type')), + updated_at=now_ts, + ) + update_episodes_air_date_local(cal_db, int(tmdb_id), season_number, [target_episode]) + return target_episode + + +# 强制刷新单集元数据 @app.route("/api/calendar/refresh_episode") def calendar_refresh_episode(): try: @@ -5995,54 +6844,106 @@ def calendar_refresh_episode(): tmdb_service = TMDBService(tmdb_api_key, poster_language) cal_db = CalendarDB() - # 验证节目是否存在 show = cal_db.get_show(int(tmdb_id)) if not show: return jsonify({"success": False, "message": "未初始化该剧（请先 bootstrap）"}) - # 获取指定季的所有集数据 - season = tmdb_service.get_tv_show_episodes(tmdb_id, season_number) or {} - episodes = season.get('episodes', []) or [] - - # 查找指定集 - target_episode = None - for ep in episodes: - if int(ep.get('episode_number') or 0) == episode_number: - target_episode = ep - break - - if not target_episode: - return jsonify({"success": False, "message": f"未找到第 {season_number} 季第 {episode_number} 集"}) + show_name_for_log = show.get('name') or f"tmdb:{tmdb_id}" + try: + logging.info(f">>> 开始执行刷新元数据 [{show_name_for_log} · 第 {season_number} 季 · 第 {episode_number} 集]") + except Exception: + pass - # 强制更新该集数据（无论是否有 runtime） - from time import time as _now - now_ts = int(_now()) - - cal_db.upsert_episode( - tmdb_id=int(tmdb_id), - season_number=season_number, - episode_number=episode_number, - name=target_episode.get('name') or '', - overview=target_episode.get('overview') or '', - air_date=target_episode.get('air_date') or '', - runtime=target_episode.get('runtime'), - ep_type=(target_episode.get('episode_type') or target_episode.get('type')), - updated_at=now_ts, - ) + target_episode = _refresh_single_episode(cal_db, int(tmdb_id), int(season_number), int(episode_number), tmdb_service) - # 通知日历数据变更 try: notify_calendar_changed('refresh_episode') except Exception: pass + try: + _trigger_airtime_reschedule('refresh_episode', tmdb_id) + except Exception: + pass - # 获取剧名用于通知 show_name = show.get('name', '未知剧集') + try: + logging.info(f">>> 刷新元数据 [{show_name_for_log} · 第 {season_number} 季 · 第 {episode_number} 集] 执行成功") + except Exception: + pass return jsonify({"success": True, "message": f"《{show_name}》第 {season_number} 季 · 第 {episode_number} 集刷新成功"}) except Exception as e: return jsonify({"success": False, "message": f"刷新失败: {str(e)}"}) +# 批量刷新多集（合并集） +@app.route("/api/calendar/refresh_episodes_batch") +def calendar_refresh_episodes_batch(): + try: + if not is_login(): + return jsonify({"success": False, "message": "未登录"}) + + tmdb_id = request.args.get('tmdb_id', type=int) + season_number = request.args.get('season_number', type=int) + episode_numbers_raw = request.args.get('episode_numbers', '') + + if not tmdb_id or not season_number or not episode_numbers_raw: + return jsonify({"success": False, "message": "缺少必要参数"}) + + try: + episode_numbers = [int(x) for x in str(episode_numbers_raw).split(',') if str(x).strip()] + except Exception: + return jsonify({"success": False, "message": "episode_numbers 参数非法"}) + if not episode_numbers: + return jsonify({"success": False, "message": "缺少有效的集号列表"}) + + tmdb_api_key = config_data.get('tmdb_api_key', '') + if not tmdb_api_key: + return jsonify({"success": False, "message": "TMDB API 未配置"}) + + poster_language = get_poster_language_setting() + tmdb_service = TMDBService(tmdb_api_key, poster_language) + cal_db = CalendarDB() + + show = cal_db.get_show(int(tmdb_id)) + if not show: + return jsonify({"success": False, "message": "未初始化该剧（请先 bootstrap）"}) + + show_name_for_log = show.get('name') or f"tmdb:{tmdb_id}" + ep_range = format_episode_range_for_log(episode_numbers) + try: + logging.info(f">>> 开始执行刷新元数据 [{show_name_for_log} · 第 {season_number} 季 · {ep_range}]") + except Exception: + pass + + failed = [] + for ep_num in episode_numbers: + try: + _refresh_single_episode(cal_db, int(tmdb_id), int(season_number), int(ep_num), tmdb_service) + except Exception as e: + failed.append((ep_num, str(e))) + + try: + notify_calendar_changed('refresh_episode') + except Exception: + pass + try: + _trigger_airtime_reschedule('refresh_episodes_batch', tmdb_id) + except Exception: + pass + + show_name = show.get('name', '未知剧集') + if failed: + msg = f"《{show_name}》第 {season_number} 季 · {ep_range}部分刷新失败: {failed}" + return jsonify({"success": False, "message": msg}) + try: + logging.info(f">>> 刷新元数据 [{show_name_for_log} · 第 {season_number} 季 · {ep_range}] 执行成功") + except Exception: + pass + return jsonify({"success": True, "message": f"《{show_name}》第 {season_number} 季 · {ep_range}刷新成功"}) + except Exception as e: + return jsonify({"success": False, "message": f"刷新失败: {str(e)}"}) + + # 强制刷新整个季的元数据（内容管理视图使用） @app.route("/api/calendar/refresh_season") def calendar_refresh_season(): @@ -6052,6 +6953,9 @@ def calendar_refresh_season(): tmdb_id = request.args.get('tmdb_id', type=int) season_number = request.args.get('season_number', type=int) + is_auto_refresh = request.args.get('is_auto_refresh', 'false').lower() == 'true' + is_batch_refresh = request.args.get('is_batch_refresh', 'false').lower() == 'true' + is_edit_metadata_refresh = request.args.get('is_edit_metadata_refresh', 'false').lower() == 'true' if not tmdb_id or not season_number: return jsonify({"success": False, "message": "缺少必要参数"}) @@ -6069,6 +6973,18 @@ def calendar_refresh_season(): if not show: return jsonify({"success": False, "message": "未初始化该剧（请先 bootstrap）"}) + # 日志：季级刷新（批量刷新时不输出单个任务日志，手动刷新用INFO，自动刷新和编辑元数据触发的刷新用DEBUG） + if not is_batch_refresh: + try: + show_name_for_log = show.get('name') or f"tmdb:{tmdb_id}" + log_msg = f">>> 开始执行刷新元数据 [{show_name_for_log} · 第 {season_number} 季]" + if is_auto_refresh or is_edit_metadata_refresh: + logging.debug(log_msg) + else: + logging.info(log_msg) + except Exception: + pass + # 获取指定季的所有集数据 season = tmdb_service.get_tv_show_episodes(tmdb_id, season_number) or {} episodes = season.get('episodes', []) or [] @@ -6108,6 +7024,9 @@ def calendar_refresh_season(): updated_at=now_ts, ) updated_count += 1 + + # 如果有 Trakt 的源时间/时区，计算每集的本地播出日期并更新 air_date_local + update_episodes_air_date_local(cal_db, int(tmdb_id), season_number, episodes) # 同步更新 seasons 表的季名称与总集数 try: @@ -6123,19 +7042,41 @@ def calendar_refresh_season(): f"/tv/{tmdb_id}/season/{season_number}", season_name_processed ) - # 写回 season_metrics（air/total），transferred 留待聚合更新 + # 写回 season_metrics（使用时区感知的已播出判定） try: - # 使用有效日期计算已播出集数 - effective_date = get_effective_date_for_aired_count() + try: + from zoneinfo import ZoneInfo as _ZoneInfo + _local_tz = _ZoneInfo(_get_local_timezone()) + _now_local_dt = datetime.now(_local_tz) + except Exception: + _now_local_dt = datetime.now() + aired_cnt = 0 cur = cal_db.conn.cursor() - cur.execute(""" - SELECT COUNT(1) FROM episodes - WHERE tmdb_id=? AND season_number=? AND air_date IS NOT NULL AND air_date != '' AND air_date <= ? - """, (int(tmdb_id), int(season_number), effective_date)) - aired_cnt = int((cur.fetchone() or [0])[0]) + cur.execute( + """ + SELECT episode_number FROM episodes + WHERE tmdb_id=? AND season_number=? + """, + (int(tmdb_id), int(season_number)), + ) + ep_list = cur.fetchall() or [] + for (_ep_no,) in ep_list: + try: + result = is_episode_aired(int(tmdb_id), int(season_number), int(_ep_no), _now_local_dt) + if result: + aired_cnt += 1 + except Exception as _ep_err: + logging.debug(f"calendar_refresh_season 计算已播出集数异常: tmdb_id={tmdb_id}, season={season_number}, ep={_ep_no}, error={_ep_err}") + import traceback + logging.debug(f"异常堆栈: {traceback.format_exc()}") + continue from time import time as _now - cal_db.upsert_season_metrics(int(tmdb_id), int(season_number), None, aired_cnt, int(len(episodes)), int(_now())) - except Exception: + logging.debug(f"calendar_refresh_season 计算完成: tmdb_id={tmdb_id}, season={season_number}, aired_cnt={aired_cnt}, total={len(episodes)}") + cal_db.upsert_season_metrics(int(tmdb_id), int(season_number), None, aired_cnt, int(len(episodes)), 0, int(_now())) + except Exception as _metrics_err: + logging.debug(f"calendar_refresh_season 更新 season_metrics 异常: tmdb_id={tmdb_id}, season={season_number}, error={_metrics_err}") + import traceback + logging.debug(f"异常堆栈: {traceback.format_exc()}") pass except Exception: pass @@ -6145,14 +7086,73 @@ def calendar_refresh_season(): notify_calendar_changed('refresh_season') except Exception: pass - + try: + _trigger_airtime_reschedule('refresh_season', tmdb_id) + except Exception: + pass + # 获取剧名用于通知 show_name = show.get('name', '未知剧集') + if not is_batch_refresh: + try: + log_msg = f">>> 刷新元数据 [{show_name_for_log} · 第 {season_number} 季] 执行成功" + if is_auto_refresh or is_edit_metadata_refresh: + logging.debug(log_msg) + else: + logging.info(log_msg) + except Exception: + pass + # 刷新后回填任务进度（若有绑定且匹配到同季） + try: + tasks = (config_data or {}).get('tasklist', []) + bound_tasks = [] + for _t in tasks: + _name = _t.get('taskname') or _t.get('task_name') or '' + _cal = (_t.get('calendar_info') or {}) + _match = (_cal.get('match') or {}) + _tid = _match.get('tmdb_id') or _cal.get('tmdb_id') + _matched_sn = _t.get('matched_latest_season_number') + if _name and _tid and int(_tid) == int(tmdb_id): + # 仅对匹配到同一季的任务执行回填 + if _matched_sn is None or int(_matched_sn) == int(season_number): + bound_tasks.append(_name) + for _task_name in bound_tasks: + try: + recompute_task_metrics_and_notify(_task_name) + except Exception: + continue + except Exception: + pass + return jsonify({"success": True, "message": f"《{show_name}》第 {season_number} 季刷新成功，共 {updated_count} 集"}) except Exception as e: return jsonify({"success": False, "message": f"刷新失败: {str(e)}"}) +# 记录批量刷新开始日志 +@app.route("/api/calendar/log_batch_refresh_start", methods=["POST"]) +def log_batch_refresh_start(): + try: + if not is_login(): + return jsonify({"success": False, "message": "未登录"}) + logging.info(">>> 开始执行追剧日历手动刷新") + return jsonify({"success": True}) + except Exception as e: + return jsonify({"success": False, "message": f"记录日志失败: {str(e)}"}) + + +# 记录批量刷新结束日志 +@app.route("/api/calendar/log_batch_refresh_end", methods=["POST"]) +def log_batch_refresh_end(): + try: + if not is_login(): + return jsonify({"success": False, "message": "未登录"}) + logging.info(">>> 追剧日历手动刷新执行成功") + return jsonify({"success": True}) + except Exception as e: + return jsonify({"success": False, "message": f"记录日志失败: {str(e)}"}) + + # 刷新：拉取剧级别的最新详情并更新 shows 表（用于更新节目状态/中文名/首播年/海报/最新季） @app.route("/api/calendar/refresh_show") def calendar_refresh_show(): @@ -6274,6 +7274,7 @@ def calendar_edit_metadata(): new_tmdb_id = data.get('new_tmdb_id') new_season_number = data.get('new_season_number') custom_poster_url = (data.get('custom_poster_url') or '').strip() + local_air_time = (data.get('local_air_time') or '').strip() if not task_name: return jsonify({"success": False, "message": "缺少任务名称"}) @@ -6291,15 +7292,62 @@ def calendar_edit_metadata(): cal = (target.get('calendar_info') or {}) match = (cal.get('match') or {}) - old_tmdb_id = match.get('tmdb_id') or cal.get('tmdb_id') + # 兼容旧字段，避免因结构差异无法读取已匹配的节目 + legacy_match = target.get('match') if isinstance(target.get('match'), dict) else {} + old_tmdb_id = ( + match.get('tmdb_id') + or cal.get('tmdb_id') + or legacy_match.get('tmdb_id') + or target.get('match_tmdb_id') + or target.get('tmdb_id') + ) changed = False + local_air_time_changed = False if new_task_name and new_task_name != task_name: target['taskname'] = new_task_name target['task_name'] = new_task_name changed = True + # 处理节目级本地播出时间：写入任务配置，并在存在 TMDB ID 时同步到数据库 + if 'calendar_info' not in target: + target['calendar_info'] = {} + if local_air_time or cal.get('local_air_time'): + # 允许用户清空播出时间（回退到 Trakt 自动推断或全局刷新时间） + norm_old = str(cal.get('local_air_time') or '').strip() + norm_new = str(local_air_time or '').strip() + if norm_new != norm_old: + target['calendar_info']['local_air_time'] = norm_new + changed = True + local_air_time_changed = True + # 用户手动设置播出时间：仅以本地时间为准，同时清空节目级源时区设置， + # 后续不再使用 Trakt 的 airs.time / timezone 做日期偏移推导 + try: + if old_tmdb_id: + cal_db_for_air = CalendarDB() + cal_db_for_air.update_show_air_schedule( + int(old_tmdb_id), + local_air_time=norm_new, + air_time_source="", + air_timezone="", + ) + # 变更播出时间后，立即重算该节目的已播/进度并通知前端，确保热更新 + try: + recompute_show_aired_progress(int(old_tmdb_id)) + except Exception as _recalc_err: + logging.debug(f"重算节目进度失败 tmdb_id={old_tmdb_id}: {_recalc_err}") + try: + notify_calendar_changed('update_airtime') + except Exception: + pass + try: + _trigger_airtime_reschedule('update_airtime', old_tmdb_id) + except Exception as _sched_err: + logging.debug(f"重建播出时间调度失败 tmdb_id={old_tmdb_id}: {_sched_err}") + except Exception as e: + logging.warning(f"同步本地播出时间到数据库失败: {e}") + valid_types = {'tv', 'anime', 'variety', 'documentary', 'other', ''} if new_content_type in valid_types: extracted = (target.setdefault('calendar_info', {}).setdefault('extracted', {})) @@ -6321,6 +7369,8 @@ def calendar_edit_metadata(): changed = True did_rematch = False + new_tid = None + season_no = None cal_db = CalendarDB() tmdb_api_key = config_data.get('tmdb_api_key', '') poster_language = get_poster_language_setting() @@ -6462,6 +7512,8 @@ def calendar_edit_metadata(): ep_type=(ep.get('episode_type') or ep.get('type')), updated_at=now_ts, ) + # 如果有 Trakt 的源时间/时区，计算每集的本地播出日期并更新 air_date_local + update_episodes_air_date_local(cal_db, int(new_tid), int(season_no), eps) try: sname_raw = (season or {}).get('name') or '' sname = tmdb_service.process_season_name(sname_raw) if tmdb_service else sname_raw @@ -6469,13 +7521,15 @@ def calendar_edit_metadata(): cal_db.update_show_latest_season_number(int(new_tid), int(season_no)) # 写回 season_metrics（air/total），transferred 留给聚合环节补齐 try: - # 使用有效日期计算已播出集数 - effective_date = get_effective_date_for_aired_count() + # 使用今天的日期计算已播出集数 + # 注意：现在集的播出日期已经是本地日期，不需要通过播出集数刷新时间限制，直接使用今天的日期比较即可 + from datetime import datetime as _dt + today = _dt.now().strftime('%Y-%m-%d') cur = cal_db.conn.cursor() cur.execute(""" SELECT COUNT(1) FROM episodes WHERE tmdb_id=? AND season_number=? AND air_date IS NOT NULL AND air_date != '' AND air_date <= ? - """, (int(new_tid), int(season_no), effective_date)) + """, (int(new_tid), int(season_no), today)) aired_cnt = int((cur.fetchone() or [0])[0]) progress_pct = 0 # 此处无 transferred_count，百分比暂置 0，由聚合环节补齐 from time import time as _now @@ -6529,7 +7583,12 @@ def calendar_edit_metadata(): return jsonify({"success": False, "message": "季数必须为数字"}) # 检查是否与当前匹配的季数相同，如果相同则跳过处理 - current_match_season = match.get('latest_season_number') + current_match_season = ( + match.get('latest_season_number') + or legacy_match.get('latest_season_number') + or target.get('matched_latest_season_number') + or cal.get('latest_season_number') + ) if current_match_season and int(current_match_season) == season_no: # 季数未变化，跳过处理 pass @@ -6579,6 +7638,8 @@ def calendar_edit_metadata(): ep_type=(ep.get('episode_type') or ep.get('type')), updated_at=now_ts, ) + # 如果有 Trakt 的源时间/时区，计算每集的本地播出日期并更新 air_date_local + update_episodes_air_date_local(cal_db, int(old_tmdb_id), int(season_no), eps) try: sname_raw = (season or {}).get('name') or '' sname = tmdb_service.process_season_name(sname_raw) @@ -6715,6 +7776,37 @@ def calendar_edit_metadata(): except Exception: pass + if local_air_time_changed and old_tmdb_id: + try: + _trigger_airtime_reschedule('edit_metadata_local_air_time', old_tmdb_id) + except Exception: + pass + + # 确定最终的 tmdb_id 和 season_number，用于前端刷新 + # 只有在需要刷新元数据的情况下才返回有效的 tmdb_id 和 season_number： + # 1. 重新匹配了 TMDB（did_rematch） + # 2. 修改了季数（new_season_number） + # 3. 修改了自定义海报（custom_poster_url）- 需要刷新以更新海报 + # 其他情况（如只修改任务名、内容类型、本地播出时间）不应该触发刷新 + final_tmdb_id = None + final_season_number = None + if did_rematch and new_tid: + # 如果重新匹配，使用新的 tmdb_id 和 season_number + final_tmdb_id = new_tid + final_season_number = season_no + elif (new_season_number is not None) and (str(new_season_number).strip() != '') and old_tmdb_id: + # 如果只修改了季数，使用当前的 tmdb_id 和新的季数 + try: + final_tmdb_id = old_tmdb_id + final_season_number = int(new_season_number) + except Exception: + pass + elif custom_poster_url and old_tmdb_id: + # 如果修改了自定义海报，需要刷新以更新海报（但不需要刷新元数据） + # 这里不返回 tmdb_id 和 season_number，因为海报更新不需要刷新元数据 + # 海报更新会通过 notify_calendar_changed('poster_updated:...') 通知前端 + pass + msg = '元数据更新成功' if did_rematch: msg = '元数据更新成功，已重新匹配并刷新元数据' @@ -6723,7 +7815,16 @@ def calendar_edit_metadata(): msg = '元数据更新成功，已重新匹配并刷新元数据，自定义海报已更新' else: msg = '元数据更新成功，自定义海报已更新' - return jsonify({"success": True, "message": msg}) + + # 返回修改状态和需要刷新的节目信息 + result = { + "success": True, + "message": msg, + "changed": changed, + "tmdb_id": final_tmdb_id, + "season_number": final_season_number + } + return jsonify(result) except Exception as e: return jsonify({"success": False, "message": f"保存失败: {str(e)}"}) @@ -6888,6 +7989,10 @@ def run_calendar_refresh_all_internal(): updated_at=now_ts, ) any_written = True + + # 如果有 Trakt 的源时间/时区，计算每集的本地播出日期并更新 air_date_local + # 如果没有时区信息，将 air_date_local 设置为与 air_date 相同的值 + update_episodes_air_date_local(db, int(tmdb_id), int(db.get_show(int(tmdb_id))['latest_season_number']), episodes) # 新增：节目状态变更检测与更新（如 Returning → 本季终/已完结 等） try: @@ -6928,6 +8033,10 @@ def run_calendar_refresh_all_internal(): notify_calendar_changed('status_updated') except Exception: pass + try: + _trigger_airtime_reschedule('auto_refresh') + except Exception: + pass except Exception as e: logging.warning(f"自动刷新任务异常: {e}") # 本地缓存读取：获取最新一季的本地剧集数据 @@ -7025,11 +8134,20 @@ def get_calendar_episodes_local(): except Exception: progress_by_task = {} + # 获取日历时区模式配置 + calendar_timezone_mode = config_data.get('calendar_timezone_mode', 'original') + if tmdb_id: show = db.get_show(int(tmdb_id)) if not show: return jsonify({'success': True, 'data': {'episodes': [], 'total': 0}}) eps = db.list_latest_season_episodes(int(tmdb_id), int(show['latest_season_number'])) + # 根据 calendar_timezone_mode 选择使用 air_date 还是 air_date_local + for e in eps: + if calendar_timezone_mode == 'local' and e.get('air_date_local'): + e['display_air_date'] = e['air_date_local'] + else: + e['display_air_date'] = e.get('air_date') or '' # 注入任务信息与标准化进度 info = tmdb_to_taskinfo.get(int(tmdb_id)) if info: @@ -7044,6 +8162,12 @@ def get_calendar_episodes_local(): else: # 返回全部最新季汇总（供周视图合并展示） eps = db.list_all_latest_episodes() + # 根据 calendar_timezone_mode 选择使用 air_date 还是 air_date_local + for e in eps: + if calendar_timezone_mode == 'local' and e.get('air_date_local'): + e['display_air_date'] = e['air_date_local'] + else: + e['display_air_date'] = e.get('air_date') or '' for e in eps: info = tmdb_to_taskinfo.get(int(e.get('tmdb_id'))) if info: diff --git a/app/sdk/db.py b/app/sdk/db.py index dc1d86b..802ea8f 100644 --- a/app/sdk/db.py +++ b/app/sdk/db.py @@ -361,15 +361,28 @@ class CalendarDB: ) ''') - # 检查 content_type 字段是否存在，如果不存在则添加 + # 检查 shows 表的新增字段（兼容旧版本） cursor.execute("PRAGMA table_info(shows)") columns = [column[1] for column in cursor.fetchall()] + # 内容类型 if 'content_type' not in columns: cursor.execute('ALTER TABLE shows ADD COLUMN content_type TEXT') - - # 检查 is_custom_poster 字段是否存在，如果不存在则添加 + columns.append('content_type') + # 自定义海报标记 if 'is_custom_poster' not in columns: cursor.execute('ALTER TABLE shows ADD COLUMN is_custom_poster INTEGER DEFAULT 0') + columns.append('is_custom_poster') + # 本地播出时间（Trakt + 时区转换后的节目级播出时间，格式 HH:MM） + if 'local_air_time' not in columns: + cursor.execute('ALTER TABLE shows ADD COLUMN local_air_time TEXT') + columns.append('local_air_time') + # 节目级原始播出时间（Trakt airs.time，源时区下的 HH:MM） + if 'air_time_source' not in columns: + cursor.execute('ALTER TABLE shows ADD COLUMN air_time_source TEXT') + columns.append('air_time_source') + # 节目级播出地时区（Trakt airs.timezone，例如 America/New_York） + if 'air_timezone' not in columns: + cursor.execute('ALTER TABLE shows ADD COLUMN air_timezone TEXT') # seasons cursor.execute(''' @@ -400,6 +413,21 @@ class CalendarDB: UNIQUE (tmdb_id, season_number, episode_number) ) ''') + # 迁移：为 episodes 表新增 Trakt 播出时间相关字段（兼容旧版本） + try: + cursor.execute('PRAGMA table_info(episodes)') + ep_columns = [column[1] for column in cursor.fetchall()] + if 'air_datetime_utc' not in ep_columns: + cursor.execute('ALTER TABLE episodes ADD COLUMN air_datetime_utc TEXT') + ep_columns.append('air_datetime_utc') + if 'air_datetime_local' not in ep_columns: + cursor.execute('ALTER TABLE episodes ADD COLUMN air_datetime_local TEXT') + ep_columns.append('air_datetime_local') + if 'air_date_local' not in ep_columns: + cursor.execute('ALTER TABLE episodes ADD COLUMN air_date_local TEXT') + except Exception: + # 迁移失败不影响主流程，后续逻辑会根据列是否存在做兼容处理 + pass # season_metrics（缓存：每季的三项计数） cursor.execute(''' @@ -599,11 +627,22 @@ class CalendarDB: ''', (tmdb_id, season_number, episode_number, name, overview, air_date, runtime, ep_type, updated_at)) self.conn.commit() + @retry_on_locked(max_retries=3, base_delay=0.1) + def update_episode_air_date_local(self, tmdb_id: int, season_number: int, episode_number: int, air_date_local: str): + """更新单集的本地播出日期""" + cursor = self.conn.cursor() + cursor.execute(''' + UPDATE episodes + SET air_date_local = ? + WHERE tmdb_id = ? AND season_number = ? AND episode_number = ? + ''', (air_date_local, tmdb_id, season_number, episode_number)) + self.conn.commit() + @retry_on_locked(max_retries=3, base_delay=0.1) def list_latest_season_episodes(self, tmdb_id:int, latest_season:int): cursor = self.conn.cursor() cursor.execute(''' - SELECT episode_number, name, overview, air_date, runtime, type + SELECT episode_number, name, overview, air_date, runtime, type, air_date_local FROM episodes WHERE tmdb_id=? AND season_number=? ORDER BY episode_number ASC @@ -617,6 +656,7 @@ class CalendarDB: 'air_date': r[3], 'runtime': r[4], 'type': r[5], + 'air_date_local': r[6] if len(r) > 6 else None, } for r in rows ] @@ -784,6 +824,90 @@ class CalendarDB: row = cursor.fetchone() return row[0] if row else None + # 节目本地播出时间管理（基于 Trakt 节目级 aired_time + 时区转换） + @retry_on_locked(max_retries=3, base_delay=0.1) + def update_show_local_air_time(self, tmdb_id: int, local_air_time: str): + """ + 更新节目在本地时区的统一播出时间（格式：HH:MM）。 + 若传入空字符串或 None，则清空该字段，回退到全局播出集数刷新时间。 + """ + cursor = self.conn.cursor() + value = (local_air_time or '').strip() + cursor.execute('UPDATE shows SET local_air_time=? WHERE tmdb_id=?', (value, tmdb_id)) + self.conn.commit() + return cursor.rowcount > 0 + + @retry_on_locked(max_retries=3, base_delay=0.1) + def get_show_local_air_time(self, tmdb_id: int): + """获取节目在本地时区的统一播出时间（HH:MM），无则返回 None。""" + cursor = self.conn.cursor() + try: + cursor.execute('SELECT local_air_time FROM shows WHERE tmdb_id=?', (tmdb_id,)) + except Exception: + # 旧版本可能没有该字段，直接返回 None + return None + row = cursor.fetchone() + if not row: + return None + value = row[0] + if value is None: + return None + value = str(value).strip() + return value or None + + @retry_on_locked(max_retries=3, base_delay=0.1) + def update_show_air_schedule(self, tmdb_id: int, local_air_time=None, air_time_source=None, air_timezone=None): + """ + 批量更新节目的播出时间相关字段： + - local_air_time: 本地时区统一播出时间（HH:MM） + - air_time_source: 源时区播出时间（Trakt airs.time，HH:MM） + - air_timezone: 源时区名称（Trakt airs.timezone，例如 America/New_York） + 传入 None 表示不更新该字段；传入空字符串表示清空。 + """ + fields = [] + params = [] + if local_air_time is not None: + fields.append("local_air_time=?") + params.append((local_air_time or "").strip()) + if air_time_source is not None: + fields.append("air_time_source=?") + params.append((air_time_source or "").strip()) + if air_timezone is not None: + fields.append("air_timezone=?") + params.append((air_timezone or "").strip()) + if not fields: + return False + cursor = self.conn.cursor() + params.append(tmdb_id) + cursor.execute(f'UPDATE shows SET {", ".join(fields)} WHERE tmdb_id=?', params) + self.conn.commit() + return cursor.rowcount > 0 + + @retry_on_locked(max_retries=3, base_delay=0.1) + def get_show_air_schedule(self, tmdb_id: int): + """ + 获取节目播出时间相关配置： + - local_air_time: 本地统一播出时间（HH:MM） + - air_time_source: 源时区播出时间（HH:MM） + - air_timezone: 源时区名称 + """ + cursor = self.conn.cursor() + try: + cursor.execute( + 'SELECT local_air_time, air_time_source, air_timezone FROM shows WHERE tmdb_id=?', + (tmdb_id,), + ) + except Exception: + return None + row = cursor.fetchone() + if not row: + return None + return { + "local_air_time": (row[0] or "").strip() if row[0] is not None else "", + "air_time_source": (row[1] or "").strip() if row[1] is not None else "", + "air_timezone": (row[2] or "").strip() if row[2] is not None else "", + } + @retry_on_locked(max_retries=3, base_delay=0.1) def get_shows_by_content_type(self, content_type:str): """根据内容类型获取节目列表""" diff --git a/app/sdk/tmdb_service.py b/app/sdk/tmdb_service.py index 8d443ff..e503869 100644 --- a/app/sdk/tmdb_service.py +++ b/app/sdk/tmdb_service.py @@ -128,6 +128,20 @@ class TMDBService: return result['results'][0] return None + def search_tv_show_all(self, query: str, year: str = None) -> List[Dict]: + """搜索电视剧，返回所有搜索结果""" + params = { + 'query': query, + } + # 如果提供了年份，添加到参数中 + if year: + params['first_air_date_year'] = year + + result = self._make_request('/search/tv', params) + if result and result.get('results'): + return result['results'] + return [] + def get_tv_show_details(self, tv_id: int) -> Optional[Dict]: """获取电视剧详细信息""" return self._make_request(f'/tv/{tv_id}') diff --git a/app/sdk/trakt_service.py b/app/sdk/trakt_service.py new file mode 100644 index 0000000..ea04d71 --- /dev/null +++ b/app/sdk/trakt_service.py @@ -0,0 +1,189 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +""" +Trakt 服务模块 +基于 TMDB ID 映射到 Trakt 节目，并使用节目级 aired_time + timezone 获取精确播出时间， +再转换为本地时区的统一播出时间（格式：HH:MM）。 +""" + +import logging +from datetime import datetime, date, time as dtime +from typing import Optional, Dict, Any + +import requests + +try: + # Python 3.9+ 标准库时区支持 + from zoneinfo import ZoneInfo +except Exception: # pragma: no cover - 兼容极老环境 + ZoneInfo = None # type: ignore + +logger = logging.getLogger(__name__) + + +class TraktService: + """ + Trakt API 轻量封装： + - 通过 TMDB ID 查找 Trakt 节目 + - 获取节目级播出时间 aired_time + timezone + - 将播出地时区的 daily airtime 转换为本地时区 HH:MM + """ + + def __init__(self, client_id: Optional[str] = None, base_url: str = "https://api.trakt.tv"): + self.client_id = (client_id or "").strip() + self.base_url = base_url.rstrip("/") + self.session = requests.Session() + # 统一请求头 + self.session.headers.update( + { + "Content-Type": "application/json", + "trakt-api-version": "2", + "trakt-api-key": self.client_id or "", + } + ) + + def is_configured(self) -> bool: + """检查 Trakt 是否已配置有效的 Client ID。""" + return bool(self.client_id) + + # ----------------- HTTP 基础封装 ----------------- + def _get(self, path: str, params: Optional[Dict[str, Any]] = None) -> Optional[Any]: + """发起 GET 请求，失败时记录日志并返回 None，不抛出到上层。""" + if not self.is_configured(): + return None + url = f"{self.base_url}{path}" + try: + resp = self.session.get(url, params=params or {}, timeout=10) + resp.raise_for_status() + return resp.json() + except Exception as e: + logger.warning(f"Trakt GET 请求失败: {url}, err={e}") + return None + + # ----------------- 节目级信息 ----------------- + def get_show_by_tmdb_id(self, tmdb_id: int) -> Optional[Dict[str, Any]]: + """ + 通过 TMDB ID 查找 Trakt 节目。 + + 返回结构示例： + { + "trakt_id": 195268, + "slug": "it-welcome-to-derry", + "title": "IT: Welcome to Derry", + "year": 2025 + } + """ + try: + if not self.is_configured(): + return None + if not tmdb_id: + return None + path = f"/search/tmdb/{int(tmdb_id)}" + data = self._get(path, params={"type": "show"}) + if not data: + return None + # Trakt 搜索返回列表，取第一个 show 结果 + item = None + for entry in data: + if entry.get("type") == "show" and entry.get("show"): + item = entry.get("show") or {} + break + if not item: + return None + return { + "trakt_id": item.get("ids", {}).get("trakt"), + "slug": item.get("ids", {}).get("slug"), + "title": item.get("title") or "", + "year": item.get("year"), + } + except Exception as e: + logger.warning(f"通过 TMDB ID 获取 Trakt 节目失败: tmdb_id={tmdb_id}, err={e}") + return None + + def get_show_airtime(self, trakt_show_id: Any) -> Optional[Dict[str, str]]: + """ + 获取节目级播出时间信息：aired_time + timezone。 + + Trakt 节目详情通常包含: + { + "airs": { + "day": "sunday", + "time": "21:00", + "timezone": "America/New_York" + }, + ... + } + """ + try: + if not self.is_configured(): + return None + if not trakt_show_id: + return None + path = f"/shows/{trakt_show_id}" + data = self._get(path, params={"extended": "full"}) + if not data: + return None + airs = data.get("airs") or {} + aired_time = (airs.get("time") or "").strip() + timezone = (airs.get("timezone") or "").strip() + if not aired_time or not timezone: + return None + return {"aired_time": aired_time, "timezone": timezone} + except Exception as e: + logger.warning(f"获取 Trakt 节目播出时间失败: trakt_show_id={trakt_show_id}, err={e}") + return None + + # ----------------- 时区转换 ----------------- + def convert_show_airtime_to_local( + self, aired_time: str, source_tz: str, local_tz: str + ) -> Optional[str]: + """ + 将播出地时区的 daily airtime 转换为本地时区的 HH:MM。 + + 参数: + aired_time: 播出地时间（字符串形式，如 '21:00'） + source_tz: 播出地时区（如 'America/New_York'） + local_tz: 本地时区（如 'Asia/Shanghai'） + 返回: + 本地时区 HH:MM 字符串；失败时返回 None + """ + try: + aired_time = (aired_time or "").strip() + source_tz = (source_tz or "").strip() + local_tz = (local_tz or "").strip() + if not aired_time or not source_tz or not local_tz: + return None + if ZoneInfo is None: + # 环境不支持 zoneinfo 时，退化为直接返回原始播出时间 + return aired_time + + # 解析 HH:MM + try: + hh, mm = [int(x) for x in aired_time.split(":")] + except Exception: + return None + + # 使用任意日期承载“每日播出时间”含义，这里选择今天 + today = date.today() + naive_dt = datetime.combine(today, dtime(hour=hh, minute=mm)) + try: + src_zone = ZoneInfo(source_tz) + dst_zone = ZoneInfo(local_tz) + except Exception: + # 时区字符串非法时，保守返回原 time + return aired_time + + src_dt = naive_dt.replace(tzinfo=src_zone) + local_dt = src_dt.astimezone(dst_zone) + return local_dt.strftime("%H:%M") + except Exception as e: + logger.warning( + f"转换节目播出时间到本地时区失败: aired_time={aired_time}, source_tz={source_tz}, local_tz={local_tz}, err={e}" + ) + return None + + +# 方便其它模块直接导入一个全局实例时再按需注入 client_id +trakt_service: Optional[TraktService] = None + + diff --git a/app/templates/index.html b/app/templates/index.html index 8fbe371..3625382 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -872,6 +872,18 @@
    + +
    +
    +
    + 追剧日历时区 +
    + +
    +
    @@ -979,6 +991,21 @@

    部分功能基于 TMDB 提供的数据实现，本应用与 TMDB 无关。

    +
    +
    +

    Trakt 配置

    + +     + +
    +
    +
    +
    + Client ID +
    + +
    +
    @@ -1342,7 +1369,7 @@
    - +
    @@ -1464,8 +1491,8 @@
    {{ getCalendarTaskByName(task.taskname).latest_season_name }}
    - -
    {{ taskLatestFiles[task.taskname] }}
    + +
    {{ getTaskAirTimeDisplay(task.taskname) }}
    {{ getTaskLatestRecordDisplay(task.taskname) }}
    @@ -2182,7 +2209,7 @@ @@ -2248,7 +2275,7 @@
    -
    {{ task.matched_status }}
    +
    {{ getTaskAirTimeDisplay(task) }}
    @@ -2815,7 +2842,7 @@
    - +
    @@ -2974,7 +3001,15 @@
    -
    +
    +
    +
    + 播出时间 +
    + +
    +
    +
    更换海报 @@ -3072,6 +3107,10 @@ today_update_indicator: "always" }, poster_language: "zh-CN", + trakt: { + client_id: "" + }, + calendar_timezone_mode: "original", // 显示顺序（可拖拽修改）：按钮 + 信息 button_display_order: [ "refresh_plex", @@ -4073,14 +4112,17 @@ try { this.loadCalendarEpisodesLocal && this.loadCalendarEpisodesLocal(); } catch (e) {} // 先启动监听以确保 tickRef 已就绪 this.startCalendarAutoWatch(); - // 重置签名，确保本次切换能触发一次增量检查 - this.calendarLatestFilesSignature = ''; + // 初始化签名（如果还没有），但不重置已有签名，避免触发不必要的刷新 + if (!this.calendarLatestFilesSignature) { + this.calendarLatestFilesSignature = this.calcLatestFilesSignature(this.taskLatestFiles || {}); + } // 进入页面即刻用现有的最近文件重建一次进度映射，避免UI滞后 try { this.calendar.progressByTaskName = this.buildProgressByTaskNameFromLatestFiles(this.taskLatestFiles || {}); this.calendar.progressByShowName = this.buildProgressByShowNameFromTasks(this.calendar.tasks || [], this.calendar.progressByTaskName); } catch (e) {} - // 立刻触发一次增量检查与热更新（无需等待下一轮定时器） + // 立刻触发一次增量检查（但不应该触发刷新，因为只是切换标签页，没有文件变化） + // 注意：tick 函数会检查签名变化，如果签名没有变化，不会触发刷新 if (this.calendarAutoWatchTickRef) { this.calendarAutoWatchTickRef(); } @@ -4714,6 +4756,28 @@ return task.task_name || task.taskname || ''; } }, + // 获取节目本地播出时间的展示文本 + getTaskAirTimeDisplay(taskNameOrTask) { + try { + let t = taskNameOrTask; + if (typeof taskNameOrTask === 'string') { + const name = taskNameOrTask; + t = (this.calendar.tasks || []).find(x => (x.task_name || x.taskname) === name); + if (!t && Array.isArray(this.formData.tasklist)) { + t = this.formData.tasklist.find(x => (x.taskname || x.task_name) === name); + } + } + if (!t) return ''; + const val = (t.local_air_time) + || (t.calendar_info && t.calendar_info.local_air_time) + || ''; + const norm = String(val || '').trim(); + if (!norm) return ''; + return norm; + } catch (e) { + return ''; + } + }, seasonInputComputedWidth() { try { const val = String(this.editMetadata && this.editMetadata.form ? (this.editMetadata.form.season_number ?? '') : ''); @@ -5063,7 +5127,7 @@ try { await this.loadTodayUpdatesLocal(); } catch (e) {} // 背景增量刷新（带节流），完成后热更新 if (this.shouldAutoRefreshCalendar()) { - this.refreshCalendarData().catch(() => {}); + this.refreshCalendarData(null, true, true).catch(() => {}); // isAutoRefresh=true } // 启动后台轻量监听，近实时发现“最近转存文件”变化 this.startCalendarAutoWatch(); @@ -5405,7 +5469,9 @@ return false; } - return episode.air_date === date; + // 优先使用 display_air_date（根据 calendar_timezone_mode 设置），否则使用 air_date + const episodeDate = episode.display_air_date || episode.air_date || ''; + return episodeDate === date; }); // 如果启用了合并集功能，则进行合并处理 @@ -5632,21 +5698,102 @@ - // 增量刷新追剧日历数据：仅对最新季执行增量拉取，然后本地读取 - async refreshCalendarData() { + // 增量刷新追剧日历数据：只刷新当前匹配季的元数据（不刷新 TMDB 最新季） + // 可选传入限定 tmdb_id 列表，仅刷新指定节目 + // onlyTmdbIds: 指定节目，allowFullRefresh: 仅显式同意时才全量刷新，isAutoRefresh: 是否为自动刷新（影响日志级别），isBatchRefresh: 是否为批量刷新（影响日志输出） + async refreshCalendarData(onlyTmdbIds = null, allowFullRefresh = false, isAutoRefresh = false, isBatchRefresh = false, isEditMetadataRefresh = false) { try { + if (this.calendar.refreshing) { + // 如果正在刷新中，给用户提示（仅手动刷新时） + if (!isAutoRefresh) { + this.showToast('刷新正在进行中，请稍候'); + } + return; + } + this.calendar.refreshing = true; const tasklist = (this.formData && this.formData.tasklist) ? this.formData.tasklist : []; - const tmdbIds = []; + // 收集 tmdb_id -> 匹配季号映射 + const tmdbToSeason = {}; + // 优先使用日历任务最新数据 + try { + (this.calendar.tasks || []).forEach(t => { + const tid = t.match_tmdb_id; + const sn = t.matched_latest_season_number; + if (tid && sn) tmdbToSeason[tid] = sn; + }); + } catch (e) {} + // 回退表单任务里的匹配季 tasklist.forEach(t => { - const cal = (t && t.calendar_info) ? t.calendar_info : {}; - const match = cal.match || {}; - if (match.tmdb_id) tmdbIds.push(match.tmdb_id); - }); - for (const id of tmdbIds) { try { - await axios.get('/api/calendar/refresh_latest_season', { params: { tmdb_id: id } }); + const cal = (t && t.calendar_info) ? t.calendar_info : {}; + const match = cal.match || {}; + const tid = match.tmdb_id; + const sn = match.latest_season_number; + if (tid && sn && !tmdbToSeason[tid]) tmdbToSeason[tid] = sn; + } catch (e) {} + }); + + const tmdbIds = Object.keys(tmdbToSeason).map(v => Number(v)).filter(Boolean); + const idsToRefresh = Array.isArray(onlyTmdbIds) && onlyTmdbIds.length + ? onlyTmdbIds + : (allowFullRefresh ? tmdbIds : []); + + if (!idsToRefresh || idsToRefresh.length === 0) { + // 未授权全量且未指定节目，直接跳过 + if (!isAutoRefresh) { + this.showToast('没有可刷新的节目数据'); + } + // 提前返回时也要重置刷新状态 + this.calendar.refreshing = false; + return; + } + + // 如果不是自动刷新，显示开始提示 + if (!isAutoRefresh) { + this.showToast(`正在刷新追剧日历，共 ${idsToRefresh.length} 个节目`); + } + + // 批量刷新时输出整体开始日志 + if (isBatchRefresh) { + try { + await axios.post('/api/calendar/log_batch_refresh_start'); } catch (e) { - console.warn('refresh 失败:', id, e); + // 忽略日志记录失败 + } + } + + let successCount = 0; + let failCount = 0; + for (const id of idsToRefresh) { + const sn = tmdbToSeason[id]; + if (!sn) { + console.warn('缺少匹配季，跳过刷新', id); + failCount++; + continue; + } + try { + await axios.get('/api/calendar/refresh_season', { + params: { + tmdb_id: id, + season_number: sn, + is_auto_refresh: isAutoRefresh ? 'true' : 'false', + is_batch_refresh: isBatchRefresh ? 'true' : 'false', + is_edit_metadata_refresh: isEditMetadataRefresh ? 'true' : 'false' + } + }); + successCount++; + } catch (e) { + console.warn('refresh season 失败:', id, sn, e); + failCount++; + } + } + + // 批量刷新时输出整体结束日志 + if (isBatchRefresh) { + try { + await axios.post('/api/calendar/log_batch_refresh_end'); + } catch (e) { + // 忽略日志记录失败 } } @@ -5673,8 +5820,25 @@ try { await this.loadTodayUpdatesLocal(); } catch (e) {} // 记录自动刷新时间戳，用于节流 try { localStorage.setItem('calendar_last_auto_refresh', String(Date.now())); } catch (e) {} + + // 如果不是自动刷新，显示完成提示 + if (!isAutoRefresh) { + if (failCount === 0) { + this.showToast(`追剧日历刷新成功，共 ${successCount} 个节目`); + } else if (successCount > 0) { + this.showToast(`追剧日历刷新完成，${successCount} 个节目成功，${failCount} 个节目失败`); + } else { + this.showToast(`追剧日历刷新失败，共 ${failCount} 个节目`); + } + } } catch (error) { console.warn('增量刷新失败:', error); + // 如果不是自动刷新，显示错误提示 + if (!isAutoRefresh) { + this.showToast('追剧日历刷新失败：' + (error.response?.data?.message || error.message || '未知错误')); + } + } finally { + this.calendar.refreshing = false; } }, @@ -5688,67 +5852,24 @@ // 检查是否为合并集 if (episode.is_merged && episode.original_episodes && episode.original_episodes.length > 0) { - // 合并集：刷新所有原始集 - console.log('检测到合并集，将刷新所有原始集:', episode.original_episodes.length, '集'); - - let successCount = 0; - let failCount = 0; - const successEpisodes = []; - const failEpisodes = []; - const errors = []; - - // 并行刷新所有原始集 - const refreshPromises = episode.original_episodes.map(async (originalEpisode) => { - try { - const response = await axios.get('/api/calendar/refresh_episode', { - params: { - tmdb_id: episode.tmdb_id, - season_number: episode.season_number, - episode_number: originalEpisode.episode_number - } - }); - - if (response.data.success) { - successCount++; - successEpisodes.push(originalEpisode.episode_number); - return { success: true, episode: originalEpisode.episode_number }; - } else { - failCount++; - failEpisodes.push(originalEpisode.episode_number); - errors.push(`第${originalEpisode.episode_number}集: ${response.data.message}`); - return { success: false, episode: originalEpisode.episode_number, error: response.data.message }; - } - } catch (error) { - failCount++; - failEpisodes.push(originalEpisode.episode_number); - const errorMsg = error.response?.data?.message || error.message; - errors.push(`第${originalEpisode.episode_number}集: ${errorMsg}`); - return { success: false, episode: originalEpisode.episode_number, error: errorMsg }; + // 合并集：使用批量接口，一次刷新所有原始集 + const episodeNumbers = (episode.original_episodes || []).map(ep => ep.episode_number).filter(Boolean); + const response = await axios.get('/api/calendar/refresh_episodes_batch', { + params: { + tmdb_id: episode.tmdb_id, + season_number: episode.season_number, + episode_numbers: episodeNumbers.join(',') } }); - // 等待所有刷新完成 - await Promise.all(refreshPromises); - - // 显示结果提示 const showName = episode.show_name || '未知剧集'; const seasonNumber = episode.season_number; + const episodeRange = this.formatEpisodeRange(episodeNumbers); - if (successCount > 0 && failCount === 0) { - // 全部成功 - const episodeRange = this.formatEpisodeRange(successEpisodes); - this.showToast(`《${showName}》第 ${seasonNumber} 季 · ${episodeRange}刷新成功`); - } else if (successCount > 0 && failCount > 0) { - // 部分成功：使用顿号明确区分成功和失败的集数 - const successRange = this.formatEpisodeRange(successEpisodes, true); - const failRange = this.formatEpisodeRange(failEpisodes, true); - this.showToast(`《${showName}》第 ${seasonNumber} 季 · ${successRange}刷新成功，${failRange}刷新失败`); - console.warn('部分刷新失败:', errors); + if (response.data.success) { + this.showToast(response.data.message || `《${showName}》第 ${seasonNumber} 季 · ${episodeRange}刷新成功`); } else { - // 全部失败 - const episodeRange = this.formatEpisodeRange(failEpisodes); - this.showToast(`《${showName}》第 ${seasonNumber} 季 · ${episodeRange}刷新失败`); - console.error('集刷新失败:', errors); + this.showToast(response.data.message || `《${showName}》第 ${seasonNumber} 季 · ${episodeRange}刷新失败`); } } else { @@ -5774,8 +5895,9 @@ } } - // 热更新数据 - await this.refreshCalendarData(); + // 仅刷新任务与本地剧集数据缓存，不触发季级刷新 + try { await this.loadTasklistMetadata(); } catch (e) {} + try { await this.loadCalendarEpisodesLocal(); } catch (e) {} } catch (error) { console.error('刷新单集元数据失败:', error); @@ -5797,17 +5919,16 @@ this.showToast('该任务未匹配季信息'); return; } - - // 先刷新剧级别详情（更新节目状态/最新季/海报等） + + // 先刷新剧级别详情（状态/海报等），失败不阻塞季刷新 try { await axios.get('/api/calendar/refresh_show', { params: { tmdb_id: task.match_tmdb_id } }); } catch (e) { - // 忽略失败，继续刷新季 - console.warn('刷新剧详情失败（忽略继续）:', e); + console.warn('刷新剧详情失败（忽略继续季刷新）:', e); } - + const response = await axios.get('/api/calendar/refresh_season', { params: { tmdb_id: task.match_tmdb_id, @@ -5819,24 +5940,18 @@ // 显示成功提示 this.showToast(response.data.message || '季元数据刷新成功'); - // 刷新任务数据，确保节目状态（如 本季终/已完结/已取消）及时更新 - // 同时更新集数数据（已转存集数/已播出集数/节目总集数） + // 刷新任务与本地剧集数据（不再触发季级刷新，避免重复日志/全量刷新） try { const tasksResponse = await axios.get('/api/calendar/tasks'); if (tasksResponse.data && tasksResponse.data.success) { this.calendar.tasks = tasksResponse.data.data.tasks; this.calendar.taskNames = this.calendar.tasks.map(task => task.task_name); - // 重新构建进度映射，确保任务列表和管理视图的集数数据正确更新 this.calendar.progressByShowName = this.buildProgressByShowNameFromTasks(this.calendar.tasks || [], this.calendar.progressByTaskName); - - // 重新计算内容类型，确保类型按钮能热更新 const rawTypes = tasksResponse.data.data.content_types || []; this.updateContentTypes(rawTypes); } } catch (e) {} - - // 热更新日历与本地剧集数据 - await this.refreshCalendarData(); + try { await this.loadCalendarEpisodesLocal(); } catch (e) {} } else { this.showToast(response.data.message || '季元数据刷新失败'); } @@ -5865,14 +5980,16 @@ task_name: currentName, content_type: task.content_type || '', tmdb_id: currentTmdbId || '', - season_number: currentSeason || '' + season_number: currentSeason || '', + local_air_time: (task.calendar_info && task.calendar_info.local_air_time) || '' }, form: { task_name: currentName, content_type: task.content_type || '', tmdb_id: '', season_number: currentSeason || 1, - custom_poster_url: '' + custom_poster_url: '', + local_air_time: (task.calendar_info && task.calendar_info.local_air_time) || '' }, display: { matched_label: matchedName ? `${matchedName}${matchedYear ? ' (' + matchedYear + ')' : ''}` : '未匹配', @@ -5937,15 +6054,47 @@ new_content_type: this.editMetadata.form.content_type, new_tmdb_id: this.editMetadata.form.tmdb_id, new_season_number: this.editMetadata.form.season_number, - custom_poster_url: this.editMetadata.form.custom_poster_url + custom_poster_url: this.editMetadata.form.custom_poster_url, + local_air_time: this.editMetadata.form.local_air_time }; + // 验证播出时间格式（如果填写了的话） + const airTimeStr = String(payload.local_air_time || '').trim(); + if (airTimeStr) { + // 验证格式是否为 HH:MM（24小时制，00:00 到 23:59） + const timePattern = /^([01]?[0-9]|2[0-3]):([0-5][0-9])$/; + if (!timePattern.test(airTimeStr)) { + // 停止加载动画 + this.editMetadata.loading = false; + // 手动隐藏 spinner，确保动画停止 + try { + var __sp = document.querySelector('#editMetadataModal .modal-title .spinner-border'); + if (__sp) { + __sp.style.display = 'none'; + } + } catch (e) {} + // 等待视图更新后再显示提示 + await this.$nextTick(); + this.showToast('播出时间格式不正确，请输入 HH:MM 格式，如 20:00'); + return; + } + } + // 如果没有任何变化则直接关闭 const noNameChange = (payload.new_task_name || '') === (this.editMetadata.original.task_name || ''); const noTypeChange = (payload.new_content_type || '') === (this.editMetadata.original.content_type || ''); const noRematch = !(payload.new_tmdb_id && String(payload.new_tmdb_id).trim()) && !(payload.new_season_number && String(payload.new_season_number).trim()); const noPosterChange = !(payload.custom_poster_url && String(payload.custom_poster_url).trim()); - if (noNameChange && noTypeChange && noRematch && noPosterChange) { + const noAirTimeChange = (String(payload.local_air_time || '') === String(this.editMetadata.original.local_air_time || '')); + if (noNameChange && noTypeChange && noRematch && noPosterChange && noAirTimeChange) { + // 重置加载状态 + this.editMetadata.loading = false; + try { + var __sp = document.querySelector('#editMetadataModal .modal-title .spinner-border'); + if (__sp) { + __sp.style.display = 'none'; + } + } catch (e) {} $('#editMetadataModal').modal('hide'); return; } @@ -5955,7 +6104,7 @@ this.showToast(res.data.message || '保存成功'); $('#editMetadataModal').modal('hide'); // 热更新任务与日历 - // 避免触发“未保存修改”提示：本次更新由后端变更引发 + // 避免触发"未保存修改"提示：本次更新由后端变更引发 this.suppressConfigModifiedOnce = true; // 本次操作来自编辑元数据，不应提示未保存 this.configModified = false; @@ -5990,8 +6139,26 @@ // 并行刷新：优先尽快更新任务列表的类型按钮与映射 try { const tasksPromise = axios.get('/api/calendar/tasks'); - // 同时后台刷新日历数据（不阻塞UI） - const refreshPromise = this.refreshCalendarData().catch(() => {}); + // 根据后端返回的信息，决定是否刷新以及刷新哪个节目 + // 只有在确实有修改（changed=true）且有有效的 tmdb_id 和 season_number 时才刷新 + let refreshPromise = Promise.resolve(); + if (res.data.changed && res.data.tmdb_id && res.data.season_number) { + // 只刷新被编辑的单个节目，使用 DEBUG 级别日志 + const tmdbIdToRefresh = parseInt(res.data.tmdb_id); + const seasonNumberToRefresh = parseInt(res.data.season_number); + if (tmdbIdToRefresh && seasonNumberToRefresh) { + // 直接调用 refresh_season API，使用 DEBUG 级别日志 + refreshPromise = axios.get('/api/calendar/refresh_season', { + params: { + tmdb_id: tmdbIdToRefresh, + season_number: seasonNumberToRefresh, + is_auto_refresh: 'false', + is_batch_refresh: 'false', + is_edit_metadata_refresh: 'true' + } + }).catch(() => {}); + } + } const tasksResponse = await tasksPromise; if (tasksResponse.data && tasksResponse.data.success) { this.calendar.tasks = tasksResponse.data.data.tasks || []; @@ -6026,9 +6193,10 @@ } await refreshPromise; // 再次触发缓存穿透，保证刷新后的数据也使用新时间戳 + // 使用后端返回的最新 tmdb_id（如果有） try { const nowTick = Date.now(); - const eid = (this.editMetadata.display && this.editMetadata.display.matched_tmdb_id) || (this.editMetadata.original && this.editMetadata.original.tmdb_id); + const eid = res.data.tmdb_id || (this.editMetadata.display && this.editMetadata.display.matched_tmdb_id) || (this.editMetadata.original && this.editMetadata.original.tmdb_id); const taskName = (this.editMetadata.original && this.editMetadata.original.task_name) || ''; const matchedLabel = (this.editMetadata.display && this.editMetadata.display.matched_label) || ''; const normalizeMatchedName = (label) => { @@ -6181,21 +6349,31 @@ if (res.data && res.data.success) { const latestFiles = res.data.data.latest_files || {}; const sig = this.calcLatestFilesSignature(latestFiles); + // 如果签名发生变化，说明有文件变化 if (sig && sig !== this.calendarLatestFilesSignature) { - // 更新签名，触发热更新 + // 如果当前签名为空，说明是首次初始化，只更新签名，不触发刷新 + const isFirstInit = !this.calendarLatestFilesSignature; + // 更新签名 this.calendarLatestFilesSignature = sig; // 先更新任务面板数据（若有显示） this.taskLatestFiles = latestFiles; this.taskLatestRecords = res.data.data.latest_records || {}; - // 同步重建“已转存”判定所需的进度映射，确保UI立即反映 + // 同步重建"已转存"判定所需的进度映射，确保UI立即反映 try { this.calendar.progressByTaskName = this.buildProgressByTaskNameFromLatestFiles(latestFiles); this.calendar.progressByShowName = this.buildProgressByShowNameFromTasks(this.calendar.tasks || [], this.calendar.progressByTaskName); } catch (e) {} - // 拉取并热更新日历 - await this.refreshCalendarData(); - // 同步“今日更新” - try { await this.loadTodayUpdatesLocal(); } catch (e) {} + // 如果不是首次初始化，且确实有文件变化，则触发刷新（遵守30分钟节流） + if (!isFirstInit && this.shouldAutoRefreshCalendar()) { + await this.refreshCalendarData(null, true, true); // isAutoRefresh=true + // 同步"今日更新" + try { await this.loadTodayUpdatesLocal(); } catch (e) {} + } else if (!isFirstInit) { + // 即使不刷新元数据（节流中），也要更新本地视图以反映文件变化 + try { await this.loadCalendarEpisodesLocal(); } catch (e) {} + try { await this.loadTodayUpdatesLocal(); } catch (e) {} + } + // 首次初始化时，只更新签名，不触发任何刷新 } } } catch (e) { @@ -10313,7 +10491,7 @@ // 如果当前是追剧日历页面，也刷新日历数据 if (this.activeTab === 'calendar') { - await this.refreshCalendarData(); + await this.refreshCalendarData(null, true); } } catch (error) { console.warn('触发热更新失败:', error); diff --git a/app/utils/task_extractor.py b/app/utils/task_extractor.py index ee9e6f3..b38347d 100644 --- a/app/utils/task_extractor.py +++ b/app/utils/task_extractor.py @@ -9,10 +9,6 @@ import re import os from typing import Dict, List, Optional, Tuple from datetime import datetime -import logging - -logger = logging.getLogger(__name__) - class TaskExtractor: def __init__(self): # 剧集编号提取模式 @@ -233,31 +229,19 @@ class TaskExtractor: Returns: 包含所有任务信息的列表 """ - logging.debug("TaskExtractor.extract_all_tasks_info 开始") - logging.debug(f"tasks数量: {len(tasks)}") - logging.debug(f"task_latest_files数量: {len(task_latest_files)}") - tasks_info = [] for i, task in enumerate(tasks): try: - logging.debug(f"处理第{i+1}个任务: {task.get('taskname', '')}") - task_name = task.get('taskname', '') save_path = task.get('savepath', '') latest_file = task_latest_files.get(task_name, '') - - logging.debug(f"task_name: {task_name}") - logging.debug(f"save_path: {save_path}") - logging.debug(f"latest_file: {latest_file}") - + # 提取基本信息 show_info = self.extract_show_info_from_path(save_path) - logging.debug(f"show_info: {show_info}") # 提取进度信息 progress_info = self.extract_progress_from_latest_file(latest_file) - logging.debug(f"progress_info: {progress_info}") # 优先使用任务显式类型（配置或提取出的），否则回退到路径判断 explicit_type = None @@ -283,16 +267,11 @@ class TaskExtractor: 'progress_type': progress_info.get('progress_type') } - logging.debug(f"task_info: {task_info}") tasks_info.append(task_info) except Exception as e: - logging.debug(f"处理任务 {i+1} 时出错: {e}") - import traceback - traceback.print_exc() continue - logging.debug(f"TaskExtractor.extract_all_tasks_info 完成，返回任务数量: {len(tasks_info)}") return tasks_info def get_content_type_display_name(self, content_type: str) -> str: From 4a2acea19e7c85d9810833417fef6fba68d8f37c Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Fri, 12 Dec 2025 21:29:08 +0800 Subject: [PATCH 11/34] =?UTF-8?q?=E5=AE=8C=E5=96=84=20Trakt=20=E5=88=9D?= =?UTF-8?q?=E6=AC=A1=E9=85=8D=E7=BD=AE=E9=80=BB=E8=BE=91=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BA=86=20API=20=E9=85=8D=E7=BD=AE=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增首次配置 Trakt Client ID 时全量同步播出时间并重算进度逻辑 - 优化系统配置页面：合并 API 配置模块并优化间距和交互体验 --- app/run.py | 121 ++++++++++++++++++++++++++++++++++++++- app/static/css/main.css | 28 ++++++++- app/templates/index.html | 48 ++++++---------- 3 files changed, 161 insertions(+), 36 deletions(-) diff --git a/app/run.py b/app/run.py index 70f7cfd..8108fe9 100644 --- a/app/run.py +++ b/app/run.py @@ -2294,6 +2294,13 @@ def update(): # 记录旧的播出集数刷新时间设置 old_perf = config_data.get('performance', {}) if isinstance(config_data, dict) else {} old_aired_refresh_time = old_perf.get('aired_refresh_time', '00:00') + # 记录旧的 Trakt Client ID，用于判断是否首次配置 + old_trakt_client_id = '' + try: + old_trakt_client_id = (config_data.get("trakt", {}) or {}).get("client_id", "") or "" + old_trakt_client_id = str(old_trakt_client_id).strip() + except Exception: + old_trakt_client_id = '' dont_save_keys = ["task_plugins_config_default", "api_token"] for key, value in request.json.items(): if key not in dont_save_keys: @@ -2330,6 +2337,13 @@ def update(): # 同步更新任务的插件配置 sync_task_plugins_config() + # 记录新的 Trakt Client ID + try: + new_trakt_client_id = (config_data.get("trakt", {}) or {}).get("client_id", "") or "" + new_trakt_client_id = str(new_trakt_client_id).strip() + except Exception: + new_trakt_client_id = '' + # 保存配置的执行步骤，异步执行 try: prev_tmdb = (config_data.get('tmdb_api_key') or '').strip() @@ -2342,7 +2356,7 @@ def update(): prev_tmdb, new_tmdb = '', None import threading - def _post_update_tasks(old_task_map_snapshot, prev_tmdb_value, new_tmdb_value, old_poster_lang, old_aired_refresh_time_value): + def _post_update_tasks(old_task_map_snapshot, prev_tmdb_value, new_tmdb_value, old_poster_lang, old_aired_refresh_time_value, prev_trakt_client_id_value, new_trakt_client_id_value): # 检查海报语言设置是否改变 new_poster_language = config_data.get('poster_language', 'zh-CN') if old_poster_lang != new_poster_language: @@ -2457,6 +2471,14 @@ def update(): except Exception as e: logging.warning(f"重启已播出集数更新任务失败: {e}") + # 若首次配置 Trakt Client ID，则为所有节目补齐播出时间 + try: + if (not prev_trakt_client_id_value) and new_trakt_client_id_value: + logging.info("首次配置 Trakt Client ID，开始全量同步节目播出时间") + sync_trakt_airtime_for_all_shows() + except Exception as e: + logging.warning(f"首次配置 Trakt 播出时间同步失败: {e}") + # 如果 TMDB API 从无到有，自动执行一次 bootstrap try: if (prev_tmdb_value == '' or prev_tmdb_value is None) and new_tmdb_value and new_tmdb_value != '': @@ -2473,7 +2495,7 @@ def update(): except Exception as e: logging.warning(f"自动初始化 bootstrap 失败: {e}") - threading.Thread(target=_post_update_tasks, args=(old_task_map, prev_tmdb, new_tmdb, old_poster_language, old_aired_refresh_time), daemon=True).start() + threading.Thread(target=_post_update_tasks, args=(old_task_map, prev_tmdb, new_tmdb, old_poster_language, old_aired_refresh_time, old_trakt_client_id, new_trakt_client_id), daemon=True).start() # 确保性能配置包含秒级字段 if not isinstance(config_data.get('performance'), dict): @@ -6359,6 +6381,101 @@ def update_episodes_air_date_local(cal_db: CalendarDB, tmdb_id: int, season_numb logging.debug(f"更新本地播出日期失败 tmdb_id={tmdb_id}: {_e}") +def sync_trakt_airtime_for_all_shows(): + """为所有已有节目同步一次 Trakt 播出时间（首次配置 Client ID 时使用）""" + try: + trakt_cfg = config_data.get("trakt", {}) if isinstance(config_data, dict) else {} + client_id = (trakt_cfg.get("client_id") or "").strip() + if not client_id: + logging.debug("Trakt Client ID 未配置，跳过全量播出时间同步") + return + local_tz = config_data.get("local_timezone", "Asia/Shanghai") + tsvc = TraktService(client_id=client_id) + if not tsvc.is_configured(): + logging.debug("TraktService 未配置，跳过全量播出时间同步") + return + + cal_db = CalendarDB() + shows = cal_db.get_all_shows() or [] + if not shows: + logging.debug("当前无节目可同步 Trakt 播出时间") + return + + total = len(shows) + synced = 0 + for show in shows: + tmdb_id = show.get("tmdb_id") + if tmdb_id is None or tmdb_id == "": + continue + try: + tmdb_id_int = int(tmdb_id) + except Exception: + continue + + try: + show_info = tsvc.get_show_by_tmdb_id(tmdb_id_int) + if not show_info or not show_info.get("trakt_id"): + logging.debug(f"未找到 Trakt 节目映射 tmdb_id={tmdb_id_int}") + continue + trakt_id = show_info.get("trakt_id") + airtime = tsvc.get_show_airtime(trakt_id) + if not airtime or not airtime.get("aired_time") or not airtime.get("timezone"): + logging.debug(f"Trakt 未返回播出时间 tmdb_id={tmdb_id_int}") + continue + + local_air_time = tsvc.convert_show_airtime_to_local( + airtime.get("aired_time"), airtime.get("timezone"), local_tz + ) or airtime.get("aired_time") + + cal_db.update_show_air_schedule( + tmdb_id_int, + local_air_time=local_air_time or "", + air_time_source=airtime.get("aired_time") or "", + air_timezone=airtime.get("timezone") or "", + ) + + # 同步已有集的本地播出日期 + try: + cursor = cal_db.conn.cursor() + cursor.execute( + "SELECT season_number, episode_number, air_date FROM episodes WHERE tmdb_id=?", + (tmdb_id_int,), + ) + rows = cursor.fetchall() + episodes_by_season = {} + for season_number, ep_number, air_date in rows: + episodes_by_season.setdefault(season_number, []).append( + {"episode_number": ep_number, "air_date": air_date} + ) + for season_number, eps in episodes_by_season.items(): + update_episodes_air_date_local(cal_db, tmdb_id_int, int(season_number), eps) + except Exception as _ep_err: + logging.debug(f"同步本地播出日期失败 tmdb_id={tmdb_id_int}: {_ep_err}") + + synced += 1 + except Exception as _single_err: + logging.debug(f"同步单个节目 Trakt 播出时间失败 tmdb_id={tmdb_id_int}: {_single_err}") + + if synced > 0: + try: + notify_calendar_changed('trakt_airtime_synced') + except Exception: + pass + try: + _trigger_airtime_reschedule('trakt_airtime_synced') + except Exception: + pass + # 首次全量同步后立即重算播出/转存进度并热更新 + try: + recompute_all_seasons_aired_daily() + except Exception as _recalc_err: + logging.debug(f"Trakt 全量同步后重算进度失败: {_recalc_err}") + + logging.info(f"Trakt 播出时间全量同步完成，成功 {synced}/{total}") + except Exception as e: + logging.warning(f"Trakt 播出时间全量同步失败: {e}") + + def get_poster_language_setting(): """获取海报语言设置""" return config_data.get('poster_language', 'zh-CN') diff --git a/app/static/css/main.css b/app/static/css/main.css index 5a2d7e1..602139a 100644 --- a/app/static/css/main.css +++ b/app/static/css/main.css @@ -188,8 +188,13 @@ main .row.title { margin-left: -15px; /* 添加负边距向左移动2px */ } -/* 精准调整：QASX API 模块与上方模块的垂直间距减小 8px */ -main .row.title[title^="QASX API"] { +/* 精准调整：性能设置模块与上方模块的垂直间距减小 8px */ +main .row.title[title*="配置文件加载、数据缓存和自动刷新的关键参数"] { + margin-top: 12px; +} + +/* 精准调整：API 模块与上方模块的垂直间距减小 8px */ +main .row.title[title*="配置与任务处理、节目元数据获取及外部服务交互相关的API访问凭证"] { margin-top: 12px; } @@ -7917,7 +7922,7 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { .tmdb-attribution a:hover, .tmdb-attribution a:focus { text-decoration: none; - color: inherit; + color: var(--focus-border-color); } /* 任务列表：类型筛选按钮与上方名称筛选区域的间距 */ @@ -8502,4 +8507,21 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { text-overflow: unset; /* 移除省略号，完整显示 */ padding-left: 5.5px; /* 窄屏设备日志行左边距 */ } +} + +/* API 配置模块样式 */ +.api-config-group + .api-config-group { + margin-top: 8px; +} + +.api-label-link { + text-decoration: none; + color: inherit; + cursor: pointer; +} + +.api-label-link:hover, +.api-label-link:focus { + color: var(--focus-border-color); + text-decoration: none; } \ No newline at end of file diff --git a/app/templates/index.html b/app/templates/index.html index 3625382..303b521 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -960,52 +960,38 @@
    -
    +
    -

    QASX API

    +

    API

    - +
    -
    +
    - Token + QASX Token
    - +
    - -
    -
    -

    TMDB API

    - - +
    +
    + + TMDB API 密钥
    +
    -
    +
    - API 密钥 + + Trakt Client ID +
    - +

    部分功能基于 TMDB 提供的数据实现，本应用与 TMDB 无关。

    -
    -
    -

    Trakt 配置

    - - - -
    -
    -
    -
    - Client ID -
    - -
    -
    @@ -2080,7 +2066,7 @@ From 03d9a0d0b717ce08056d1b4b4c1a96711b9e785b Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Sun, 14 Dec 2025 15:10:52 +0800 Subject: [PATCH 12/34] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20QASX=20Token=20?= =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BA=86=E9=83=A8=E5=88=86=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/static/css/main.css | 6 ++++++ app/templates/index.html | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/static/css/main.css b/app/static/css/main.css index 602139a..9df5f45 100644 --- a/app/static/css/main.css +++ b/app/static/css/main.css @@ -7909,6 +7909,12 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { cursor: text; } +/* QASX API Token 显示框背景色：与普通输入框保持一致，覆盖 disabled 状态的灰色背景 */ +.form-control.token-display:disabled, +.form-control.token-display[readonly] { + background-color: #fff !important; /* 与普通输入框背景色保持一致 */ +} + /* TMDB 说明文本样式与链接样式（继承颜色、无下划线、悬停不变） */ .tmdb-attribution { margin-top: 4px; diff --git a/app/templates/index.html b/app/templates/index.html index 303b521..d63e72e 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -876,9 +876,9 @@
    - 追剧日历时区 + 追剧日历时区
    - @@ -941,7 +941,7 @@
    -
    +
    播出集数刷新时间
    From 06adc79a1768b1f17a024fa14fd2b95a8a8d0c32 Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Tue, 16 Dec 2025 15:27:51 +0800 Subject: [PATCH 13/34] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=89=A7=E9=9B=86?= =?UTF-8?q?=E6=92=AD=E5=87=BA=E6=97=A5=E6=9C=9F=E5=81=8F=E7=A7=BB=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 支持在编辑元数据模态框内为（本地）播出时间显示和编辑播出日期偏移参数，对于转换时区后的本地播出时间，若产生了日期偏移，将自动补全偏移参数，也支持修改、添加或删除日期偏移参数，删除日期偏移将使用剧集在发行地的原始播出日期作为播出日期进行判定或显示 - 日期偏移会影响剧集的本地播出日期，从而影响剧集已播出集数和任务进度的计算 --- app/run.py | 603 +++++++++++++++++++++++---------------- app/sdk/db.py | 149 +++++++++- app/templates/index.html | 23 +- 3 files changed, 517 insertions(+), 258 deletions(-) diff --git a/app/run.py b/app/run.py index 8108fe9..e277c25 100644 --- a/app/run.py +++ b/app/run.py @@ -73,12 +73,12 @@ def _get_local_timezone() -> str: pass return "Asia/Shanghai" - def is_episode_aired(tmdb_id: int, season_number: int, episode_number: int, now_local_dt) -> bool: """ - 通用“单集是否已播出”判定： - 优先使用 Trakt 写入的本地播出时间，其次使用本地日期 + 节目级/全局播出时间， - 最后退回原有的“TMDB 日期 + 播出集数刷新时间”口径。 + 单集是否已播出判定： + 1. 始终使用 air_date_local（已考虑 air_date_offset）作为日期判断 + 2. 如果 air_date_local 不存在，说明播出时间未知，返回 False + 3. 始终使用 local_air_time 作为时间判断，如果不存在则使用播出集数刷新时间 """ try: tmdb_id = int(tmdb_id) @@ -87,12 +87,13 @@ def is_episode_aired(tmdb_id: int, season_number: int, episode_number: int, now_ except Exception: return False + # 从数据库获取集的播出时间信息 try: cal_db = CalendarDB() cur = cal_db.conn.cursor() cur.execute( """ - SELECT air_datetime_utc, air_datetime_local, air_date_local, air_date + SELECT air_date_local FROM episodes WHERE tmdb_id=? AND season_number=? AND episode_number=? """, @@ -101,156 +102,89 @@ def is_episode_aired(tmdb_id: int, season_number: int, episode_number: int, now_ row = cur.fetchone() if not row: return False - air_datetime_utc, air_datetime_local, air_date_local, air_date = row + air_date_local = row[0] except Exception: return False - # 1) 优先使用本地时区精确时间（来自 Trakt first_aired 转换） - try: - if air_datetime_local: - dt_local = datetime.fromisoformat(str(air_datetime_local)) - try: - return dt_local.timestamp() <= now_local_dt.timestamp() - except Exception: - # 若 now_local_dt 非 datetime，退化为直接比较字符串（保底，精度较差） - return str(air_datetime_local) <= str(now_local_dt) - except Exception: - pass + # 如果 air_date_local 不存在，说明播出时间未知，返回 False + if not air_date_local: + return False - # 获取节目级播出时间配置： - # - local_air_time: 本地播出时间（HH:MM） - # - air_time_source: 源时区播出时间（HH:MM） - # - air_timezone: 源时区名称（例如 America/New_York） + # 获取节目级播出时间配置 schedule = {} try: schedule = CalendarDB().get_show_air_schedule(tmdb_id) or {} except Exception: schedule = {} + + # 优先使用 local_air_time，如果不存在（为空或 None）则使用全局播出集数刷新时间 local_air_time = (schedule.get("local_air_time") or "").strip() or None - air_time_source = (schedule.get("air_time_source") or "").strip() or None - air_timezone = (schedule.get("air_timezone") or "").strip() or None - - # 全局播出集数刷新时间作为兜底 perf = config_data.get("performance", {}) if isinstance(config_data, dict) else {} refresh_time_str = perf.get("aired_refresh_time", "00:00") - time_fallback = local_air_time or refresh_time_str or "00:00" - - # 2) 若有 Trakt 节目级源时区播出时间：使用“源时区日期 + 源时区时间”做完整时区转换 - # 这一步会自然包含日期的前后偏移（例如美东周日 21:00 -> 北京时间周一 10:00） + + # 始终使用 local_air_time（如果存在），否则使用播出集数刷新时间 + time_to_use = local_air_time if local_air_time else refresh_time_str + + # 解析时间（HH:MM） + hh, mm = 0, 0 try: - if air_date and air_time_source and air_timezone: - try: - from zoneinfo import ZoneInfo as _ZoneInfo - except Exception: - _ZoneInfo = None # type: ignore - if _ZoneInfo is not None: - # air_date 视为源时区日期，air_time_source 视为源时区时间 - try: - src_date = datetime.strptime(str(air_date), "%Y-%m-%d").date() - except Exception: - src_date = None - if src_date is not None: - try: - hh_s, mm_s = [int(x) for x in str(air_time_source).split(":")] - except Exception: - hh_s, mm_s = 0, 0 - try: - from datetime import time as _dtime - src_time = _dtime(hour=hh_s, minute=mm_s) - src_dt_naive = datetime.combine(src_date, src_time) - src_dt = src_dt_naive.replace(tzinfo=_ZoneInfo(air_timezone)) - local_tz = _get_local_timezone() - local_dt = src_dt.astimezone(_ZoneInfo(local_tz)) - return local_dt.timestamp() <= now_local_dt.timestamp() - except Exception as _e: - # 源时区无效或转换失败，继续走后续兜底逻辑 - logging.debug(f"时区转换失败 tmdb_id={tmdb_id}, season={season_number}, ep={episode_number}: {_e}") - import traceback - logging.debug(f"时区转换异常堆栈: {traceback.format_exc()}") - pass + parts = str(time_to_use).split(":") + if len(parts) == 2: + hh = int(parts[0]) + mm = int(parts[1]) except Exception: - pass - - # 3) 退回到“本地日期 + 节目级/全局播出时间”（若已有本地日期字段，则继续利用） - try: - if air_date_local: - hh, mm = 0, 0 - try: - parts = str(time_fallback).split(":") - if len(parts) == 2: - hh = int(parts[0]) - mm = int(parts[1]) - except Exception: - hh, mm = 0, 0 - dt_str = f"{air_date_local} {hh:02d}:{mm:02d}:00" - try: - dt_ep_local = datetime.strptime(dt_str, "%Y-%m-%d %H:%M:%S") - if getattr(now_local_dt, "tzinfo", None) is not None: - dt_ep_local = dt_ep_local.replace(tzinfo=now_local_dt.tzinfo) - return dt_ep_local.timestamp() <= now_local_dt.timestamp() - except Exception as _e: - logging.debug(f"is_episode_aired 本地日期+播出时间判定异常: tmdb_id={tmdb_id}, season={season_number}, ep={episode_number}, error={_e}") - import traceback - logging.debug(f"本地日期+播出时间判定异常堆栈: {traceback.format_exc()}") - pass - except Exception: - pass - - # 3.1) 若只有 air_date 但存在节目级/全局播出时间，也按时间维度判定 - try: - if air_date and time_fallback: - hh, mm = 0, 0 - try: - parts = str(time_fallback).split(":") - if len(parts) == 2: - hh = int(parts[0]) - mm = int(parts[1]) - except Exception: - hh, mm = 0, 0 - dt_str = f"{air_date} {hh:02d}:{mm:02d}:00" - try: - dt_ep_local = datetime.strptime(dt_str, "%Y-%m-%d %H:%M:%S") - if getattr(now_local_dt, "tzinfo", None) is not None: - dt_ep_local = dt_ep_local.replace(tzinfo=now_local_dt.tzinfo) - return dt_ep_local.timestamp() <= now_local_dt.timestamp() - except Exception: - pass - except Exception: - pass - - # 4) 最后一层兜底：优先使用 air_date_local（如果存在），否则使用 TMDB 原始日期 - # 注意：现在集的播出日期已经是本地日期，需要结合播出时间来判断是否已播出 - # time_fallback 已经包含了节目级播出时间或全局播出集数刷新时间，应该总是使用它来判断 - try: - # 优先使用 air_date_local（已考虑时区转换的本地日期） - date_to_compare = air_date_local if air_date_local else air_date - if not date_to_compare: - return False - - # 总是使用 time_fallback（节目级播出时间或全局播出集数刷新时间）来判断 - # time_fallback 已经在前面定义为：local_air_time or refresh_time_str or "00:00" hh, mm = 0, 0 - try: - parts = str(time_fallback).split(":") - if len(parts) == 2: - hh = int(parts[0]) - mm = int(parts[1]) - except Exception: - hh, mm = 0, 0 - dt_str = f"{date_to_compare} {hh:02d}:{mm:02d}:00" - try: - dt_ep_local = datetime.strptime(dt_str, "%Y-%m-%d %H:%M:%S") - if getattr(now_local_dt, "tzinfo", None) is not None: - dt_ep_local = dt_ep_local.replace(tzinfo=now_local_dt.tzinfo) - return dt_ep_local.timestamp() <= now_local_dt.timestamp() - except Exception: - # 如果时间构建失败，退化为只比较日期（保底逻辑） - from datetime import datetime as _dt - today = _dt.now().strftime('%Y-%m-%d') - return str(date_to_compare) <= today - except Exception: + + # 组合日期和时间 + try: + dt_str = f"{air_date_local} {hh:02d}:{mm:02d}:00" + dt_ep_local = datetime.strptime(dt_str, "%Y-%m-%d %H:%M:%S") + # 如果 now_local_dt 有时区信息，为 dt_ep_local 也添加相同的时区信息 + if getattr(now_local_dt, "tzinfo", None) is not None: + dt_ep_local = dt_ep_local.replace(tzinfo=now_local_dt.tzinfo) + result = dt_ep_local.timestamp() <= now_local_dt.timestamp() + return result + except Exception as _e: + logging.debug(f"is_episode_aired 日期+时间判定异常: tmdb_id={tmdb_id}, season={season_number}, ep={episode_number}, error={_e}") + import traceback + logging.debug(f"异常堆栈: {traceback.format_exc()}") return False +def compute_aired_count_by_episode_check(tmdb_id: int, season_number: int, now_local_dt=None) -> int: + """ + 通过逐集调用 is_episode_aired 计算已播出集数（考虑播出时间） + 这是正确的计算方式，应该替代所有简单的日期比较逻辑 + """ + try: + from zoneinfo import ZoneInfo as _ZoneInfo + local_tz = _ZoneInfo(_get_local_timezone()) + if now_local_dt is None: + now_local_dt = datetime.now(local_tz) + except Exception: + if now_local_dt is None: + now_local_dt = datetime.now() + + try: + cal_db = CalendarDB() + cur = cal_db.conn.cursor() + cur.execute( + """ + SELECT episode_number FROM episodes + WHERE tmdb_id=? AND season_number=? + """, + (int(tmdb_id), int(season_number)), + ) + aired_count = 0 + for (ep_no,) in cur.fetchall() or []: + try: + if is_episode_aired(int(tmdb_id), int(season_number), int(ep_no), now_local_dt): + aired_count += 1 + except Exception: + continue + return aired_count + except Exception: + return 0 + def enrich_tasks_with_calendar_meta(tasks_info: list) -> list: """为任务列表注入日历相关元数据：节目状态、最新季处理后名称、已转存/已播出/本季总集数。 返回新的任务字典列表，增加以下字段： @@ -342,26 +276,31 @@ def enrich_tasks_with_calendar_meta(tasks_info: list) -> list: except Exception: transferred_by_task = {} - # 统计"已播出集数"：读取本地 episodes 表中有 air_date 且 <= 今天的集数 - # 注意：现在集的播出日期已经是本地日期，不需要通过播出集数刷新时间限制，直接使用今天的日期比较即可 + # 统计"已播出集数"：使用 is_episode_aired 逐集判断（考虑播出时间） + # 修复：不再使用简单的日期比较，而是逐集调用 is_episode_aired 判断是否已播出 from datetime import datetime as _dt - now = _dt.now() - today = now.strftime('%Y-%m-%d') + try: + from zoneinfo import ZoneInfo as _ZoneInfo + local_tz = _ZoneInfo(_get_local_timezone()) + now_local_dt = datetime.now(local_tz) + except Exception: + now_local_dt = datetime.now() + aired_by_show_season = {} try: - # 优先使用 air_date_local（已考虑时区转换的本地日期），如果为空则使用 air_date - # 直接使用今天的日期进行比较，不再通过播出集数刷新时间限制 + # 获取所有有剧集的节目和季 cur.execute( """ - SELECT tmdb_id, season_number, COUNT(1) FROM episodes - WHERE (air_date_local IS NOT NULL AND air_date_local != '' AND air_date_local <= ?) - OR (air_date_local IS NULL OR air_date_local = '') AND (air_date IS NOT NULL AND air_date != '' AND air_date <= ?) - GROUP BY tmdb_id, season_number - """, - (today, today) + SELECT DISTINCT tmdb_id, season_number FROM episodes + WHERE tmdb_id IS NOT NULL AND season_number IS NOT NULL + """ ) - for tid, sn, cnt in (cur.fetchall() or []): - aired_by_show_season[(int(tid), int(sn))] = int(cnt or 0) + for tid, sn in (cur.fetchall() or []): + try: + aired_count = compute_aired_count_by_episode_check(int(tid), int(sn), now_local_dt) + aired_by_show_season[(int(tid), int(sn))] = aired_count + except Exception: + continue except Exception: aired_by_show_season = {} @@ -707,20 +646,15 @@ def recompute_task_metrics_and_notify(task_name: str) -> bool: aired = metrics.get('aired_count') total = metrics.get('total_count') if aired in (None, 0) or total in (None, 0): - # 动态回退：使用今天的日期计算已播出集数，优先使用 air_date_local（已考虑时区转换） - # 注意：现在集的播出日期已经是本地日期，不需要通过播出集数刷新时间限制，直接使用今天的日期比较即可 - from datetime import datetime as _dt - today = _dt.now().strftime('%Y-%m-%d') - cur.execute( - """ - SELECT COUNT(1) FROM episodes - WHERE tmdb_id=? AND season_number=? - AND ((air_date_local IS NOT NULL AND air_date_local != '' AND air_date_local <= ?) - OR (air_date_local IS NULL OR air_date_local = '') AND (air_date IS NOT NULL AND air_date != '' AND air_date <= ?)) - """, - (tmdb_id, season_no, today, today) - ) - aired = int((cur.fetchone() or [0])[0]) + # 动态回退：使用 is_episode_aired 逐集判断计算已播出集数（考虑播出时间） + # 修复：不再使用简单的日期比较，而是逐集调用 is_episode_aired 判断是否已播出 + try: + from zoneinfo import ZoneInfo as _ZoneInfo + local_tz = _ZoneInfo(_get_local_timezone()) + now_local_dt = datetime.now(local_tz) + except Exception: + now_local_dt = datetime.now() + aired = compute_aired_count_by_episode_check(tmdb_id, season_no, now_local_dt) cur.execute('SELECT episode_count FROM seasons WHERE tmdb_id=? AND season_number=?', (tmdb_id, season_no)) row2 = cur.fetchone() total = int((row2 or [0])[0]) if row2 else 0 @@ -1586,6 +1520,15 @@ def recompute_show_aired_progress(tmdb_id: int, now_local_dt=None): cal_db = CalendarDB() cur = cal_db.conn.cursor() + # 获取节目名称（用于日志，仅影响可读性） + show_name = str(tmdb_id) + try: + cur.execute("SELECT name FROM shows WHERE tmdb_id=? LIMIT 1", (int(tmdb_id),)) + row = cur.fetchone() + if row and row[0]: + show_name = str(row[0]) + except Exception: + pass cur.execute( "SELECT season_number, episode_count FROM seasons WHERE tmdb_id=?", (int(tmdb_id),), @@ -1595,6 +1538,10 @@ def recompute_show_aired_progress(tmdb_id: int, now_local_dt=None): try: season_no_i = int(season_no) total_i = int(total or 0) + try: + logging.info(f">>> 开始执行 [{show_name} · 第 {season_no_i} 季] 播出状态刷新任务") + except Exception: + pass aired_i = 0 cur.execute( """ @@ -1614,6 +1561,10 @@ def recompute_show_aired_progress(tmdb_id: int, now_local_dt=None): denom = min(int(aired_i or 0), int(total_i or 0)) progress_pct = (100 * min(transferred_i, denom) // denom) if denom > 0 else 0 cal_db.upsert_season_metrics(int(tmdb_id), season_no_i, None, aired_i, total_i, progress_pct, now_ts) + try: + logging.info(f">>> [{show_name} · 第 {season_no_i} 季] 播出状态刷新任务执行成功") + except Exception: + pass except Exception: continue try: @@ -1627,7 +1578,7 @@ def recompute_show_aired_progress(tmdb_id: int, now_local_dt=None): except Exception: pass except Exception as e: - logging.warning(f">>> 节目播出进度刷新执行异常 tmdb_id={tmdb_id}: {e}") + logging.warning(f">>> 剧集播出状态刷新执行异常 tmdb_id={tmdb_id}: {e}") # 发生异常也安排一次补偿重试 try: _schedule_show_retry_in(int(tmdb_id), minutes_delay=10) @@ -1733,9 +1684,9 @@ def schedule_airtime_based_refresh_jobs(days_back: int = 2, days_forward: int = continue if _removed > 0: if tmdb_id is None: - logging.debug(f"已清理 {_removed} 个旧节目播出集数刷新任务") + logging.debug(f"已清理 {_removed} 个过期的剧集播出状态刷新任务") else: - logging.debug(f"已清理 {_removed} 个旧节目播出集数刷新任务 (tmdb_id={int(tmdb_id)})") + logging.debug(f"已清理 {_removed} 个过期的剧集播出状态刷新任务 (tmdb_id={int(tmdb_id)})") except Exception: pass @@ -1745,14 +1696,14 @@ def schedule_airtime_based_refresh_jobs(days_back: int = 2, days_forward: int = shows_need_catch = {} scheduled = 0 - # 预加载所有季的刷新时间戳，用于检查是否已经刷新过 + # 预加载所有季的刷新时间戳与当前已播集数，用于检查是否已经刷新过 season_refresh_times = {} try: - cur.execute('SELECT tmdb_id, season_number, updated_at FROM season_metrics') - for tid, sn, ua in (cur.fetchall() or []): + cur.execute('SELECT tmdb_id, season_number, updated_at, aired_count FROM season_metrics') + for tid, sn, ua, ac in (cur.fetchall() or []): key = (int(tid), int(sn)) if ua: - season_refresh_times[key] = int(ua) + season_refresh_times[key] = {"updated_at": int(ua), "aired_count": 0 if ac is None else int(ac)} except Exception: pass @@ -1774,22 +1725,28 @@ def schedule_airtime_based_refresh_jobs(days_back: int = 2, days_forward: int = pass job_id = f"aired_refresh_{tmdb_id}_{season_number}_{episode_number}_{target_dt.strftime('%Y%m%d%H%M')}" - + # 对于已过期的播出时间，检查是否需要补偿刷新 if target_dt <= now_local: tmdb_id_i = int(tmdb_id) season_no_i = int(season_number) - # 检查该季是否已经刷新过（通过 season_metrics 的 updated_at） + # 检查该季是否已经刷新过（通过 season_metrics 的 updated_at 和已播集数） need_refresh = True try: - refresh_ts = season_refresh_times.get((tmdb_id_i, season_no_i)) + refresh_info = season_refresh_times.get((tmdb_id_i, season_no_i)) or {} + refresh_ts = refresh_info.get("updated_at") + aired_cached = refresh_info.get("aired_count") + # 将播出时间转换为时间戳进行比较 + target_ts = int(target_dt.timestamp()) if refresh_ts: - # 将播出时间转换为时间戳进行比较 - target_ts = int(target_dt.timestamp()) - # 如果刷新时间晚于播出时间，说明已经刷新过，不需要补偿 - if refresh_ts >= target_ts: - need_refresh = False + # 如果刷新时间晚于播出时间，且已播集数已覆盖该集，则视为已刷新 + if refresh_ts >= target_ts and aired_cached is not None: + try: + if int(aired_cached) >= int(episode_number): + need_refresh = False + except Exception: + need_refresh = False except Exception: # 检查失败，保守处理：执行补偿刷新 pass @@ -1815,7 +1772,7 @@ def schedule_airtime_based_refresh_jobs(days_back: int = 2, days_forward: int = ) scheduled += 1 except Exception as _e: - logging.debug(f"安排节目播出集数刷新失败 tmdb_id={tmdb_id}: {_e}") + logging.debug(f"安排剧集播出状态刷新失败 tmdb_id={tmdb_id}: {_e}") continue # 执行补偿刷新：对于需要补偿的节目，立即刷新 @@ -1830,7 +1787,7 @@ def schedule_airtime_based_refresh_jobs(days_back: int = 2, days_forward: int = if scheduler.state == 0: scheduler.start() if scheduled > 0: - logging.debug(f"已更新 {scheduled} 个节目播出集数刷新任务") + logging.debug(f"已更新 {scheduled} 个剧集播出状态刷新任务") except Exception as e: logging.warning(f"按播出时间调度刷新失败: {e}") @@ -1841,11 +1798,11 @@ def _trigger_airtime_reschedule(reason: str = "", tmdb_id: int = None): schedule_airtime_based_refresh_jobs(tmdb_id=tmdb_id) if reason: if tmdb_id is None: - logging.debug(f"已重新安排节目播出集数刷新任务，原因: {reason}") + logging.debug(f"已重新安排剧集播出状态刷新任务，原因: {reason}") else: - logging.debug(f"已重新安排节目播出集数刷新任务，原因: {reason}, tmdb_id={int(tmdb_id)}") + logging.debug(f"已重新安排剧集播出状态刷新任务，原因: {reason}, tmdb_id={int(tmdb_id)}") except Exception as e: - logging.debug(f"重新安排节目播出集数刷新任务失败({reason}): {e}") + logging.debug(f"重新安排剧集播出状态刷新任务失败({reason}): {e}") def restart_daily_aired_update_job(): @@ -4222,6 +4179,23 @@ def reload_tasks(): # 更新记录的值 _last_crontab = crontab _last_crontab_delay = delay_str + + # 每次 reload_tasks() 会调用 scheduler.remove_all_jobs()，会把“按播出时间”的 DateTrigger 一起清掉。 + # 这里参考 __main__ 中的启动流程，在重载后立即重新注册： + try: + restart_calendar_refresh_job() + except Exception: + pass + try: + restart_daily_aired_update_job() + except Exception: + pass + try: + # 重新计算并注册所有节目/指定节目的“播出状态刷新任务” + _trigger_airtime_reschedule('startup') + except Exception: + pass + # 不再冗余输出现有任务列表 return True else: @@ -5624,12 +5598,15 @@ def get_calendar_tasks(): if not (config_ct and str(config_ct).strip()): if t.get('matched_content_type'): t['content_type'] = t['matched_content_type'] - # 从数据库获取 local_air_time 并添加到 calendar_info 中供前端读取 + # 从数据库获取 local_air_time 和 air_date_offset 并添加到 calendar_info 中供前端读取 try: - local_air_time = matched_show.get('local_air_time') or '' + schedule = cal_db.get_show_air_schedule(int(matched_show.get('tmdb_id'))) or {} + local_air_time = schedule.get('local_air_time') or '' + air_date_offset = schedule.get('air_date_offset') or 0 if not t.get('calendar_info'): t['calendar_info'] = {} t['calendar_info']['local_air_time'] = local_air_time + t['calendar_info']['air_date_offset'] = air_date_offset except Exception: pass else: @@ -5662,11 +5639,14 @@ def get_calendar_tasks(): ) if effective_latest: t['matched_latest_season_number'] = effective_latest - # 从完整信息中获取 local_air_time - local_air_time = full_show.get('local_air_time') or '' + # 从完整信息中获取 local_air_time 和 air_date_offset + schedule = cal_db.get_show_air_schedule(int(bound_show[0])) or {} + local_air_time = schedule.get('local_air_time') or '' + air_date_offset = schedule.get('air_date_offset') or 0 if not t.get('calendar_info'): t['calendar_info'] = {} t['calendar_info']['local_air_time'] = local_air_time + t['calendar_info']['air_date_offset'] = air_date_offset except Exception: pass # 从数据库获取实际的内容类型（如果已设置） @@ -6312,6 +6292,7 @@ def details_of_season_episode_count(tmdb_service: TMDBService, tmdb_id: int, sea def update_episodes_air_date_local(cal_db: CalendarDB, tmdb_id: int, season_number: int, episodes: list): """ 辅助函数：如果有 Trakt 的源时间/时区，计算每集的本地播出日期并更新 air_date_local + 如果用户手动设置了 air_date_offset，优先使用该偏移值而不是重新计算 Args: cal_db: CalendarDB 实例 @@ -6320,36 +6301,75 @@ def update_episodes_air_date_local(cal_db: CalendarDB, tmdb_id: int, season_numb episodes: 集列表（包含 air_date 字段） """ try: - # 从 shows 表读取 Trakt 的源时间/时区 + # 从 shows 表读取 Trakt 的源时间/时区和用户手动设置的偏移值 show = cal_db.get_show(int(tmdb_id)) if not show: return air_time_source = show.get('air_time_source') or '' air_timezone = show.get('air_timezone') or '' + # 获取用户手动设置的日期偏移值（如果存在） + schedule = cal_db.get_show_air_schedule(int(tmdb_id)) or {} + manual_air_date_offset = schedule.get('air_date_offset') + local_air_time = schedule.get('local_air_time') or '' + # 获取是否手动设置的标记（只有用户在 WebUI 编辑元数据页面修改并保存后才为 True） + air_date_offset_manually_set = schedule.get('air_date_offset_manually_set', False) + + # 重要：判断是否应该自动计算 air_date_offset + # 判断标准： + # 1. 默认 is_manually_set 为 False + # 2. 只有当 air_date_offset_manually_set 为 True 时（用户在 WebUI 编辑元数据页面修改并保存过），才认为是手动设置的 + # 3. 这样初始化时即使 air_date_offset 是 0，也会自动计算正确的偏移值 + is_manually_set = bool(air_date_offset_manually_set) + + # 如果 manual_air_date_offset 是 None，设置为 0 用于计算 + if manual_air_date_offset is None: + manual_air_date_offset = 0 + + # 如果用户手动设置了偏移值（且没有时区信息），直接使用偏移值计算 if not air_time_source or not air_timezone: - # 修复：当没有 Trakt 时区信息时，将 air_date_local 设置为与 air_date 相同的值 - # 这样可以确保前端显示正确的日期（当 calendar_timezone_mode='local' 时） - for ep in episodes: - ep_air_date = ep.get('air_date') or '' - ep_number = ep.get('episode_number') or 0 - if ep_air_date and ep_number: - try: - cal_db.update_episode_air_date_local( - int(tmdb_id), - int(season_number), - int(ep_number), - ep_air_date - ) - except Exception as _e_sync: - logging.debug(f"同步 air_date 到 air_date_local 失败 tmdb_id={tmdb_id}, season={season_number}, ep={ep_number}: {_e_sync}") - return + if is_manually_set: + # 用户手动设置了偏移值，使用偏移值计算 air_date_local + for ep in episodes: + ep_air_date = ep.get('air_date') or '' + ep_number = ep.get('episode_number') or 0 + if ep_air_date and ep_number: + try: + from datetime import datetime as _dt, timedelta as _td + src_date = _dt.strptime(ep_air_date, '%Y-%m-%d').date() + adjusted_date = src_date + _td(days=manual_air_date_offset) + cal_db.update_episode_air_date_local( + int(tmdb_id), + int(season_number), + int(ep_number), + adjusted_date.strftime('%Y-%m-%d') + ) + except Exception as _e_sync: + logging.debug(f"使用手动偏移值更新 air_date_local 失败 tmdb_id={tmdb_id}, season={season_number}, ep={ep_number}: {_e_sync}") + return + else: + # 没有时区信息且没有手动偏移值，将 air_date_local 设置为与 air_date 相同的值 + for ep in episodes: + ep_air_date = ep.get('air_date') or '' + ep_number = ep.get('episode_number') or 0 + if ep_air_date and ep_number: + try: + cal_db.update_episode_air_date_local( + int(tmdb_id), + int(season_number), + int(ep_number), + ep_air_date + ) + except Exception as _e_sync: + logging.debug(f"同步 air_date 到 air_date_local 失败 tmdb_id={tmdb_id}, season={season_number}, ep={ep_number}: {_e_sync}") + return # 获取本地时区配置 local_tz = config_data.get("local_timezone", "Asia/Shanghai") try: from zoneinfo import ZoneInfo as _ZoneInfo - from datetime import datetime as _dt, time as _dtime + from datetime import datetime as _dt, time as _dtime, timedelta as _td + date_offset = None # 用于存储计算出的日期偏移 for ep in episodes: ep_air_date = ep.get('air_date') or '' ep_number = ep.get('episode_number') or 0 @@ -6357,15 +6377,28 @@ def update_episodes_air_date_local(cal_db: CalendarDB, tmdb_id: int, season_numb try: # 解析 TMDB air_date 作为源时区日期 src_date = _dt.strptime(ep_air_date, '%Y-%m-%d').date() - # 解析源时区时间 - hh, mm = [int(x) for x in air_time_source.split(':')] - src_time = _dtime(hour=hh, minute=mm) - # 组合成源时区 datetime - src_dt = _dt.combine(src_date, src_time) - src_dt = src_dt.replace(tzinfo=_ZoneInfo(air_timezone)) - # 转换到本地时区 - local_dt = src_dt.astimezone(_ZoneInfo(local_tz)) - air_date_local = local_dt.strftime('%Y-%m-%d') + + # 如果用户手动设置了偏移值（包括手动设置为0），优先使用手动偏移值 + if is_manually_set: + adjusted_date = src_date + _td(days=manual_air_date_offset) + air_date_local = adjusted_date.strftime('%Y-%m-%d') + date_offset = manual_air_date_offset + else: + # 否则通过时区转换计算 + # 解析源时区时间 + hh, mm = [int(x) for x in air_time_source.split(':')] + src_time = _dtime(hour=hh, minute=mm) + # 组合成源时区 datetime + src_dt = _dt.combine(src_date, src_time) + src_dt = src_dt.replace(tzinfo=_ZoneInfo(air_timezone)) + # 转换到本地时区 + local_dt = src_dt.astimezone(_ZoneInfo(local_tz)) + air_date_local = local_dt.strftime('%Y-%m-%d') + # 计算日期偏移（如果还未计算） + if date_offset is None: + local_date = _dt.strptime(air_date_local, '%Y-%m-%d').date() + date_offset = (local_date - src_date).days + # 更新数据库 cal_db.update_episode_air_date_local( int(tmdb_id), @@ -6375,6 +6408,17 @@ def update_episodes_air_date_local(cal_db: CalendarDB, tmdb_id: int, season_numb ) except Exception as _e_local: logging.debug(f"计算本地播出日期失败 tmdb_id={tmdb_id}, season={season_number}, ep={ep_number}: {_e_local}") + + # 如果计算出了日期偏移且用户没有手动设置，存储到数据库 + # 这里的 date_offset 是通过时区转换计算出的偏移值（例如：美东周日 21:00 -> 北京时间周一 10:00，偏移 +1） + if date_offset is not None and not is_manually_set: + try: + cal_db.update_show_air_schedule( + int(tmdb_id), + air_date_offset=date_offset + ) + except Exception as _offset_err: + logging.debug(f"存储日期偏移失败 tmdb_id={tmdb_id}: {_offset_err}") except Exception as _e_batch: logging.debug(f"批量更新本地播出日期失败 tmdb_id={tmdb_id}, season={season_number}: {_e_batch}") except Exception as _e: @@ -6853,16 +6897,15 @@ def calendar_refresh_latest_season(): ) # 写回 season_metrics（air/total），transferred 留待聚合更新 try: - # 使用今天的日期计算已播出集数 - # 注意：现在集的播出日期已经是本地日期，不需要通过播出集数刷新时间限制，直接使用今天的日期比较即可 - from datetime import datetime as _dt - today = _dt.now().strftime('%Y-%m-%d') - cur = cal_db.conn.cursor() - cur.execute(""" - SELECT COUNT(1) FROM episodes - WHERE tmdb_id=? AND season_number=? AND air_date IS NOT NULL AND air_date != '' AND air_date <= ? - """, (int(tmdb_id), int(latest_season), today)) - aired_cnt = int((cur.fetchone() or [0])[0]) + # 使用 is_episode_aired 逐集判断计算已播出集数（考虑播出时间） + # 修复：不再使用简单的日期比较，而是逐集调用 is_episode_aired 判断是否已播出 + try: + from zoneinfo import ZoneInfo as _ZoneInfo + local_tz = _ZoneInfo(_get_local_timezone()) + now_local_dt = datetime.now(local_tz) + except Exception: + now_local_dt = datetime.now() + aired_cnt = compute_aired_count_by_episode_check(int(tmdb_id), int(latest_season), now_local_dt) progress_pct = 0 from time import time as _now cal_db.upsert_season_metrics(int(tmdb_id), int(latest_season), None, aired_cnt, int(len(episodes)), int(progress_pct), int(_now())) @@ -7432,10 +7475,44 @@ def calendar_edit_metadata(): target['calendar_info'] = {} if local_air_time or cal.get('local_air_time'): # 允许用户清空播出时间（回退到 Trakt 自动推断或全局刷新时间） - norm_old = str(cal.get('local_air_time') or '').strip() + # 从数据库获取当前的播出时间和偏移值，而不是从 cal 中获取（可能不准确） + old_offset = 0 + old_air_time_only = '' + if old_tmdb_id: + try: + cal_db_for_offset = CalendarDB() + schedule_for_offset = cal_db_for_offset.get_show_air_schedule(int(old_tmdb_id)) or {} + old_air_time_only = schedule_for_offset.get('local_air_time') or '' + old_offset = schedule_for_offset.get('air_date_offset') or 0 + except Exception: + old_air_time_only = str(cal.get('local_air_time') or '').strip() + old_offset = cal.get('air_date_offset') or 0 + else: + old_air_time_only = str(cal.get('local_air_time') or '').strip() + old_offset = cal.get('air_date_offset') or 0 + + norm_old = old_air_time_only # 只使用时间部分，不包含偏移值 norm_new = str(local_air_time or '').strip() - if norm_new != norm_old: - target['calendar_info']['local_air_time'] = norm_new + + # 解析新的播出时间字符串，提取时间和日期偏移 + air_time_only_new = norm_new + air_date_offset_new = 0 + offset_match = re.match(r'^([01]?[0-9]|2[0-3]):([0-5][0-9])\s+([+-])(\d+)d$', norm_new) + if offset_match: + air_time_only_new = offset_match.group(1) + ':' + offset_match.group(2) + sign = offset_match.group(3) + days = int(offset_match.group(4)) + air_date_offset_new = days if sign == '+' else -days + + # 比较时间部分和偏移值，只要有一个不同就需要更新 + time_changed = (air_time_only_new != norm_old) or (air_date_offset_new != old_offset) + if time_changed: + # 使用已解析的值 + air_time_only = air_time_only_new + air_date_offset = air_date_offset_new + + target['calendar_info']['local_air_time'] = air_time_only + target['calendar_info']['air_date_offset'] = air_date_offset changed = True local_air_time_changed = True # 用户手动设置播出时间：仅以本地时间为准，同时清空节目级源时区设置， @@ -7443,12 +7520,51 @@ def calendar_edit_metadata(): try: if old_tmdb_id: cal_db_for_air = CalendarDB() + # 保留原有的 air_time_source 和 air_timezone（不清空），但使用手动设置的偏移值 + # 这样 update_episodes_air_date_local 可以优先使用手动偏移值 + # 如果日期偏移发生变化，或者时间部分发生变化，都标记为手动设置 + # 因为用户通过 WebUI 编辑元数据页面修改了播出时间，无论是否改变了偏移值，都应该标记为手动设置 + should_mark_manually_set = (air_date_offset != old_offset) or (air_time_only_new != norm_old) + cal_db_for_air.update_show_air_schedule( int(old_tmdb_id), - local_air_time=norm_new, - air_time_source="", - air_timezone="", + local_air_time=air_time_only, + air_date_offset=air_date_offset, + air_date_offset_manually_set=True if should_mark_manually_set else None, ) + # 如果日期偏移发生变化，重新计算所有集的 air_date_local + if air_date_offset != old_offset: + try: + cursor = cal_db_for_air.conn.cursor() + cursor.execute( + "SELECT season_number, episode_number, air_date FROM episodes WHERE tmdb_id=? AND air_date IS NOT NULL AND air_date != ''", + (int(old_tmdb_id),), + ) + rows = cursor.fetchall() + episodes_by_season = {} + for season_number, ep_number, air_date in rows: + episodes_by_season.setdefault(season_number, []).append( + {"episode_number": ep_number, "air_date": air_date} + ) + updated_count = 0 + for season_number, eps in episodes_by_season.items(): + # 使用新的偏移值重新计算 air_date_local + for ep in eps: + try: + from datetime import datetime as _dt, timedelta as _td + src_date = _dt.strptime(ep['air_date'], '%Y-%m-%d').date() + adjusted_date = src_date + _td(days=air_date_offset) + cal_db_for_air.update_episode_air_date_local( + int(old_tmdb_id), + int(season_number), + int(ep['episode_number']), + adjusted_date.strftime('%Y-%m-%d') + ) + updated_count += 1 + except Exception as _ep_err: + logging.debug(f"更新集日期失败 tmdb_id={old_tmdb_id}, season={season_number}, ep={ep['episode_number']}: {_ep_err}") + except Exception as _recalc_date_err: + logging.debug(f"重新计算集日期失败 tmdb_id={old_tmdb_id}: {_recalc_date_err}") # 变更播出时间后，立即重算该节目的已播/进度并通知前端，确保热更新 try: recompute_show_aired_progress(int(old_tmdb_id)) @@ -7638,16 +7754,15 @@ def calendar_edit_metadata(): cal_db.update_show_latest_season_number(int(new_tid), int(season_no)) # 写回 season_metrics（air/total），transferred 留给聚合环节补齐 try: - # 使用今天的日期计算已播出集数 - # 注意：现在集的播出日期已经是本地日期，不需要通过播出集数刷新时间限制，直接使用今天的日期比较即可 - from datetime import datetime as _dt - today = _dt.now().strftime('%Y-%m-%d') - cur = cal_db.conn.cursor() - cur.execute(""" - SELECT COUNT(1) FROM episodes - WHERE tmdb_id=? AND season_number=? AND air_date IS NOT NULL AND air_date != '' AND air_date <= ? - """, (int(new_tid), int(season_no), today)) - aired_cnt = int((cur.fetchone() or [0])[0]) + # 使用 is_episode_aired 逐集判断计算已播出集数（考虑播出时间） + # 修复：不再使用简单的日期比较，而是逐集调用 is_episode_aired 判断是否已播出 + try: + from zoneinfo import ZoneInfo as _ZoneInfo + local_tz = _ZoneInfo(_get_local_timezone()) + now_local_dt = datetime.now(local_tz) + except Exception: + now_local_dt = datetime.now() + aired_cnt = compute_aired_count_by_episode_check(int(new_tid), int(season_no), now_local_dt) progress_pct = 0 # 此处无 transferred_count，百分比暂置 0，由聚合环节补齐 from time import time as _now cal_db.upsert_season_metrics(int(new_tid), int(season_no), None, aired_cnt, int(len(eps)), int(progress_pct), int(_now())) @@ -8260,6 +8375,7 @@ def get_calendar_episodes_local(): return jsonify({'success': True, 'data': {'episodes': [], 'total': 0}}) eps = db.list_latest_season_episodes(int(tmdb_id), int(show['latest_season_number'])) # 根据 calendar_timezone_mode 选择使用 air_date 还是 air_date_local + # air_date_local 应该已经包含了偏移值，直接使用即可 for e in eps: if calendar_timezone_mode == 'local' and e.get('air_date_local'): e['display_air_date'] = e['air_date_local'] @@ -8280,6 +8396,7 @@ def get_calendar_episodes_local(): # 返回全部最新季汇总（供周视图合并展示） eps = db.list_all_latest_episodes() # 根据 calendar_timezone_mode 选择使用 air_date 还是 air_date_local + # air_date_local 应该已经包含了偏移值，直接使用即可 for e in eps: if calendar_timezone_mode == 'local' and e.get('air_date_local'): e['display_air_date'] = e['air_date_local'] diff --git a/app/sdk/db.py b/app/sdk/db.py index 802ea8f..464855d 100644 --- a/app/sdk/db.py +++ b/app/sdk/db.py @@ -383,6 +383,15 @@ class CalendarDB: # 节目级播出地时区（Trakt airs.timezone，例如 America/New_York） if 'air_timezone' not in columns: cursor.execute('ALTER TABLE shows ADD COLUMN air_timezone TEXT') + columns.append('air_timezone') + # 日期偏移（air_date 转换为 air_date_local 时的日期偏移天数，+1表示延后一天，-1表示提前一天，0表示无偏移） + if 'air_date_offset' not in columns: + cursor.execute('ALTER TABLE shows ADD COLUMN air_date_offset INTEGER DEFAULT 0') + columns.append('air_date_offset') + # 标记 air_date_offset 是否由用户手动设置（通过 WebUI 编辑元数据页面） + if 'air_date_offset_manually_set' not in columns: + cursor.execute('ALTER TABLE shows ADD COLUMN air_date_offset_manually_set INTEGER DEFAULT 0') + columns.append('air_date_offset_manually_set') # seasons cursor.execute(''' @@ -856,12 +865,14 @@ class CalendarDB: return value or None @retry_on_locked(max_retries=3, base_delay=0.1) - def update_show_air_schedule(self, tmdb_id: int, local_air_time=None, air_time_source=None, air_timezone=None): + def update_show_air_schedule(self, tmdb_id: int, local_air_time=None, air_time_source=None, air_timezone=None, air_date_offset=None, air_date_offset_manually_set=None): """ 批量更新节目的播出时间相关字段： - local_air_time: 本地时区统一播出时间（HH:MM） - air_time_source: 源时区播出时间（Trakt airs.time，HH:MM） - air_timezone: 源时区名称（Trakt airs.timezone，例如 America/New_York） + - air_date_offset: 日期偏移天数（+1表示延后一天，-1表示提前一天，0表示无偏移） + - air_date_offset_manually_set: 标记 air_date_offset 是否由用户手动设置（1表示手动设置，0表示自动计算） 传入 None 表示不更新该字段；传入空字符串表示清空。 """ fields = [] @@ -875,13 +886,21 @@ class CalendarDB: if air_timezone is not None: fields.append("air_timezone=?") params.append((air_timezone or "").strip()) + if air_date_offset is not None: + fields.append("air_date_offset=?") + params.append(int(air_date_offset) if air_date_offset is not None else 0) + if air_date_offset_manually_set is not None: + fields.append("air_date_offset_manually_set=?") + params.append(1 if air_date_offset_manually_set else 0) if not fields: return False cursor = self.conn.cursor() params.append(tmdb_id) - cursor.execute(f'UPDATE shows SET {", ".join(fields)} WHERE tmdb_id=?', params) + sql = f'UPDATE shows SET {", ".join(fields)} WHERE tmdb_id=?' + cursor.execute(sql, params) + rowcount = cursor.rowcount self.conn.commit() - return cursor.rowcount > 0 + return rowcount > 0 @retry_on_locked(max_retries=3, base_delay=0.1) def get_show_air_schedule(self, tmdb_id: int): @@ -890,23 +909,137 @@ class CalendarDB: - local_air_time: 本地统一播出时间（HH:MM） - air_time_source: 源时区播出时间（HH:MM） - air_timezone: 源时区名称 + - air_date_offset: 日期偏移天数（+1表示延后一天，-1表示提前一天，0表示无偏移） + + 如果发现没有 air_date_offset 但有时区信息，会自动从已有集数据计算并补上偏移值 """ cursor = self.conn.cursor() try: cursor.execute( - 'SELECT local_air_time, air_time_source, air_timezone FROM shows WHERE tmdb_id=?', + 'SELECT local_air_time, air_time_source, air_timezone, air_date_offset, air_date_offset_manually_set FROM shows WHERE tmdb_id=?', (tmdb_id,), ) except Exception: - return None + # 兼容旧版本数据库（可能没有 air_date_offset 或 air_date_offset_manually_set 字段） + try: + # 先尝试查询包含 air_date_offset 但不包含 air_date_offset_manually_set 的情况 + try: + cursor.execute( + 'SELECT local_air_time, air_time_source, air_timezone, air_date_offset FROM shows WHERE tmdb_id=?', + (tmdb_id,), + ) + row = cursor.fetchone() + if not row: + return None + air_time_source = (row[1] or "").strip() if row[1] is not None else "" + air_timezone = (row[2] or "").strip() if row[2] is not None else "" + air_date_offset = int(row[3]) if row[3] is not None else 0 + air_date_offset_manually_set = 0 # 旧数据默认为未手动设置 + return { + "local_air_time": (row[0] or "").strip() if row[0] is not None else "", + "air_time_source": air_time_source, + "air_timezone": air_timezone, + "air_date_offset": air_date_offset, + "air_date_offset_manually_set": bool(air_date_offset_manually_set), + } + except Exception: + # 如果连 air_date_offset 字段都没有，使用最旧的查询方式 + cursor.execute( + 'SELECT local_air_time, air_time_source, air_timezone FROM shows WHERE tmdb_id=?', + (tmdb_id,), + ) + row = cursor.fetchone() + if not row: + return None + air_time_source = (row[1] or "").strip() if row[1] is not None else "" + air_timezone = (row[2] or "").strip() if row[2] is not None else "" + air_date_offset = 0 + air_date_offset_manually_set = 0 + return { + "local_air_time": (row[0] or "").strip() if row[0] is not None else "", + "air_time_source": air_time_source, + "air_timezone": air_timezone, + "air_date_offset": air_date_offset, + "air_date_offset_manually_set": bool(air_date_offset_manually_set), + } + except Exception: + return None row = cursor.fetchone() if not row: return None - return { + air_time_source = (row[1] or "").strip() if row[1] is not None else "" + air_timezone = (row[2] or "").strip() if row[2] is not None else "" + air_date_offset = int(row[3]) if row[3] is not None else 0 + air_date_offset_manually_set = int(row[4]) if row[4] is not None else 0 + + # 重要：不要自动计算并覆盖偏移值！ + # 如果用户手动设置了偏移值（即使为0），应该保持原值 + # 只有在确实没有偏移值（NULL）且有时区信息时，才尝试自动计算 + # 但这里我们不再自动计算，因为可能会覆盖用户手动设置的值 + # 如果需要自动计算，应该在初始同步时进行，而不是在读取时 + + result = { "local_air_time": (row[0] or "").strip() if row[0] is not None else "", - "air_time_source": (row[1] or "").strip() if row[1] is not None else "", - "air_timezone": (row[2] or "").strip() if row[2] is not None else "", + "air_time_source": air_time_source, + "air_timezone": air_timezone, + "air_date_offset": air_date_offset, + "air_date_offset_manually_set": bool(air_date_offset_manually_set), } + return result + + def _calculate_date_offset_from_existing_episodes(self, tmdb_id: int) -> int: + """ + 从已有集数据计算日期偏移（用于自动补上旧数据的偏移值） + """ + try: + cursor = self.conn.cursor() + # 获取最新季的前几集，比较 air_date 和 air_date_local + cursor.execute( + """ + SELECT e.air_date, e.air_date_local + FROM episodes e + INNER JOIN shows s ON e.tmdb_id = s.tmdb_id + WHERE e.tmdb_id=? AND e.season_number=? + AND e.air_date IS NOT NULL AND e.air_date != '' + AND e.air_date_local IS NOT NULL AND e.air_date_local != '' + ORDER BY e.episode_number ASC + LIMIT 5 + """, + (int(tmdb_id), self.get_show(int(tmdb_id)).get('latest_season_number') or 1) + ) + rows = cursor.fetchall() + + if not rows: + return 0 + + # 计算每集的日期差异，取最常见的偏移值 + offsets = [] + from datetime import datetime as _dt + for air_date, air_date_local in rows: + try: + date_orig = _dt.strptime(str(air_date), "%Y-%m-%d").date() + date_local = _dt.strptime(str(air_date_local), "%Y-%m-%d").date() + offset = (date_local - date_orig).days + offsets.append(offset) + except Exception: + continue + + if not offsets: + return 0 + + # 返回最常见的偏移值（如果所有集的偏移都相同，则使用该值） + if len(set(offsets)) == 1: + return offsets[0] + + # 如果偏移不一致，返回最常见的偏移值 + from collections import Counter + most_common = Counter(offsets).most_common(1) + if most_common: + return most_common[0][0] + + return 0 + except Exception: + return 0 @retry_on_locked(max_retries=3, base_delay=0.1) def get_shows_by_content_type(self, content_type:str): diff --git a/app/templates/index.html b/app/templates/index.html index d63e72e..8c44ed0 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -2990,9 +2990,9 @@
    - 播出时间 + 播出时间
    - +
    @@ -5960,6 +5960,14 @@ const matchedName = task.matched_show_name || ''; const matchedYear = task.matched_year || ''; + // 构建播出时间显示字符串（包含日期偏移） + const airTime = (task.calendar_info && task.calendar_info.local_air_time) || ''; + const airDateOffset = (task.calendar_info && task.calendar_info.air_date_offset) || 0; + let airTimeDisplay = airTime; + if (airTime && airDateOffset !== 0) { + airTimeDisplay = airTime + (airDateOffset > 0 ? ` +${airDateOffset}d` : ` ${airDateOffset}d`); + } + this.editMetadata = { visible: true, original: { @@ -5967,7 +5975,7 @@ content_type: task.content_type || '', tmdb_id: currentTmdbId || '', season_number: currentSeason || '', - local_air_time: (task.calendar_info && task.calendar_info.local_air_time) || '' + local_air_time: airTimeDisplay }, form: { task_name: currentName, @@ -5975,7 +5983,7 @@ tmdb_id: '', season_number: currentSeason || 1, custom_poster_url: '', - local_air_time: (task.calendar_info && task.calendar_info.local_air_time) || '' + local_air_time: airTimeDisplay }, display: { matched_label: matchedName ? `${matchedName}${matchedYear ? ' (' + matchedYear + ')' : ''}` : '未匹配', @@ -6047,9 +6055,10 @@ // 验证播出时间格式（如果填写了的话） const airTimeStr = String(payload.local_air_time || '').trim(); if (airTimeStr) { - // 验证格式是否为 HH:MM（24小时制，00:00 到 23:59） + // 验证格式是否为 HH:MM（24小时制，00:00 到 23:59），可选附加日期偏移：+Nd 或 -Nd（N 为天数） const timePattern = /^([01]?[0-9]|2[0-3]):([0-5][0-9])$/; - if (!timePattern.test(airTimeStr)) { + const timeWithOffsetPattern = /^([01]?[0-9]|2[0-3]):([0-5][0-9])\s+([+-])(\d+)d$/; + if (!timePattern.test(airTimeStr) && !timeWithOffsetPattern.test(airTimeStr)) { // 停止加载动画 this.editMetadata.loading = false; // 手动隐藏 spinner，确保动画停止 @@ -6061,7 +6070,7 @@ } catch (e) {} // 等待视图更新后再显示提示 await this.$nextTick(); - this.showToast('播出时间格式不正确，请输入 HH:MM 格式，如 20:00'); + this.showToast('播出时间格式不正确，请输入 HH:MM 格式，如 20:00，或带日期偏移如 19:30 +1d 或 19:30 -1d'); return; } } From dcc3943187121c4ab5ac9e280d3254ff32ce5e0d Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Tue, 16 Dec 2025 16:45:30 +0800 Subject: [PATCH 14/34] =?UTF-8?q?=E5=9C=A8=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=B5=B7=E6=8A=A5=E8=A7=86=E5=9B=BE=E7=9A=84=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E6=82=AC=E5=81=9C=E4=BF=A1=E6=81=AF=E4=B8=AD=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=B7=B2=E8=BD=AC=E5=AD=98=E9=9B=86=E6=95=B0=E7=9A=84?= =?UTF-8?q?=E4=B8=8B=E4=B8=80=E9=9B=86=E7=9A=84=E6=92=AD=E5=87=BA=E6=97=A5?= =?UTF-8?q?=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 任务列表海报视图的卡片悬停信息第四行之前只显示节目的本地播出时间，改为显示已转存集数的下一集的本地播出日期和本地播出时间，方便判断和了解下一集的播出情况 --- app/templates/index.html | 89 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 2 deletions(-) diff --git a/app/templates/index.html b/app/templates/index.html index 8c44ed0..e1c664f 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -1477,8 +1477,8 @@
    {{ getCalendarTaskByName(task.taskname).latest_season_name }}
    - -
    {{ getTaskAirTimeDisplay(task.taskname) }}
    + +
    {{ getTaskNextAirDateTimeDisplay(task.taskname) }}
    {{ getTaskLatestRecordDisplay(task.taskname) }}
    @@ -4764,6 +4764,91 @@ return ''; } }, + // 获取“已转存集数下一集”的本地播出日期 + 时间展示文本（任务列表海报视图使用） + getTaskNextAirDateTimeDisplay(taskNameOrTask) { + try { + // 先获取原有的播出时间展示（例如 19:40 或 19:40 +1d），作为回退 + const airTime = this.getTaskAirTimeDisplay(taskNameOrTask); + + // 规范化任务名称 + const taskName = (typeof taskNameOrTask === 'string') + ? taskNameOrTask + : (taskNameOrTask && (taskNameOrTask.task_name || taskNameOrTask.taskname)) || ''; + if (!taskName) return airTime; + + // 需要日历任务和本地剧集数据，否则回退为仅显示时间 + const calendarTask = this.getCalendarTaskByName(taskName); + if (!calendarTask || !this.calendar || !Array.isArray(this.calendar.episodes) || this.calendar.episodes.length === 0) { + return airTime; + } + + // 节目名称：优先使用 show_name，其次 matched_show_name + const showName = (calendarTask.show_name || calendarTask.matched_show_name || '').trim(); + if (!showName) return airTime; + + // 当前匹配季号：参考 getTaskSeasonNumber 的逻辑 + const seasonNumber = + (calendarTask.match && calendarTask.match.latest_season_number) || + calendarTask.matched_latest_season_number || + calendarTask.season_number || + null; + + // 已转存集数：来自 season_counts.transferred_count，下一集 = 已转存 + 1 + const transferred = Number((calendarTask.season_counts && calendarTask.season_counts.transferred_count) || 0); + const nextEpNumber = transferred > 0 ? transferred + 1 : 1; + + // 在本地剧集列表中查找对应节目的下一集 + const candidates = this.calendar.episodes + .filter(ep => { + if (!ep) return false; + if ((ep.show_name || '').trim() !== showName) return false; + if (seasonNumber != null && ep.season_number != null && ep.season_number !== seasonNumber) return false; + if (ep.episode_number == null) return false; + const n = parseInt(ep.episode_number); + if (isNaN(n)) return false; + return n >= nextEpNumber; + }) + .sort((a, b) => { + // 先按集数升序 + const an = parseInt(a.episode_number); + const bn = parseInt(b.episode_number); + if (!isNaN(an) && !isNaN(bn) && an !== bn) { + return an - bn; + } + // 再按日期升序（YYYY-MM-DD） + const ad = (a.air_date_local || a.display_air_date || a.air_date || '') || ''; + const bd = (b.air_date_local || b.display_air_date || b.air_date || '') || ''; + if (ad === bd) return 0; + return ad > bd ? 1 : -1; + }); + + const nextEp = candidates[0]; + if (!nextEp) return airTime; + + // 优先使用 air_date_local；若无则回退到 display_air_date / air_date + const rawDate = (nextEp.air_date_local || nextEp.display_air_date || nextEp.air_date || '') || ''; + if (!rawDate) return airTime; + + // 日期格式统一为 MM-DD + let mmdd = rawDate; + const m = String(rawDate).match(/^\d{4}-(\d{2})-(\d{2})/); + if (m) { + mmdd = `${m[1]}-${m[2]}`; + } else if (rawDate.length >= 5) { + // 简单兜底：截取最后 5 位，兼容已有本地格式 + mmdd = rawDate.slice(-5); + } + + // 组合“日期 + 播出时间”，若没有时间则仅显示日期 + if (airTime) { + return `${mmdd} ${airTime}`; + } + return mmdd; + } catch (e) { + // 任意异常都回退为原有的时间展示，保证不影响原功能 + return this.getTaskAirTimeDisplay(taskNameOrTask); + } + }, seasonInputComputedWidth() { try { const val = String(this.editMetadata && this.editMetadata.form ? (this.editMetadata.form.season_number ?? '') : ''); From b56aec6505245f3ade5faa65500cb10384bdaa02 Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Tue, 16 Dec 2025 17:24:53 +0800 Subject: [PATCH 15/34] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B5=B7=E6=8A=A5=E8=A7=86=E5=9B=BE=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E6=82=AC=E5=81=9C=E4=BF=A1=E6=81=AF=E7=9A=84=E4=B8=8B?= =?UTF-8?q?=E4=B8=80=E9=9B=86=E6=92=AD=E5=87=BA=E6=97=A5=E6=9C=9F=E7=9A=84?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/templates/index.html | 63 +++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 36 deletions(-) diff --git a/app/templates/index.html b/app/templates/index.html index e1c664f..7befadf 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -4782,47 +4782,38 @@ return airTime; } - // 节目名称：优先使用 show_name，其次 matched_show_name - const showName = (calendarTask.show_name || calendarTask.matched_show_name || '').trim(); - if (!showName) return airTime; + // 当前匹配季号：参考后端/前端统一口径：仅使用 matched_latest_season_number + const seasonNumber = (calendarTask.matched_latest_season_number != null) + ? Number(calendarTask.matched_latest_season_number) + : null; + if (!seasonNumber || Number.isNaN(seasonNumber) || seasonNumber <= 0) { + return airTime; + } - // 当前匹配季号：参考 getTaskSeasonNumber 的逻辑 - const seasonNumber = - (calendarTask.match && calendarTask.match.latest_season_number) || - calendarTask.matched_latest_season_number || - calendarTask.season_number || - null; - - // 已转存集数：来自 season_counts.transferred_count，下一集 = 已转存 + 1 + // 已转存集数：来自 season_counts.transferred_count（与后端 task_metrics/season_metrics 同步） const transferred = Number((calendarTask.season_counts && calendarTask.season_counts.transferred_count) || 0); + // 下一集集号：transferred_count + 1，若为 0 则从第 1 集开始 const nextEpNumber = transferred > 0 ? transferred + 1 : 1; - // 在本地剧集列表中查找对应节目的下一集 - const candidates = this.calendar.episodes - .filter(ep => { - if (!ep) return false; - if ((ep.show_name || '').trim() !== showName) return false; - if (seasonNumber != null && ep.season_number != null && ep.season_number !== seasonNumber) return false; - if (ep.episode_number == null) return false; - const n = parseInt(ep.episode_number); - if (isNaN(n)) return false; - return n >= nextEpNumber; - }) - .sort((a, b) => { - // 先按集数升序 - const an = parseInt(a.episode_number); - const bn = parseInt(b.episode_number); - if (!isNaN(an) && !isNaN(bn) && an !== bn) { - return an - bn; - } - // 再按日期升序（YYYY-MM-DD） - const ad = (a.air_date_local || a.display_air_date || a.air_date || '') || ''; - const bd = (b.air_date_local || b.display_air_date || b.air_date || '') || ''; - if (ad === bd) return 0; - return ad > bd ? 1 : -1; - }); + // 在本地剧集列表中查找对应 tmdb_id + season_number 的下一集 + const tmdbId = (calendarTask.match_tmdb_id) + || (calendarTask.match && calendarTask.match.tmdb_id) + || calendarTask.tmdb_id + || null; + if (!tmdbId) { + return airTime; + } - const nextEp = candidates[0]; + // 精准匹配下一集：tmdb_id + season_number + episode_number == nextEpNumber + const nextEp = this.calendar.episodes.find(ep => { + if (!ep) return false; + if (!ep.tmdb_id || Number(ep.tmdb_id) !== Number(tmdbId)) return false; + if (ep.season_number == null || Number(ep.season_number) !== Number(seasonNumber)) return false; + if (ep.episode_number == null) return false; + const n = parseInt(ep.episode_number); + if (Number.isNaN(n)) return false; + return n === nextEpNumber; + }); if (!nextEp) return airTime; // 优先使用 air_date_local；若无则回退到 display_air_date / air_date From d19f8f3383956d45974ce344ebd86846dc838215 Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Wed, 17 Dec 2025 17:48:38 +0800 Subject: [PATCH 16/34] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=B2=E6=92=AD?= =?UTF-8?q?=E5=87=BA=E4=BD=86=E6=9C=AA=E8=BD=AC=E5=AD=98=E9=9B=86=E7=9A=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 功能改进： - 日历视图：为已播出但未转存的集增加浅绿色背景（#e6f7ee） - 已转存：浅蓝色背景（#e6f1ff） - 已播出未转存：浅绿色背景（#e6f7ee） - 未播出未转存：浅灰色背景（#f7f7f9） - 移动端表格：已播出未转存集显示绿色条（#28a745） - 海报视图： - 已转存集：右上角显示 bi-check2-all 图标 - 已播出未转存集：右上角显示 bi-check2 图标 - 未播出未转存集：不显示标识 技术实现： - 后端：在 /api/calendar/episodes_local 接口中为每集添加 is_aired 字段 - 使用 is_episode_aired 函数精确计算（考虑播出时间） - 实现批量查询优化，将数据库查询从 1000+ 次降到 2-3 次 - 添加完整的异常处理和回退机制 - 前端：新增 isEpisodeAiredForDisplay 方法判断已播出状态 - 优先使用后端返回的 is_aired 字段，保证前后端一致 - 兼容旧版本数据（无 is_aired 时回退到日期比较） - 在日历视图和海报视图中应用新的样式逻辑 --- app/run.py | 154 +++++++++++++++++++++++++++++++++++++++ app/static/css/main.css | 49 ++++++++++--- app/templates/index.html | 37 ++++++++-- 3 files changed, 224 insertions(+), 16 deletions(-) diff --git a/app/run.py b/app/run.py index e277c25..1246ad1 100644 --- a/app/run.py +++ b/app/run.py @@ -8368,6 +8368,153 @@ def get_calendar_episodes_local(): # 获取日历时区模式配置 calendar_timezone_mode = config_data.get('calendar_timezone_mode', 'original') + + # 统一获取当前本地时间，用于批量计算 is_aired 保持与后端统计逻辑一致 + try: + from zoneinfo import ZoneInfo as _ZoneInfo + local_tz = _ZoneInfo(_get_local_timezone()) + now_local_dt = datetime.now(local_tz) + except Exception: + now_local_dt = datetime.now() + + # 批量计算 is_aired 的辅助函数（避免重复数据库查询） + def batch_compute_is_aired(episodes_list, db_instance): + """批量计算所有集的 is_aired，复用数据库连接和批量查询优化性能""" + if not episodes_list: + return + try: + # 收集所有需要查询的 (tmdb_id, season_number, episode_number) 三元组 + episode_keys = [] + for e in episodes_list: + try: + tmdb_id_i = int(e.get('tmdb_id')) + season_no_i = int(e.get('season_number')) + ep_no = int(e.get('episode_number')) + episode_keys.append((tmdb_id_i, season_no_i, ep_no, e)) + except Exception: + continue + + if not episode_keys: + return + + # 批量查询所有集的 air_date_local（一次性查询） + cur = db_instance.conn.cursor() + air_dates_map = {} + try: + # SQLite 不支持元组 IN，使用 OR 条件组合（性能仍然比逐集查询好很多） + if len(episode_keys) <= 500: # 限制批量大小，避免 SQL 过长 + conditions = [] + params = [] + for tmdb_id_i, season_no_i, ep_no, _ in episode_keys: + conditions.append("(tmdb_id=? AND season_number=? AND episode_number=?)") + params.extend([tmdb_id_i, season_no_i, ep_no]) + sql = f""" + SELECT tmdb_id, season_number, episode_number, air_date_local + FROM episodes + WHERE {' OR '.join(conditions)} + """ + cur.execute(sql, params) + for row in cur.fetchall(): + tmdb_id_i, season_no_i, ep_no, air_date_local = row + air_dates_map[(int(tmdb_id_i), int(season_no_i), int(ep_no))] = air_date_local + else: + # 如果集数太多，分批查询（每批500个） + batch_size = 500 + for i in range(0, len(episode_keys), batch_size): + batch = episode_keys[i:i + batch_size] + conditions = [] + params = [] + for tmdb_id_i, season_no_i, ep_no, _ in batch: + conditions.append("(tmdb_id=? AND season_number=? AND episode_number=?)") + params.extend([tmdb_id_i, season_no_i, ep_no]) + sql = f""" + SELECT tmdb_id, season_number, episode_number, air_date_local + FROM episodes + WHERE {' OR '.join(conditions)} + """ + cur.execute(sql, params) + for row in cur.fetchall(): + tmdb_id_i, season_no_i, ep_no, air_date_local = row + air_dates_map[(int(tmdb_id_i), int(season_no_i), int(ep_no))] = air_date_local + except Exception: + # 如果批量查询失败，回退到逐集查询（兼容性） + for tmdb_id_i, season_no_i, ep_no, _ in episode_keys: + try: + cur.execute( + "SELECT air_date_local FROM episodes WHERE tmdb_id=? AND season_number=? AND episode_number=?", + (tmdb_id_i, season_no_i, ep_no) + ) + row = cur.fetchone() + if row: + air_dates_map[(tmdb_id_i, season_no_i, ep_no)] = row[0] + except Exception: + pass + + # 批量查询所有节目的播出时间配置（一次性查询，避免重复） + unique_tmdb_ids = list(set([k[0] for k in episode_keys])) + schedules_map = {} + try: + if unique_tmdb_ids: + placeholders = ','.join(['?' for _ in unique_tmdb_ids]) + cur.execute( + f"SELECT tmdb_id, local_air_time FROM shows WHERE tmdb_id IN ({placeholders})", + unique_tmdb_ids + ) + for row in cur.fetchall(): + schedules_map[int(row[0])] = (row[1] or '').strip() or None + except Exception: + # 回退到逐节目查询（使用 get_show_air_schedule 获取完整配置） + for tmdb_id_i in unique_tmdb_ids: + try: + schedule = db_instance.get_show_air_schedule(tmdb_id_i) or {} + schedules_map[tmdb_id_i] = (schedule.get('local_air_time') or '').strip() or None + except Exception: + schedules_map[tmdb_id_i] = None + + # 获取全局播出集数刷新时间（只需获取一次） + perf = config_data.get("performance", {}) if isinstance(config_data, dict) else {} + refresh_time_str = perf.get("aired_refresh_time", "00:00") + + # 在内存中批量计算 is_aired + for tmdb_id_i, season_no_i, ep_no, episode_obj in episode_keys: + try: + air_date_local = air_dates_map.get((tmdb_id_i, season_no_i, ep_no)) + if not air_date_local: + episode_obj['is_aired'] = False + continue + + # 获取节目级播出时间 + local_air_time = schedules_map.get(tmdb_id_i) + time_to_use = local_air_time if local_air_time else refresh_time_str + + # 解析时间（HH:MM） + hh, mm = 0, 0 + try: + parts = str(time_to_use).split(":") + if len(parts) == 2: + hh = int(parts[0]) + mm = int(parts[1]) + except Exception: + hh, mm = 0, 0 + + # 组合日期和时间，与当前时间比较 + dt_str = f"{air_date_local} {hh:02d}:{mm:02d}:00" + dt_ep_local = datetime.strptime(dt_str, "%Y-%m-%d %H:%M:%S") + if getattr(now_local_dt, "tzinfo", None) is not None: + dt_ep_local = dt_ep_local.replace(tzinfo=now_local_dt.tzinfo) + episode_obj['is_aired'] = dt_ep_local.timestamp() <= now_local_dt.timestamp() + except Exception: + episode_obj['is_aired'] = False + except Exception: + # 如果批量计算失败，回退到逐集调用 is_episode_aired（兼容性保证） + for e in episodes_list: + try: + tmdb_id_i = int(e.get('tmdb_id')) + season_no_i = int(e.get('season_number')) + ep_no = int(e.get('episode_number')) + e['is_aired'] = bool(is_episode_aired(tmdb_id_i, season_no_i, ep_no, now_local_dt)) + except Exception: + e['is_aired'] = False if tmdb_id: show = db.get_show(int(tmdb_id)) @@ -8381,6 +8528,11 @@ def get_calendar_episodes_local(): e['display_air_date'] = e['air_date_local'] else: e['display_air_date'] = e.get('air_date') or '' + # 补充 tmdb_id 和 season_number（批量计算需要） + e['tmdb_id'] = int(tmdb_id) + e['season_number'] = int(show['latest_season_number']) + # 批量计算 is_aired（优化性能） + batch_compute_is_aired(eps, db) # 注入任务信息与标准化进度 info = tmdb_to_taskinfo.get(int(tmdb_id)) if info: @@ -8402,6 +8554,8 @@ def get_calendar_episodes_local(): e['display_air_date'] = e['air_date_local'] else: e['display_air_date'] = e.get('air_date') or '' + # 批量计算 is_aired（优化性能） + batch_compute_is_aired(eps, db) for e in eps: info = tmdb_to_taskinfo.get(int(e.get('tmdb_id'))) if info: diff --git a/app/static/css/main.css b/app/static/css/main.css index 9df5f45..a22f53e 100644 --- a/app/static/css/main.css +++ b/app/static/css/main.css @@ -6530,8 +6530,24 @@ body .selectable-files tr.selected-file:has([style*="white-space: normal"]) .fil .discovery-rating.status-ended { color: #ff4d4f; } /* 红色 */ .discovery-rating.status-other { color: #00C853; } /* 绿色 */ -/* 追剧日历 - 已转存标识 */ -.calendar-transferred-badge { color: #00C853; padding: 2px 8px 2px 7.5px; } +/* 追剧日历 - 已转存/已播出标识 */ +.calendar-transferred-badge { + color: #00C853; + padding: 2px 0; /* 基础上下 padding，左右 padding 由子类设置 */ +} + +/* 已转存集 */ +.calendar-transferred-badge-transferred { + padding-left: 9px; + padding-right: 10px; +} + +/* 已播出未转存集 */ +.calendar-transferred-badge-aired { + padding-left: 7.5px; + padding-right: 8px; +} + .calendar-transferred-badge i { line-height: 1; display: inline-block; @@ -6539,10 +6555,10 @@ body .selectable-files tr.selected-file:has([style*="white-space: normal"]) .fil /* 使用多向阴影模拟加粗（图标为字体，font-weight不生效） */ text-shadow: 0 0 0 currentColor, - 0 0.45px 0 currentColor, - 0 -0.45px 0 currentColor, - 0.45px 0 0 currentColor, - -0.45px 0 0 currentColor; + 0 0.3px 0 currentColor, + 0 -0.3px 0 currentColor, + 0.3px 0 0 currentColor, + -0.3px 0 0 currentColor; } .discovery-create-task { @@ -7317,7 +7333,7 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { font-size: 0.95rem; color: var(--dark-text-color); border-right: 1px solid var(--border-color); /* 显示内部分割线 */ - background-color: #f7f7f9; + background-color: var(--button-gray-background-color); /* 防止文本被挤压成竖排 */ min-width: 100px; white-space: nowrap; @@ -7417,7 +7433,7 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { font-size: 0.85rem; padding: 6px; /* 等距6px */ line-height: 1; /* 统一行高，消除上下视觉不等距 */ - /* 日历视图：默认保持原按钮灰背景 */ + /* 日历视图：默认保持原按钮灰背景（未转存且未播出） */ background-color: #f7f7f9; border-radius: 6px; /* 圆角6px */ display: flex; @@ -7425,11 +7441,16 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { gap: 4px; } -/* 日历视图：仅当该集已达转存进度时，卡片背景改为导航悬停浅蓝色 */ +/* 日历视图：当该集已达转存进度时，卡片背景改为导航悬停浅蓝色 */ .calendar-month-episode:has(.episode-number.episode-number-reached) { background-color: #e6f1ff; } +/* 日历视图：未转存但已播出的集，卡片背景为浅绿色 */ +.calendar-month-episode:has(.episode-number.episode-number-aired):not(:has(.episode-number.episode-number-reached)) { + background-color: #E6F7EE; +} + .episode-title { font-weight: 400; /* 常规体 */ flex: 1; @@ -7599,11 +7620,14 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { } /* 超小模式：表格内部的卡片背景色覆盖（仅表格体内紧凑卡片） */ .calendar-month-body .calendar-month-episode { - background-color: var(--border-color) !important; /* 普通状态背景色 */ + background-color: var(--border-color) !important; /* 普通状态背景色（未转存且未播出） */ } .calendar-month-body .calendar-month-episode:has(.episode-number.episode-number-reached) { background-color: var(--focus-border-color) !important; /* 已转存背景色 */ } + .calendar-month-body .calendar-month-episode:has(.episode-number.episode-number-aired):not(:has(.episode-number.episode-number-reached)) { + background-color: #28a745 !important; /* 已播出但未转存背景色 */ + } } @@ -7618,12 +7642,15 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { padding: 6px; line-height: 1; transform: none; /* 还原不上移 */ - background-color: #f7f7f9; /* 桌面端默认背景 */ + background-color: #f7f7f9; /* 桌面端默认背景：未转存且未播出 */ border-radius: 6px; } .calendar-selected-episodes .calendar-month-episode:has(.episode-number.episode-number-reached) { background-color: #e6f1ff; /* 桌面端已转存背景 */ } + .calendar-selected-episodes .calendar-month-episode:has(.episode-number.episode-number-aired):not(:has(.episode-number.episode-number-reached)) { + background-color: #E6F7EE; /* 桌面端已播出但未转存背景 */ + } /* 移动端：下方列表的集号样式与桌面端一致（显示完整 SxxExx） */ .calendar-selected-episodes .calendar-month-episode .episode-number { diff --git a/app/templates/index.html b/app/templates/index.html index 7befadf..d2d94c7 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -2318,9 +2318,14 @@
    - -
    - + +
    +
    @@ -2397,7 +2402,7 @@ - - Date: Wed, 17 Dec 2025 18:24:57 +0800 Subject: [PATCH 17/34] =?UTF-8?q?=E5=9C=A8=E8=BF=BD=E5=89=A7=E6=97=A5?= =?UTF-8?q?=E5=8E=86=E7=9A=84=E9=9B=86=E6=95=B0=E6=82=AC=E5=81=9C=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=B8=AD=E5=A2=9E=E5=8A=A0=E8=8A=82=E7=9B=AE=E7=BA=A7?= =?UTF-8?q?=E6=92=AD=E5=87=BA=E6=97=B6=E9=97=B4=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/run.py | 6 +++++- app/templates/index.html | 24 +++++++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/app/run.py b/app/run.py index 1246ad1..75b892c 100644 --- a/app/run.py +++ b/app/run.py @@ -8475,7 +8475,7 @@ def get_calendar_episodes_local(): perf = config_data.get("performance", {}) if isinstance(config_data, dict) else {} refresh_time_str = perf.get("aired_refresh_time", "00:00") - # 在内存中批量计算 is_aired + # 在内存中批量计算 is_aired，并同时为前端注入节目级播出时间（local_air_time） for tmdb_id_i, season_no_i, ep_no, episode_obj in episode_keys: try: air_date_local = air_dates_map.get((tmdb_id_i, season_no_i, ep_no)) @@ -8485,6 +8485,10 @@ def get_calendar_episodes_local(): # 获取节目级播出时间 local_air_time = schedules_map.get(tmdb_id_i) + # 将节目级播出时间原样注入到每一集对象中，供前端悬停提示展示 + # 仅在存在节目级配置时注入；若配置为空则保持该字段缺失，前端仍按原逻辑不显示时间 + if local_air_time: + episode_obj['local_air_time'] = local_air_time time_to_use = local_air_time if local_air_time else refresh_time_str # 解析时间（HH:MM） diff --git a/app/templates/index.html b/app/templates/index.html index d2d94c7..5901faa 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -6920,23 +6920,41 @@ // 获取剧集提示信息 getEpisodeTooltip(episode) { - // 规范：集数悬停显示对应集在TMDB上的单集标题 + // 规范：集数悬停显示对应集在 TMDB 上的单集标题 // 普通：SxxExx 标题 // 合并：逐行列出每一集：SxxExx 标题 + // 扩展：若存在节目级播出时间（local_air_time），则在前面追加时间，例如： + // 18:00 S01E17 标题 + // 18:00 S01E18 标题 const pad2 = n => String(n).padStart(2, '0'); + // 仅使用节目级播出时间（local_air_time），不使用全局刷新时间； + // 未配置 local_air_time 时保持原有行为（不显示时间） + let timePrefix = ''; + try { + const raw = (episode && episode.local_air_time) ? String(episode.local_air_time).trim() : ''; + if (raw) { + // 只取 HH:MM 部分，忽略可选的日期偏移（例如 "+1d"） + const m = raw.match(/^([0-2]?\d:[0-5]\d)/); + const hhmm = m ? m[1] : raw; + timePrefix = hhmm ? (hhmm + ' ') : ''; + } + } catch (e) { + timePrefix = ''; + } + if (episode.is_merged && Array.isArray(episode.original_episodes) && episode.original_episodes.length) { const lines = episode.original_episodes.map(ep => { const s = ep.season_number ? pad2(ep.season_number) : pad2(episode.season_number || 1); const e = ep.episode_number ? pad2(ep.episode_number) : ''; const title = ep.name || ''; - return `S${s}E${e} ${title}`.trim(); + return `${timePrefix}S${s}E${e} ${title}`.trim(); }); return lines.join('\n'); } const s = episode.season_number ? pad2(episode.season_number) : '01'; const e = episode.episode_number ? pad2(episode.episode_number) : '01'; const title = episode.name || ''; - return `S${s}E${e} ${title}`.trim(); + return `${timePrefix}S${s}E${e} ${title}`.trim(); }, // 打开剧的TMDB页面 From 645ef231bce720027973884930bcc549ae1d566f Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Thu, 18 Dec 2025 16:00:16 +0800 Subject: [PATCH 18/34] =?UTF-8?q?=E5=9C=A8=E4=BB=BB=E5=8A=A1=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E=E6=8C=89=E6=92=AD?= =?UTF-8?q?=E5=87=BA=E6=97=B6=E9=97=B4=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增任务列表排序字段 airtime，支持升降序 - 基于 “已转存集数下一集” 的播出日期和本地播出时间作为排序键 - 优先按日期排序，其次按时间，无播出日期的任务统一排在末尾，完全无日期和时间时回退到任务名称排序 - 列表视图和海报视图共用同一排序逻辑，保持显示一致性 --- app/templates/index.html | 140 ++++++++++++++++++++++++++++++++++----- 1 file changed, 123 insertions(+), 17 deletions(-) diff --git a/app/templates/index.html b/app/templates/index.html index 5901faa..e04bc42 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -1150,6 +1150,7 @@ + {{ tasklistSort.order === 'asc' ? '升序排列' : '降序排列' }} @@ -3483,7 +3484,7 @@ tasklistSort: (() => { try { const saved = JSON.parse(localStorage.getItem('tasklist_sort_options') || '{}'); - let by = ['index','name','progress','update_time'].includes(saved.by) ? saved.by : 'index'; + let by = ['index','name','progress','update_time','airtime'].includes(saved.by) ? saved.by : 'index'; const order = (saved.order === 'asc' || saved.order === 'desc') ? saved.order : 'asc'; // 注意：这里无法检查 TMDB API 配置，会在 mounted 中处理 return { by, order }; @@ -4465,6 +4466,7 @@ if (key === 'name') return '任务名称'; if (key === 'progress') return '任务进度'; if (key === 'update_time') return '更新时间'; + if (key === 'airtime') return '播出时间'; return '任务编号'; }, // 任务列表排序：保存到localStorage @@ -4476,7 +4478,7 @@ // 任务列表排序：切换排序字段 // 仅切换排序字段，不改变当前升降序 changeTasklistSortBy(by) { - if (!['index','name','progress','update_time'].includes(by)) return; + if (!['index','name','progress','update_time','airtime'].includes(by)) return; if (this.tasklistSort.by !== by) { this.tasklistSort.by = by; // 不重置、不切换 order，保持现状 @@ -4507,6 +4509,90 @@ const bk = pinyinPro.pinyin(bn, { toneType: 'none', type: 'string' }).toLowerCase(); if (ak < bk) cmp = -1; else if (ak > bk) cmp = 1; else cmp = 0; } catch (e) { cmp = an.localeCompare(bn); } + } else if (by === 'airtime') { + // 按“已转存集数下一集”的播出日期 + 播出时间排序 + // 1) 有播出日期的任务永远排在无播出日期的任务前面（与升降序无关） + // 2) 主排序：播出日期（升/降） + // 3) 次排序：播出时间（同一天或都无日期时；缺少时间的排在当日末尾） + // 4) 若既无日期也无时间，则回退为任务名称拼音排序 + const getNameKey = (task) => { + const name = (task && (task.taskname || task.task_name) || '').toString(); + try { + return pinyinPro.pinyin(name, { toneType: 'none', type: 'string' }).toLowerCase() || name.toLowerCase(); + } catch (e) { + return name.toLowerCase(); + } + }; + const parseDateKey = (raw) => { + if (!raw) return null; + const s = String(raw).trim(); + // 优先解析 YYYY-MM-DD + let m = s.match(/^(\d{4})-(\d{2})-(\d{2})/); + if (m) { + return parseInt(`${m[1]}${m[2]}${m[3]}`, 10); + } + // 简单兜底：解析 MM-DD 或 MM/DD + m = s.match(/(\d{1,2})[-/](\d{1,2})/); + if (m) { + const mm = m[1].padStart(2, '0'); + const dd = m[2].padStart(2, '0'); + return parseInt(`9999${mm}${dd}`, 10); // 年份未知，使用固定年保证相对顺序 + } + return null; + }; + const parseTimeMinutes = (raw) => { + if (!raw) return null; + const s = String(raw).trim(); + const m = s.match(/([0-2]?\d):([0-5]\d)/); + if (!m) return null; + const h = parseInt(m[1], 10); + const min = parseInt(m[2], 10); + if (Number.isNaN(h) || Number.isNaN(min)) return null; + const hh = Math.max(0, Math.min(23, h)); + const mm = Math.max(0, Math.min(59, min)); + return hh * 60 + mm; + }; + const aInfo = this.getTaskNextAirRaw(a.t.taskname || a.t.task_name || ''); + const bInfo = this.getTaskNextAirRaw(b.t.taskname || b.t.task_name || ''); + const aHasDate = !!(aInfo && aInfo.date && String(aInfo.date).trim() !== ''); + const bHasDate = !!(bInfo && bInfo.date && String(bInfo.date).trim() !== ''); + // 1) 有日期的排在前面，无日期的排在后面（不受 asc/desc 影响） + if (aHasDate !== bHasDate) { + cmp = aHasDate ? -1 : 1; + } else { + const aDateKey = aHasDate ? (parseDateKey(aInfo.date) ?? 0) : 0; + const bDateKey = bHasDate ? (parseDateKey(bInfo.date) ?? 0) : 0; + // 2) 主排序：日期（同为“无日期”时视为相等，进入时间排序） + if (aHasDate && bHasDate && aDateKey !== bDateKey) { + cmp = aDateKey - bDateKey; + } else { + // 3) 次排序：时间（同一天或都无日期时） + const aMinutes = parseTimeMinutes(aInfo.time); + const bMinutes = parseTimeMinutes(bInfo.time); + const aHasTime = aMinutes != null; + const bHasTime = bMinutes != null; + if (aHasTime || bHasTime) { + // 缺少时间的任务排在当日末尾 + const sentinel = 24 * 60 + 1; + const aVal = aHasTime ? aMinutes : sentinel; + const bVal = bHasTime ? bMinutes : sentinel; + const diff = aVal - bVal; + if (diff !== 0) { + cmp = diff; + } else { + // 时间也相同时回退到任务名称 + const ak = getNameKey(a.t); + const bk = getNameKey(b.t); + if (ak < bk) cmp = -1; else if (ak > bk) cmp = 1; else cmp = 0; + } + } else { + // 4) 既无日期也无时间：完全回退到任务名称排序（仍受升降序影响） + const ak = getNameKey(a.t); + const bk = getNameKey(b.t); + if (ak < bk) cmp = -1; else if (ak > bk) cmp = 1; else cmp = 0; + } + } + } } else if (by === 'progress') { const ap = (this.getTaskProgress && this.getTaskProgress(a.t.taskname) != null) ? Number(this.getTaskProgress(a.t.taskname)) : -1; const bp = (this.getTaskProgress && this.getTaskProgress(b.t.taskname) != null) ? Number(this.getTaskProgress(b.t.taskname)) : -1; @@ -4769,8 +4855,11 @@ return ''; } }, - // 获取“已转存集数下一集”的本地播出日期 + 时间展示文本（任务列表海报视图使用） - getTaskNextAirDateTimeDisplay(taskNameOrTask) { + // 内部工具：获取“已转存集数下一集”的原始播出日期和播出时间 + // 返回值格式：{ date: string, time: string } + // - date：优先 air_date_local，其次 display_air_date / air_date，可能为 YYYY-MM-DD 或其他兼容格式；若无则为 '' + // - time：任务的本地播出时间展示（如 '19:40' 或 '19:40 +1d'），可能为空字符串 + getTaskNextAirRaw(taskNameOrTask) { try { // 先获取原有的播出时间展示（例如 19:40 或 19:40 +1d），作为回退 const airTime = this.getTaskAirTimeDisplay(taskNameOrTask); @@ -4779,25 +4868,26 @@ const taskName = (typeof taskNameOrTask === 'string') ? taskNameOrTask : (taskNameOrTask && (taskNameOrTask.task_name || taskNameOrTask.taskname)) || ''; - if (!taskName) return airTime; - - // 需要日历任务和本地剧集数据，否则回退为仅显示时间 - const calendarTask = this.getCalendarTaskByName(taskName); - if (!calendarTask || !this.calendar || !Array.isArray(this.calendar.episodes) || this.calendar.episodes.length === 0) { - return airTime; + if (!taskName) { + return { date: '', time: airTime }; } - // 当前匹配季号：参考后端/前端统一口径：仅使用 matched_latest_season_number + // 需要日历任务和本地剧集数据，否则回退为仅时间 + const calendarTask = this.getCalendarTaskByName(taskName); + if (!calendarTask || !this.calendar || !Array.isArray(this.calendar.episodes) || this.calendar.episodes.length === 0) { + return { date: '', time: airTime }; + } + + // 当前匹配季号：仅使用 matched_latest_season_number const seasonNumber = (calendarTask.matched_latest_season_number != null) ? Number(calendarTask.matched_latest_season_number) : null; if (!seasonNumber || Number.isNaN(seasonNumber) || seasonNumber <= 0) { - return airTime; + return { date: '', time: airTime }; } - // 已转存集数：来自 season_counts.transferred_count（与后端 task_metrics/season_metrics 同步） + // 已转存集数：来自 season_counts.transferred_count const transferred = Number((calendarTask.season_counts && calendarTask.season_counts.transferred_count) || 0); - // 下一集集号：transferred_count + 1，若为 0 则从第 1 集开始 const nextEpNumber = transferred > 0 ? transferred + 1 : 1; // 在本地剧集列表中查找对应 tmdb_id + season_number 的下一集 @@ -4806,10 +4896,9 @@ || calendarTask.tmdb_id || null; if (!tmdbId) { - return airTime; + return { date: '', time: airTime }; } - // 精准匹配下一集：tmdb_id + season_number + episode_number == nextEpNumber const nextEp = this.calendar.episodes.find(ep => { if (!ep) return false; if (!ep.tmdb_id || Number(ep.tmdb_id) !== Number(tmdbId)) return false; @@ -4819,10 +4908,27 @@ if (Number.isNaN(n)) return false; return n === nextEpNumber; }); - if (!nextEp) return airTime; + if (!nextEp) { + return { date: '', time: airTime }; + } // 优先使用 air_date_local；若无则回退到 display_air_date / air_date const rawDate = (nextEp.air_date_local || nextEp.display_air_date || nextEp.air_date || '') || ''; + if (!rawDate) { + return { date: '', time: airTime }; + } + + return { date: rawDate, time: airTime }; + } catch (e) { + // 任意异常都回退为原有的时间展示，保证不影响原功能 + return { date: '', time: this.getTaskAirTimeDisplay(taskNameOrTask) }; + } + }, + // 获取“已转存集数下一集”的本地播出日期 + 时间展示文本（任务列表海报视图使用） + getTaskNextAirDateTimeDisplay(taskNameOrTask) { + try { + const { date: rawDate, time: airTime } = this.getTaskNextAirRaw(taskNameOrTask); + if (!rawDate && !airTime) return ''; if (!rawDate) return airTime; // 日期格式统一为 MM-DD From d1ae3a26dd14595993a329a039aa8f5730b5a0d1 Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Sat, 20 Dec 2025 01:08:23 +0800 Subject: [PATCH 19/34] =?UTF-8?q?=E5=9C=A8=E8=BF=BD=E5=89=A7=E6=97=A5?= =?UTF-8?q?=E5=8E=86=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E4=BA=86?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E5=8D=A1=E7=89=87=E6=82=AC=E5=81=9C=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增功能 - 在追剧日历页面右上角添加排序控制组件（样式与任务列表页面一致） - 支持两种排序方式：节目名称、播出时间 - 支持升降序切换，默认按节目名称升序排列 - 排序选项支持持久化到 localStorage 排序逻辑实现 - 日历视图：集卡片支持按节目名称和播出时间排序 - 海报视图：集卡片支持按节目名称和播出时间排序 - 内容管理模式：节目卡片支持按节目名称和播出时间排序 - 播出时间排序逻辑与任务列表一致（除日期提取方式） - 优先按下一个待播集的播出日期排序，其次按播出时间排序 - 无播出日期但有播出时间的任务按播出时间排序 - 既无日期也无时间的任务回退到名称排序 UI 优化 - 调整内容管理页面海报悬停信息顺序： - 下一个待播集的播出日期和时间显示为倒数第二行 - 已转存/已播出/总集数显示为最后一行 技术实现 - 添加排序状态管理：calendar.sortBy 和 calendar.sortOrder - 实现获取下一个待播集播出日期的函数：getTaskNextAirDateForSort - 实现悬停信息显示函数：getTaskNextAirDateTimeDisplayForCalendar - 添加排序选项变化监听器，确保视图实时更新 --- app/static/css/main.css | 5 + app/templates/index.html | 416 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 399 insertions(+), 22 deletions(-) diff --git a/app/static/css/main.css b/app/static/css/main.css index a22f53e..26294ab 100644 --- a/app/static/css/main.css +++ b/app/static/css/main.css @@ -7056,6 +7056,11 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { .calendar-controls .btn-group { margin: 0; /* 由 gap 控制间距 */ } + + /* 追剧日历页面的排序组件：覆盖任务列表的 -4px 偏移，保持与其他按钮对齐 */ + .calendar-controls .tasklist-sort-controls { + margin-top: 0 !important; + } } /* 统一日历控制按钮的样式 */ diff --git a/app/templates/index.html b/app/templates/index.html index e04bc42..7b41afe 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -2151,6 +2151,20 @@
    + +
    +
    + 按 + + + {{ calendar.sortOrder === 'asc' ? '升序排列' : '降序排列' }} + +
    +
    +
    {{ task.matched_year }}
    {{ task.latest_season_name }}
    +
    {{ getTaskNextAirDateTimeDisplayForCalendar(task) }}
    -
    {{ getTaskAirTimeDisplay(task) }}
    @@ -3469,6 +3483,23 @@ const m = (d.getMonth()+1).toString().padStart(2,'0'); const day = d.getDate().toString().padStart(2,'0'); return `${y}-${m}-${day}`; + })(), + // 排序选项（支持持久化） + sortBy: (() => { + try { + const saved = JSON.parse(localStorage.getItem('calendar_sort_options') || '{}'); + return (saved.by === 'name' || saved.by === 'airtime') ? saved.by : 'name'; + } catch (e) { + return 'name'; + } + })(), + sortOrder: (() => { + try { + const saved = JSON.parse(localStorage.getItem('calendar_sort_options') || '{}'); + return (saved.order === 'asc' || saved.order === 'desc') ? saved.order : 'asc'; + } catch (e) { + return 'asc'; + } })() }, // 任务列表：类型筛选状态 @@ -3580,23 +3611,146 @@ if (this.calendar.statusFilter && this.calendar.statusFilter.trim() !== '') { list = list.filter(t => this.filterTaskByStatus(t, this.calendar.statusFilter)); } - // 按匹配状态和任务名称拼音排序：匹配的项目在前，未匹配的项目在后 + // 根据排序选项进行排序 try { + const sortBy = this.calendar.sortBy || 'name'; + const sortOrder = this.calendar.sortOrder || 'asc'; + const factor = sortOrder === 'desc' ? -1 : 1; + list.sort((a, b) => { - // 首先按匹配状态排序：匹配的在前，未匹配的在后 - const aMatched = !!(a.matched_show_name && a.matched_show_name.trim() !== ''); - const bMatched = !!(b.matched_show_name && b.matched_show_name.trim() !== ''); - - if (aMatched !== bMatched) { - return aMatched ? -1 : 1; // 匹配的排在前面 + if (sortBy === 'name') { + // 按匹配状态和任务名称拼音排序：匹配的项目在前，未匹配的项目在后 + const aMatched = !!(a.matched_show_name && a.matched_show_name.trim() !== ''); + const bMatched = !!(b.matched_show_name && b.matched_show_name.trim() !== ''); + + if (aMatched !== bMatched) { + return aMatched ? -1 : 1; // 匹配的排在前面 + } + + // 匹配状态相同时，按任务名称拼音排序 + const aKey = pinyinPro.pinyin(a.task_name || '', { toneType: 'none', type: 'string' }).toLowerCase(); + const bKey = pinyinPro.pinyin(b.task_name || '', { toneType: 'none', type: 'string' }).toLowerCase(); + if (aKey < bKey) return -1; if (aKey > bKey) return 1; return 0; + } else if (sortBy === 'airtime') { + // 按播出时间排序（下一个待播集的播出日期和播出时间） + // 逻辑与任务列表的播出时间排序一致，除了日期提取方式不同 + const getNameKey = (task) => { + const name = (task && task.task_name) || ''; + try { + return pinyinPro.pinyin(name, { toneType: 'none', type: 'string' }).toLowerCase() || name.toLowerCase(); + } catch (e) { + return name.toLowerCase(); + } + }; + const parseDateKey = (raw) => { + if (!raw) return null; + const s = String(raw).trim(); + // 优先解析 YYYY-MM-DD + let m = s.match(/^(\d{4})-(\d{2})-(\d{2})/); + if (m) { + return parseInt(`${m[1]}${m[2]}${m[3]}`, 10); + } + // 简单兜底：解析 MM-DD 或 MM/DD + m = s.match(/(\d{1,2})[-/](\d{1,2})/); + if (m) { + const mm = m[1].padStart(2, '0'); + const dd = m[2].padStart(2, '0'); + return parseInt(`9999${mm}${dd}`, 10); // 年份未知，使用固定年保证相对顺序 + } + return null; + }; + const parseTimeMinutes = (raw) => { + if (!raw) return null; + const s = String(raw).trim(); + const m = s.match(/([0-2]?\d):([0-5]\d)/); + if (!m) return null; + const h = parseInt(m[1], 10); + const min = parseInt(m[2], 10); + if (Number.isNaN(h) || Number.isNaN(min)) return null; + const hh = Math.max(0, Math.min(23, h)); + const mm = Math.max(0, Math.min(59, min)); + return hh * 60 + mm; + }; + + // 获取播出日期和时间信息 + // 如果 getTaskNextAirDateForSort 返回 null（没有找到下一个待播集）， + // 我们仍然应该尝试从任务本身获取节目级的播出时间 + const getAirInfo = (task) => { + const nextAir = this.getTaskNextAirDateForSort(task); + if (nextAir) { + return { + date: nextAir.date || '', + time: nextAir.time + }; + } + // 如果没有找到下一个待播集，尝试从任务本身获取节目级播出时间 + const airTime = task.local_air_time || (task.calendar_info && task.calendar_info.local_air_time) || ''; + let timeMinutes = null; + if (airTime) { + const timeMatch = String(airTime).trim().match(/^([0-2]?\d):([0-5]\d)/); + if (timeMatch) { + timeMinutes = parseInt(timeMatch[1]) * 60 + parseInt(timeMatch[2]); + } + } + return { + date: '', + time: timeMinutes + }; + }; + + const aInfo = getAirInfo(a); + const bInfo = getAirInfo(b); + const aHasDate = !!(aInfo.date && String(aInfo.date).trim() !== ''); + const bHasDate = !!(bInfo.date && String(bInfo.date).trim() !== ''); + + // 1) 有日期的排在前面，无日期的排在后面（不受 asc/desc 影响） + if (aHasDate !== bHasDate) { + return aHasDate ? -1 : 1; + } else { + const aDateKey = aHasDate ? (parseDateKey(aInfo.date) ?? 0) : 0; + const bDateKey = bHasDate ? (parseDateKey(bInfo.date) ?? 0) : 0; + // 2) 主排序：日期（同为"无日期"时视为相等，进入时间排序） + if (aHasDate && bHasDate && aDateKey !== bDateKey) { + return aDateKey - bDateKey; + } else { + // 3) 次排序：时间（同一天或都无日期时） + const aMinutes = aInfo.time; + const bMinutes = bInfo.time; + const aHasTime = aMinutes != null; + const bHasTime = bMinutes != null; + if (aHasTime || bHasTime) { + // 缺少时间的任务排在当日末尾 + const sentinel = 24 * 60 + 1; + const aVal = aHasTime ? aMinutes : sentinel; + const bVal = bHasTime ? bMinutes : sentinel; + const diff = aVal - bVal; + if (diff !== 0) { + return diff; + } else { + // 时间也相同时回退到任务名称 + const ak = getNameKey(a); + const bk = getNameKey(b); + if (ak < bk) return -1; else if (ak > bk) return 1; return 0; + } + } else { + // 4) 既无日期也无时间：完全回退到任务名称排序（仍受升降序影响） + const ak = getNameKey(a); + const bk = getNameKey(b); + if (ak < bk) return -1; else if (ak > bk) return 1; return 0; + } + } + } } - - // 匹配状态相同时，按任务名称拼音排序 - const aKey = pinyinPro.pinyin(a.task_name || '', { toneType: 'none', type: 'string' }).toLowerCase(); - const bKey = pinyinPro.pinyin(b.task_name || '', { toneType: 'none', type: 'string' }).toLowerCase(); - if (aKey < bKey) return -1; if (aKey > bKey) return 1; return 0; + return 0; }); - } catch (e) {} + + // 应用升降序 + if (sortOrder === 'desc') { + list.reverse(); + } + } catch (e) { + console.error('内容管理模式排序失败:', e); + } return list; }, @@ -3914,6 +4068,17 @@ localStorage.setItem('calendar_status_filter', newVal || ''); } catch (e) {} }, + // 排序选项变化时重建视图数据 + 'calendar.sortBy': function(newVal, oldVal) { + if (this.calendar.viewMode === 'month') { + this.initializeCalendarDates(); + } + }, + 'calendar.sortOrder': function(newVal, oldVal) { + if (this.calendar.viewMode === 'month') { + this.initializeCalendarDates(); + } + }, taskStatusFilter(newValue) { try { localStorage.setItem('tasklist_status_filter', newValue || ''); @@ -4492,6 +4657,33 @@ this.saveTasklistSort(); // 不再调用 applyTasklistSort，因为现在使用计算属性 }, + // 追剧日历排序：保存到localStorage + saveCalendarSort() { + try { + localStorage.setItem('calendar_sort_options', JSON.stringify({ by: this.calendar.sortBy, order: this.calendar.sortOrder })); + } catch (e) {} + }, + // 追剧日历排序：切换排序字段 + changeCalendarSortBy(by) { + if (!['name','airtime'].includes(by)) return; + if (this.calendar.sortBy !== by) { + this.calendar.sortBy = by; + this.saveCalendarSort(); + // 重新构建视图数据以应用新的排序 + if (this.calendar.viewMode === 'month') { + this.initializeCalendarDates(); + } + } + }, + // 追剧日历排序：切换升降序 + toggleCalendarSortOrder() { + this.calendar.sortOrder = this.calendar.sortOrder === 'asc' ? 'desc' : 'asc'; + this.saveCalendarSort(); + // 重新构建视图数据以应用新的排序 + if (this.calendar.viewMode === 'month') { + this.initializeCalendarDates(); + } + }, // 获取排序后的任务列表（不修改原始数据，避免触发 configModified） getSortedTasklist() { try { @@ -4972,10 +5164,106 @@ getTaskAiredCount(task) { try { return Number((task && task.season_counts && task.season_counts.aired_count) || 0); } catch (e) { return 0; } }, + // 获取下一个待播集的播出日期（用于内容管理模式排序） + // 返回值：{ date: string, time: number }，date 为 YYYY-MM-DD 格式，time 为分钟数（0-1439），如果不存在则返回 null + getTaskNextAirDateForSort(task) { + try { + if (!task) return null; + const airedCount = this.getTaskAiredCount(task); + const nextEpNumber = airedCount + 1; + + // 获取任务的 tmdb_id 和 season_number + const tmdbId = task.match_tmdb_id || task.tmdb_id; + const seasonNumber = task.latest_season_number || task.season_number; + + if (!tmdbId || !seasonNumber) return null; + + // 在 calendar.episodes 中查找对应的集 + if (!this.calendar.episodes || !Array.isArray(this.calendar.episodes)) return null; + + const nextEpisode = this.calendar.episodes.find(ep => { + return ep.tmdb_id === parseInt(tmdbId) && + ep.season_number === parseInt(seasonNumber) && + ep.episode_number === nextEpNumber; + }); + + if (!nextEpisode) return null; + + // 获取播出日期（优先使用 air_date_local，其次 display_air_date，最后 air_date） + const airDate = nextEpisode.air_date_local || nextEpisode.display_air_date || nextEpisode.air_date || ''; + if (!airDate) return null; + + // 获取节目级播出时间 + const airTime = task.local_air_time || (task.calendar_info && task.calendar_info.local_air_time) || ''; + let timeMinutes = null; + if (airTime) { + const timeMatch = String(airTime).trim().match(/^([0-2]?\d):([0-5]\d)/); + if (timeMatch) { + timeMinutes = parseInt(timeMatch[1]) * 60 + parseInt(timeMatch[2]); + } + } + + return { date: airDate, time: timeMinutes }; + } catch (e) { + return null; + } + }, // 获取管理视图卡片展示用：总集数（直接来自任务元数据） getTaskTotalCount(task) { try { return Number((task && task.season_counts && task.season_counts.total_count) || 0); } catch (e) { return 0; } }, + // 获取下一个待播集的播出日期和时间显示文本（用于内容管理模式悬停信息） + // 格式：12-22 23:00 或 23:00 或 12-22 + getTaskNextAirDateTimeDisplayForCalendar(task) { + try { + if (!task) return ''; + const nextAir = this.getTaskNextAirDateForSort(task); + if (!nextAir) { + // 如果没有下一个待播集的播出日期，只显示播出时间 + return this.getTaskAirTimeDisplay(task); + } + + const airDate = nextAir.date; + const airTime = task.local_air_time || (task.calendar_info && task.calendar_info.local_air_time) || ''; + + // 格式化日期为 MM-DD + let dateStr = ''; + if (airDate) { + try { + const dateMatch = airDate.match(/^(\d{4})-(\d{2})-(\d{2})/); + if (dateMatch) { + dateStr = `${dateMatch[2]}-${dateMatch[3]}`; + } else { + dateStr = airDate; + } + } catch (e) { + dateStr = airDate; + } + } + + // 格式化时间为 HH:MM（只取时间部分，忽略日期偏移） + let timeStr = ''; + if (airTime) { + const timeMatch = String(airTime).trim().match(/^([0-2]?\d):([0-5]\d)/); + if (timeMatch) { + timeStr = `${timeMatch[1].padStart(2, '0')}:${timeMatch[2]}`; + } + } + + // 组合显示 + if (dateStr && timeStr) { + return `${dateStr} ${timeStr}`; + } else if (dateStr) { + return dateStr; + } else if (timeStr) { + return timeStr; + } + + return ''; + } catch (e) { + return ''; + } + }, // —— 任务列表：类型筛选 —— selectTasklistType(type) { this.tasklist.selectedType = type; @@ -5652,17 +5940,101 @@ ? this.mergeEpisodesByShow(filteredEpisodes) : filteredEpisodes; - // 统一对同一天节目按节目名称拼音排序（与内容管理一致） + // 根据排序选项进行排序 try { + const sortBy = this.calendar.sortBy || 'name'; + const sortOrder = this.calendar.sortOrder || 'asc'; + const factor = sortOrder === 'desc' ? -1 : 1; + result = result.slice().sort((a, b) => { - const an = (a && a.show_name) ? String(a.show_name) : ''; - const bn = (b && b.show_name) ? String(b.show_name) : ''; - const ak = pinyinPro.pinyin(an, { toneType: 'none', type: 'string' }).toLowerCase(); - const bk = pinyinPro.pinyin(bn, { toneType: 'none', type: 'string' }).toLowerCase(); - if (ak === bk) return 0; - return ak > bk ? 1 : -1; + if (sortBy === 'name') { + // 按节目名称拼音排序 + const an = (a && a.show_name) ? String(a.show_name) : ''; + const bn = (b && b.show_name) ? String(b.show_name) : ''; + const ak = pinyinPro.pinyin(an, { toneType: 'none', type: 'string' }).toLowerCase(); + const bk = pinyinPro.pinyin(bn, { toneType: 'none', type: 'string' }).toLowerCase(); + if (ak === bk) return 0; + return ak > bk ? 1 : -1; + } else if (sortBy === 'airtime') { + // 按播出时间排序 + // 获取播出日期和时间 + const getAirDateTime = (ep) => { + const airDate = ep.display_air_date || ep.air_date || ''; + const airTime = ep.local_air_time || ''; + // 解析时间（HH:MM） + let timeMinutes = null; + if (airTime) { + const timeMatch = String(airTime).trim().match(/^([0-2]?\d):([0-5]\d)/); + if (timeMatch) { + timeMinutes = parseInt(timeMatch[1]) * 60 + parseInt(timeMatch[2]); + } + } + return { date: airDate, time: timeMinutes }; + }; + + const aAir = getAirDateTime(a); + const bAir = getAirDateTime(b); + + // 没有播出时间的节目始终排在最末 + const aHasDate = !!aAir.date; + const bHasDate = !!bAir.date; + if (aHasDate !== bHasDate) { + return aHasDate ? -1 : 1; // 有日期的排在前面 + } + + // 都没有日期时，退回节目名称排序 + if (!aHasDate && !bHasDate) { + const an = (a && a.show_name) ? String(a.show_name) : ''; + const bn = (b && b.show_name) ? String(b.show_name) : ''; + const ak = pinyinPro.pinyin(an, { toneType: 'none', type: 'string' }).toLowerCase(); + const bk = pinyinPro.pinyin(bn, { toneType: 'none', type: 'string' }).toLowerCase(); + if (ak === bk) return 0; + return ak > bk ? 1 : -1; + } + + // 都有日期时，先按日期排序 + if (aAir.date !== bAir.date) { + return aAir.date > bAir.date ? 1 : -1; + } + + // 日期相同时，按时间排序 + if (aAir.time !== null && bAir.time !== null) { + if (aAir.time !== bAir.time) { + return aAir.time > bAir.time ? 1 : -1; + } + } else if (aAir.time !== null) { + return -1; // a有时间，b没有，a排在前面 + } else if (bAir.time !== null) { + return 1; // b有时间，a没有，b排在前面 + } + + // 时间也相同时，同一节目内的多集按集号排序 + if (a.show_name === b.show_name) { + const aEpNum = parseInt(a.episode_number || 0); + const bEpNum = parseInt(b.episode_number || 0); + if (aEpNum !== bEpNum) { + return aEpNum > bEpNum ? 1 : -1; + } + } + + // 最后按节目名称排序 + const an = (a && a.show_name) ? String(a.show_name) : ''; + const bn = (b && b.show_name) ? String(b.show_name) : ''; + const ak = pinyinPro.pinyin(an, { toneType: 'none', type: 'string' }).toLowerCase(); + const bk = pinyinPro.pinyin(bn, { toneType: 'none', type: 'string' }).toLowerCase(); + if (ak === bk) return 0; + return ak > bk ? 1 : -1; + } + return 0; }); - } catch (e) {} + + // 应用升降序 + if (sortOrder === 'desc') { + result.reverse(); + } + } catch (e) { + console.error('排序失败:', e); + } return result; }, From 3adcc2cc502d13563c12ed0a2ed57b1ef28b87d9 Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Sun, 21 Dec 2025 01:48:01 +0800 Subject: [PATCH 20/34] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E4=B8=AD=E6=B2=A1=E6=9C=89=E5=AD=A3=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E8=8A=82=E7=9B=AE=E6=97=A0=E6=B3=95=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=BE=85=E6=92=AD=E9=9B=86=E6=97=A5=E6=9C=9F=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在追剧日历的内容管理模式下，部分综艺节目（如 “你好，星期六”）由于文件名仅包含日期而不包含季号（Sxx），导致前端无法解析出 season_number。 此前后端未将数据库匹配到的 latest_season_number 返回给前端，导致前端在计算下一集播出时间时因缺少季号而失败。 本次修改在 enrich_tasks_with_calendar_meta 中明确注入了 latest_season_number 字段，确保前端在文件名解析失败时能正确回退使用数据库记录的最新季号。 --- app/run.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/run.py b/app/run.py index 75b892c..d4916c2 100644 --- a/app/run.py +++ b/app/run.py @@ -507,7 +507,6 @@ def enrich_tasks_with_calendar_meta(tasks_info: list) -> list: CalendarDB().upsert_season_metrics(int(tmdb_id), int(latest_sn), int(_effective_transferred or 0), int(aired_count or 0), int(total_count or 0), int(progress_pct), int(_now())) except Exception: pass - # 写回 task_metrics（以任务为键） try: if task_name and tmdb_id and latest_sn: from time import time as _now @@ -523,6 +522,11 @@ def enrich_tasks_with_calendar_meta(tasks_info: list) -> list: CalendarDB().upsert_task_metrics(task_name, int(tmdb_id), int(latest_sn), int(_effective_transferred or 0), int(progress_pct), int(_now())) except Exception: pass + + # 补充最新季号给前端（用于下一集查找逻辑） + if latest_sn: + t['latest_season_number'] = int(latest_sn) + enriched.append(t) return enriched except Exception: From e6634a361ed24d3bf313eb25bf0c3616d281eb41 Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Sun, 21 Dec 2025 18:12:16 +0800 Subject: [PATCH 21/34] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E4=BC=91=E7=9C=A0=E5=94=A4=E9=86=92=E5=90=8E=20SSE=20?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=87=AA=E5=8A=A8=E9=87=8D=E8=BF=9E=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E5=B7=B2=E6=92=AD=E5=87=BA=E7=8A=B6=E6=80=81=E4=B8=8D?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 问题描述： - 服务器休眠后唤醒时，SSE 连接断开 - 原代码在 onerror 中立即调用 close()，阻止了 EventSource 的自动重连 - 导致无法接收到唤醒后的补偿运行通知（daily_aired_update） - 已播出状态需要手动刷新页面才能更新，而已转存状态可以实时更新 解决方案： 1. 修改 onerror 处理逻辑：移除 close() 调用，让 EventSource 自动重连 2. 页面可见性变化时：从隐藏变为可见时主动尝试重连 SSE 3. 切换到追剧日历页面时：如果 SSE 断开，主动尝试重连 技术细节： - 不在 onerror 中调用 close()，利用 EventSource 的内置自动重连机制 - 保留轮询作为兜底，确保 SSE 断开时功能仍然可用 - 重连成功后，onopen 会触发，自动停止轮询 影响范围： - 仅影响 SSE 连接的重连机制 - 不影响其他功能（轮询、监听器、任务列表等） - 已播出状态现在可以像已转存状态一样实时更新 --- app/templates/index.html | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/app/templates/index.html b/app/templates/index.html index 7b41afe..4934b8b 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -4262,8 +4262,14 @@ } // 切换到追剧日历：立刻检查一次并启动后台监听；离开则停止监听 if (newValue === 'calendar') { - // 确保全局 SSE 已建立 - try { this.ensureGlobalSSE(); } catch (e) {} + // 确保全局 SSE 已建立（如果连接断开，尝试重连） + try { + if (!this.appSSE || !this.appSSEInitialized) { + // 重置标志，允许重连（服务器休眠后唤醒时特别有用） + this.appSSEInitialized = false; + } + this.ensureGlobalSSE(); + } catch (e) {} // 立即检查一次（若已初始化过监听，直接调用tick引用） // 先本地读取一次，立刻应用“已转存”状态（不依赖轮询） try { this.loadCalendarEpisodesLocal && this.loadCalendarEpisodesLocal(); } catch (e) {} @@ -4566,12 +4572,10 @@ } } catch (e) {} }; - // 统一 onerror：关闭SSE并回退双侧轮询 + // 统一 onerror：回退到轮询，但不关闭连接，让 EventSource 自动重连 + // 注意：不在 onerror 中调用 close()，这样 EventSource 会自动尝试重连 this.appSSE.onerror = () => { - try { this.appSSE.close(); } catch (e) {} - this.appSSE = null; - this.appSSEInitialized = false; - // 日历回退：若没有轮询定时器，则恢复轮询并立即执行一次 + // 回退到轮询，确保即使 SSE 断开也能继续工作 try { if (!this.calendarAutoWatchTimer && this.calendarAutoWatchTickRef) { const baseIntervalMs = this.calendar && this.calendar.manageMode ? 5 * 1000 : 60 * 1000; @@ -4579,12 +4583,14 @@ this.calendarAutoWatchTickRef(); } } catch (e) {} - // 任务列表回退：若没有轮询定时器，则恢复轮询 try { if (!this.tasklistAutoWatchTimer) { this.startTasklistPollingFallback(); } } catch (e) {} + // 不调用 close()，让 EventSource 自动重连 + // 如果连接长时间无法恢复，EventSource 会继续尝试重连 + // 重连成功后，onopen 会被触发，轮询会被停止 }; // ping 心跳占位 try { this.appSSE.addEventListener('ping', () => {}); } catch (e) {} @@ -6950,6 +6956,15 @@ this.calendarAutoWatchTimer = null; } } else { + // 页面从隐藏变为可见时，尝试重连 SSE（服务器休眠后唤醒时特别有用） + if (!this.appSSE || !this.appSSEInitialized) { + try { + // 重置标志，允许重连 + this.appSSEInitialized = false; + this.ensureGlobalSSE(); + } catch (e) {} + } + // 如果 SSE 连接失败，回退到轮询 if (!this.appSSE && !this.calendarAutoWatchTimer && this.calendarAutoWatchTickRef) { const baseIntervalMs = this.calendar && this.calendar.manageMode ? 5 * 1000 : 60 * 1000; this.calendarAutoWatchTimer = setInterval(this.calendarAutoWatchTickRef, baseIntervalMs); From c999913e9efa197d60ca420b2d79cff872fe58e7 Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Sun, 21 Dec 2025 23:02:39 +0800 Subject: [PATCH 22/34] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=92=AD=E5=87=BA?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=B7=E6=96=B0=E4=BB=BB=E5=8A=A1=E6=97=A5?= =?UTF-8?q?=E5=BF=97=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=9B=86=E5=8F=B7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 问题描述： 当同一天有多集播出时，播出状态刷新任务的日志会重复显示相同的节目名和季号， 用户无法区分是哪一集触发的刷新任务。 修改内容： 1. 修改 recompute_show_aired_progress 函数： - 添加可选的 season_number 和 episode_number 参数 - 当提供 episode_number 时，日志中显示集号信息 - 当提供 season_number 时，只处理指定的季 2. 修改 schedule_airtime_based_refresh_jobs 函数： - 在按播出时间安排任务时，传递 season_number 和 episode_number 参数 - 确保自动运行的任务日志包含集号信息 效果： - 之前：日志显示 "[节目名 · 第 X 季] 播出状态刷新任务" - 现在：日志显示 "[节目名 · 第 X 季 · 第 Y 集] 播出状态刷新任务" 兼容性： - 所有现有调用点保持兼容（新参数为可选参数） - 补偿刷新、手动刷新等场景不受影响（这些场景应刷新整个节目） 安全性： - 使用参数化查询，防止 SQL 注入 - 保持原有异常处理逻辑 - Lambda 函数使用默认参数避免闭包问题 --- app/run.py | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/app/run.py b/app/run.py index d4916c2..fa18d36 100644 --- a/app/run.py +++ b/app/run.py @@ -1508,8 +1508,15 @@ def recompute_all_seasons_aired_daily(): pass -def recompute_show_aired_progress(tmdb_id: int, now_local_dt=None): - """按节目维度重算播出/进度，供按播出时间触发与补偿使用""" +def recompute_show_aired_progress(tmdb_id: int, now_local_dt=None, season_number: int = None, episode_number: int = None): + """按节目维度重算播出/进度，供按播出时间触发与补偿使用 + + Args: + tmdb_id: 节目ID + now_local_dt: 当前本地时间，可选 + season_number: 季号，可选。如果提供，只刷新指定的季 + episode_number: 集号，可选。如果提供，日志中会显示集号信息 + """ try: from time import time as _now now_ts = int(_now()) @@ -1533,17 +1540,31 @@ def recompute_show_aired_progress(tmdb_id: int, now_local_dt=None): show_name = str(row[0]) except Exception: pass - cur.execute( - "SELECT season_number, episode_count FROM seasons WHERE tmdb_id=?", - (int(tmdb_id),), - ) + + # 如果指定了季号，只处理该季；否则处理所有季 + if season_number is not None: + cur.execute( + "SELECT season_number, episode_count FROM seasons WHERE tmdb_id=? AND season_number=?", + (int(tmdb_id), int(season_number)), + ) + else: + cur.execute( + "SELECT season_number, episode_count FROM seasons WHERE tmdb_id=?", + (int(tmdb_id),), + ) rows = cur.fetchall() or [] for season_no, total in rows: try: season_no_i = int(season_no) total_i = int(total or 0) + + # 构建日志显示名称：如果提供了集号，在日志中显示集号 + log_name = f"{show_name} · 第 {season_no_i} 季" + if episode_number is not None: + log_name = f"{show_name} · 第 {season_no_i} 季 · 第 {int(episode_number)} 集" + try: - logging.info(f">>> 开始执行 [{show_name} · 第 {season_no_i} 季] 播出状态刷新任务") + logging.info(f">>> 开始执行 [{log_name}] 播出状态刷新任务") except Exception: pass aired_i = 0 @@ -1566,7 +1587,7 @@ def recompute_show_aired_progress(tmdb_id: int, now_local_dt=None): progress_pct = (100 * min(transferred_i, denom) // denom) if denom > 0 else 0 cal_db.upsert_season_metrics(int(tmdb_id), season_no_i, None, aired_i, total_i, progress_pct, now_ts) try: - logging.info(f">>> [{show_name} · 第 {season_no_i} 季] 播出状态刷新任务执行成功") + logging.info(f">>> [{log_name}] 播出状态刷新任务执行成功") except Exception: pass except Exception: @@ -1765,8 +1786,11 @@ def schedule_airtime_based_refresh_jobs(days_back: int = 2, days_forward: int = # 未来的播出时间：注册 DateTrigger try: + _tmdb_id = int(tmdb_id) + _season_no = int(season_number) + _ep_no = int(episode_number) scheduler.add_job( - func=lambda _tmdb_id=int(tmdb_id): recompute_show_aired_progress(_tmdb_id), + func=lambda _tid=_tmdb_id, _sn=_season_no, _ep=_ep_no: recompute_show_aired_progress(_tid, season_number=_sn, episode_number=_ep), trigger=DateTrigger(run_date=target_dt), id=job_id, replace_existing=True, From 62d2b6e7395690e2a33e4900f2c2e3558b4a9e66 Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Sun, 21 Dec 2025 23:53:52 +0800 Subject: [PATCH 23/34] =?UTF-8?q?=E4=B8=BA=E6=B5=B7=E6=8A=A5=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E6=82=AC=E5=81=9C=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=A1=8C=E6=95=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为多个页面的海报卡片悬停信息添加显示行数限制，超长内容显示省略号，提升界面整洁度和可读性。 修改内容： 1. 任务列表页面海报视图的任务海报卡片悬停信息： - 第二行（匹配到的节目名称）：限制为1行 - 第三行（季标题）：限制为1行 2. 追剧日历页面海报视图的集海报卡片悬停信息： - 第一行（集标题）：限制为2行 3. 追剧日历页面内容管理模式的节目海报卡片悬停信息： - 第一行（匹配到的节目名称）：限制为2行 - 第三行（季标题）：限制为1行 4. 影视发现页面的海报卡片悬停信息： - 制片国家/地区：限制为1行 - 类型：限制为2行 - 导演：限制为1行（移除之前的数量限制，改为行数限制） - 主演：限制为2行 技术实现： HTML修改： - 为指定元素添加 info-line-single 或 info-line-double CSS类 - 任务列表、追剧日历页面：直接在HTML元素上添加类名 - 影视发现页面：通过动态类绑定，根据信息类型应用相应样式 CSS修改： - 新增 .info-line-single 样式：单行限制，使用 white-space: nowrap 和 text-overflow: ellipsis - 新增 .info-line-double 样式：双行限制，使用 -webkit-line-clamp: 2 实现多行截断 - 样式作用域限定在 .discovery-poster-overlay 和 .calendar-poster-overlay 内 JavaScript修改： - 修改 getMovieDetails 函数：返回对象数组而非字符串数组 - 每个对象包含 text（文本内容）和 type（信息类型）字段 - 通过 detail.type 判断信息类型，确保即使某些信息缺失也能正确识别 影响范围： - 仅影响指定位置的海报悬停信息显示 - 不影响其他功能和其他页面的海报悬停信息 - 正确处理边界情况（信息缺失、格式不完整等） --- app/static/css/main.css | 22 +++++++++++++++++++++ app/templates/index.html | 41 ++++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/app/static/css/main.css b/app/static/css/main.css index 26294ab..4e49a3b 100644 --- a/app/static/css/main.css +++ b/app/static/css/main.css @@ -8562,4 +8562,26 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { .api-label-link:focus { color: var(--focus-border-color); text-decoration: none; +} + +/* 海报悬停信息行数限制样式 */ +/* 单行限制：最多显示一行，超长部分截断显示省略号 */ +.discovery-poster-overlay .info-line-single, +.calendar-poster-overlay .info-line-single { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + display: block; +} + +/* 双行限制：最多显示两行，如果两行还不能显示完整，超长部分截断显示省略号 */ +.discovery-poster-overlay .info-line-double, +.calendar-poster-overlay .info-line-double { + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + white-space: normal; + word-wrap: break-word; } \ No newline at end of file diff --git a/app/templates/index.html b/app/templates/index.html index 4934b8b..8b09c02 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -1466,7 +1466,7 @@
    #{{ String((task.__originalIndex !== undefined ? task.__originalIndex : index) + 1).padStart(2, '0') }}
    -
    +
    @@ -1475,7 +1475,7 @@
    -
    +
    {{ getCalendarTaskByName(task.taskname).latest_season_name }}
    @@ -2040,8 +2040,14 @@
    -
    - {{ detail }} +
    + {{ detail.text }}
    @@ -2263,7 +2269,7 @@ {{ getTransferProgress(task) }}%
    -
    +
    @@ -2272,7 +2278,7 @@
    {{ task.matched_year }}
    -
    {{ task.latest_season_name }}
    +
    {{ task.latest_season_name }}
    {{ getTaskNextAirDateTimeDisplayForCalendar(task) }}
    @@ -2345,7 +2351,7 @@
    -
    {{ episode.name || episode.show_name }}
    +
    {{ episode.name || episode.show_name }}
    {{ episode.overview }}
    @@ -13667,36 +13673,29 @@ }, getMovieDetails(item) { // 处理card_subtitle信息用于海报悬停显示 + // 格式: 年份 / 地区 / 类型 / 导演 / 主演 if (item.card_subtitle) { const parts = item.card_subtitle.split(' / '); const details = []; if (parts.length >= 1 && parts[0]) { - details.push(parts[0]); // 年份 + details.push({ text: parts[0], type: 'year' }); // 年份 } if (parts.length >= 2 && parts[1]) { - details.push(parts[1]); // 地区 + details.push({ text: parts[1], type: 'region' }); // 地区 } if (parts.length >= 3 && parts[2]) { - details.push(parts[2]); // 类型 + details.push({ text: parts[2], type: 'genre' }); // 类型 } if (parts.length >= 4 && parts[3]) { - // 处理导演信息，最多显示两个导演 + // 处理导演信息，不限制数量，通过CSS限制显示行数 const directors = parts[3].trim(); if (directors) { - const directorList = directors.split(/\s+/); // 按空格分割导演名字 - if (directorList.length > 2) { - // 如果导演超过2个，只取前两个 - const limitedDirectors = directorList.slice(0, 2).join(' '); - details.push(limitedDirectors); - } else { - // 导演不超过2个，直接显示 - details.push(directors); - } + details.push({ text: directors, type: 'director' }); } } if (parts.length >= 5 && parts[4]) { - details.push(parts[4]); // 主演 + details.push({ text: parts[4], type: 'cast' }); // 主演 } return details; From 8b2a88897a80d3c76a718961bcaee9d2fdab095a Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Mon, 22 Dec 2025 17:20:53 +0800 Subject: [PATCH 24/34] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=BF=BD=E5=89=A7?= =?UTF-8?q?=E6=97=A5=E5=8E=86=E5=86=85=E5=AE=B9=E7=AE=A1=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E6=B5=B7=E6=8A=A5=E6=82=AC=E5=81=9C=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=AD=E8=8A=82=E7=9B=AE=E5=90=8D=E7=A7=B0=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=A1=8C=E6=95=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/index.html b/app/templates/index.html index 8b09c02..39161c7 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -2269,7 +2269,7 @@ {{ getTransferProgress(task) }}%
    -
    +
    From 9ac84e22c7e253c91cb33b0c07ae3ccf976fb5a0 Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Mon, 22 Dec 2025 23:51:40 +0800 Subject: [PATCH 25/34] =?UTF-8?q?=E4=BD=BF=E7=94=A8=20CSS=20=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E7=BB=9F=E4=B8=80=E7=AE=A1=E7=90=86=E6=A8=A1=E6=80=81?= =?UTF-8?q?=E6=A1=86=E5=92=8C=E7=99=BB=E5=BD=95=E6=A8=A1=E5=9D=97=E7=9A=84?= =?UTF-8?q?=E5=9C=86=E8=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 :root 中添加 --modal-border-radius 变量，默认值为 12px - 将所有模态框弹窗和登录模块的圆角值替换为 var(--modal-border-radius) - 现在可以通过修改一个变量来统一调整所有相关圆角 --- app/static/css/main.css | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/app/static/css/main.css b/app/static/css/main.css index 4e49a3b..4292cb9 100644 --- a/app/static/css/main.css +++ b/app/static/css/main.css @@ -14,6 +14,7 @@ --focus-border-color: #0D53FF; /* 输入框聚焦时的边框颜色 */ --shadow-spread: 0; /* 统一阴影扩散距离设为0 */ --button-gray-background-color: #ededf0; /* 按钮灰色背景颜色 */ + --modal-border-radius: 12px; /* 模态框弹窗和登录模块的统一圆角 */ } /* --------------- 基础样式 --------------- */ @@ -1462,7 +1463,7 @@ button.close:focus, } #logModal .modal-content { - border-radius: 6px; + border-radius: var(--modal-border-radius); border: 1px solid var(--border-color); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.1); } @@ -1472,8 +1473,8 @@ button.close:focus, background-color: #fff; border-bottom: 1px solid var(--border-color); padding: 11px 16px; - border-top-left-radius: 6px; - border-top-right-radius: 6px; + border-top-left-radius: var(--modal-border-radius); + border-top-right-radius: var(--modal-border-radius); } #logModal .modal-title { @@ -1551,7 +1552,7 @@ button.close:focus, #fileSelectModal .modal-content, #createTaskModal .modal-content, #editMetadataModal .modal-content { - border-radius: 6px; + border-radius: var(--modal-border-radius); border: 1px solid var(--border-color); box-shadow: 0 3px 7px rgba(0, 0, 0, 0.1); } @@ -1563,8 +1564,8 @@ button.close:focus, background-color: #fff; border-bottom: 1px solid var(--border-color); padding: 11px 16px; - border-top-left-radius: 6px; - border-top-right-radius: 6px; + border-top-left-radius: var(--modal-border-radius); + border-top-right-radius: var(--modal-border-radius); } #fileSelectModal .modal-title, @@ -2258,7 +2259,7 @@ div.jsoneditor-tree button.jsoneditor-button:focus { .login-card { width: 340px; background-color: white; - border-radius: 10px; + border-radius: var(--modal-border-radius); box-shadow: 0 8px 24px rgba(0, 0, 0, 0.15); padding: 0; text-align: center; @@ -4922,6 +4923,17 @@ select.task-filter-select, max-width: 80%; } +#batchRenameModal .modal-content { + border-radius: var(--modal-border-radius); + border: 1px solid var(--border-color); + box-shadow: 0 3px 7px rgba(0, 0, 0, 0.1); +} + +#batchRenameModal .modal-header { + border-top-left-radius: var(--modal-border-radius); + border-top-right-radius: var(--modal-border-radius); +} + #batchRenameModal .table { margin-bottom: 0; } From 0972a60d912075bd3be6be3c7cfa952a7486ecdb Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Tue, 23 Dec 2025 00:35:24 +0800 Subject: [PATCH 26/34] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=BD=E5=89=A7?= =?UTF-8?q?=E6=97=A5=E5=8E=86=E6=B5=B7=E6=8A=A5=E8=A7=86=E5=9B=BE=E7=9A=84?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=AF=BC=E8=88=AA=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 主要改进： 1. 日期导航项支持点击选择，选中状态使用 var(--focus-border-color) 高亮显示 2. 悬停样式与分类按钮（全部/剧集/动画/综艺）保持一致 3. 日期偏移逻辑优化：以选中的日期为基准进行前后一天/周偏移 4. 智能视图调整：新日期在视图范围内时只更新选中状态，超出范围时自动调整视图 详细修改： HTML (app/templates/index.html): - 日期导航项添加 @click 事件和 :class 选中状态绑定 - 新增 selectPosterDate 函数处理海报视图日期选择 CSS (app/static/css/main.css): - 日期项添加 cursor: pointer 和过渡动画 - 添加悬停样式（:hover:not(.selected)）与分类按钮一致 - 添加选中样式（.selected）使用 focus-border-color 高亮 - 移除原有的 .today 固定高亮样式 JavaScript (app/templates/index.html): - 新增 selectPosterDate 函数：处理海报视图日期点击选择 - 优化 changeCalendarDate 函数： * 海报视图模式下以 selectedDate 为基准计算偏移 * 检查新日期是否在视图范围内，智能决定是否调整视图 * 添加完善的错误处理和日期验证 - 优化 goToToday 函数：同步更新 selectedDate 为今天 安全性： - 所有日期解析操作都有 try-catch 保护 - 日期格式验证和有效性检查 - 解析失败时回退到安全的默认行为 兼容性： - 日历视图模式保持原有逻辑不变 - 不影响其他功能模块 - 桌面端和移动端均正常工作 --- app/static/css/main.css | 11 ++- app/templates/index.html | 195 +++++++++++++++++++++++++++++++++------ 2 files changed, 178 insertions(+), 28 deletions(-) diff --git a/app/static/css/main.css b/app/static/css/main.css index 4292cb9..a0d1ec9 100644 --- a/app/static/css/main.css +++ b/app/static/css/main.css @@ -7165,10 +7165,17 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { height: 32px; font-size: 0.95rem; color: var(--dark-text-color); - cursor: default; + cursor: pointer; + transition: background-color 0.2s, border-color 0.2s, color 0.2s; } -.calendar-date-item.today { +.calendar-date-item:hover:not(.selected) { + background-color: var(--dark-text-color); + border-color: var(--dark-text-color); + color: white; +} + +.calendar-date-item.selected { background-color: var(--focus-border-color); border-color: var(--focus-border-color); color: white; diff --git a/app/templates/index.html b/app/templates/index.html index 39161c7..4989354 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -2308,7 +2308,8 @@
    + :class="{ 'selected': date.date === calendar.selectedDate }" + @click="selectPosterDate(date.date)">
    {{ date.weekday }}
    {{ date.day }}
    @@ -4890,6 +4891,13 @@ this.calendar.selectedDate = day.date; } catch (e) {} }, + // 选择海报视图日期 + selectPosterDate(dateStr) { + try { + if (!dateStr) return; + this.calendar.selectedDate = dateStr; + } catch (e) {} + }, // 根据日期字符串获取当日剧集数组 getEpisodesByDate(dateStr) { if (!dateStr) return []; @@ -7163,36 +7171,171 @@ // 更改日期 changeCalendarDate(action) { - const currentDate = new Date(this.calendar.currentDate); - - switch (action) { - case 'prevDay': - currentDate.setDate(currentDate.getDate() - 1); - break; - case 'nextDay': - currentDate.setDate(currentDate.getDate() + 1); - break; - case 'prevWeek': - currentDate.setDate(currentDate.getDate() - 7); - break; - case 'nextWeek': - currentDate.setDate(currentDate.getDate() + 7); - break; - case 'prevMonth': - currentDate.setMonth(currentDate.getMonth() - 1); - break; - case 'nextMonth': - currentDate.setMonth(currentDate.getMonth() + 1); - break; + // 海报视图模式下，以选中的日期为基准进行偏移 + if (this.calendar.viewMode === 'poster') { + // 解析选中的日期 + const selectedDateStr = this.calendar.selectedDate; + if (!selectedDateStr) { + // 如果没有选中日期，使用当前日期 + const currentDate = new Date(this.calendar.currentDate); + switch (action) { + case 'prevDay': + currentDate.setDate(currentDate.getDate() - 1); + break; + case 'nextDay': + currentDate.setDate(currentDate.getDate() + 1); + break; + case 'prevWeek': + currentDate.setDate(currentDate.getDate() - 7); + break; + case 'nextWeek': + currentDate.setDate(currentDate.getDate() + 7); + break; + case 'prevMonth': + currentDate.setMonth(currentDate.getMonth() - 1); + break; + case 'nextMonth': + currentDate.setMonth(currentDate.getMonth() + 1); + break; + } + this.calendar.currentDate = currentDate; + this.calendar.selectedDate = this.formatDateToYYYYMMDD(currentDate); + this.initializeCalendarDates(); + return; + } + + // 解析选中日期 + let selectedDate; + try { + const selectedDateParts = selectedDateStr.split('-'); + if (selectedDateParts.length !== 3) { + // 日期格式不正确，回退到使用当前日期 + const currentDate = new Date(this.calendar.currentDate); + switch (action) { + case 'prevDay': currentDate.setDate(currentDate.getDate() - 1); break; + case 'nextDay': currentDate.setDate(currentDate.getDate() + 1); break; + case 'prevWeek': currentDate.setDate(currentDate.getDate() - 7); break; + case 'nextWeek': currentDate.setDate(currentDate.getDate() + 7); break; + case 'prevMonth': currentDate.setMonth(currentDate.getMonth() - 1); break; + case 'nextMonth': currentDate.setMonth(currentDate.getMonth() + 1); break; + } + this.calendar.currentDate = currentDate; + this.calendar.selectedDate = this.formatDateToYYYYMMDD(currentDate); + this.initializeCalendarDates(); + return; + } + selectedDate = new Date( + parseInt(selectedDateParts[0], 10), + parseInt(selectedDateParts[1], 10) - 1, + parseInt(selectedDateParts[2], 10) + ); + // 验证日期是否有效 + if (isNaN(selectedDate.getTime())) { + throw new Error('Invalid date'); + } + } catch (e) { + // 日期解析失败，回退到使用当前日期 + const currentDate = new Date(this.calendar.currentDate); + switch (action) { + case 'prevDay': currentDate.setDate(currentDate.getDate() - 1); break; + case 'nextDay': currentDate.setDate(currentDate.getDate() + 1); break; + case 'prevWeek': currentDate.setDate(currentDate.getDate() - 7); break; + case 'nextWeek': currentDate.setDate(currentDate.getDate() + 7); break; + case 'prevMonth': currentDate.setMonth(currentDate.getMonth() - 1); break; + case 'nextMonth': currentDate.setMonth(currentDate.getMonth() + 1); break; + } + this.calendar.currentDate = currentDate; + this.calendar.selectedDate = this.formatDateToYYYYMMDD(currentDate); + this.initializeCalendarDates(); + return; + } + + // 计算新日期 + const newDate = new Date(selectedDate); + switch (action) { + case 'prevDay': + newDate.setDate(newDate.getDate() - 1); + break; + case 'nextDay': + newDate.setDate(newDate.getDate() + 1); + break; + case 'prevWeek': + newDate.setDate(newDate.getDate() - 7); + break; + case 'nextWeek': + newDate.setDate(newDate.getDate() + 7); + break; + case 'prevMonth': + newDate.setMonth(newDate.getMonth() - 1); + break; + case 'nextMonth': + newDate.setMonth(newDate.getMonth() + 1); + break; + } + + const newDateStr = this.formatDateToYYYYMMDD(newDate); + + // 检查新日期是否在当前视图范围内 + const currentViewStart = new Date(this.calendar.currentDate); + const availableWidth = this.getCalendarAvailableWidth(); + const minColumnWidth = 140; + const columnGap = 20; + const eps = 0.1; + const maxColumns = Math.max(2, Math.floor((availableWidth + columnGap - eps) / (minColumnWidth + columnGap))); + const currentViewEnd = new Date(currentViewStart); + currentViewEnd.setDate(currentViewStart.getDate() + maxColumns - 1); + + // 比较日期（只比较年月日，忽略时间） + const newDateOnly = new Date(newDate.getFullYear(), newDate.getMonth(), newDate.getDate()); + const viewStartOnly = new Date(currentViewStart.getFullYear(), currentViewStart.getMonth(), currentViewStart.getDate()); + const viewEndOnly = new Date(currentViewEnd.getFullYear(), currentViewEnd.getMonth(), currentViewEnd.getDate()); + + // 如果新日期在视图范围内，只更新选中日期，不改变视图 + if (newDateOnly >= viewStartOnly && newDateOnly <= viewEndOnly) { + this.calendar.selectedDate = newDateStr; + } else { + // 如果新日期不在视图范围内，调整视图使新日期在范围内 + // 将新日期设置为视图的起始日期 + this.calendar.currentDate = newDate; + this.calendar.selectedDate = newDateStr; + this.initializeCalendarDates(); + } + } else { + // 日历视图模式，保持原有逻辑 + const currentDate = new Date(this.calendar.currentDate); + + switch (action) { + case 'prevDay': + currentDate.setDate(currentDate.getDate() - 1); + break; + case 'nextDay': + currentDate.setDate(currentDate.getDate() + 1); + break; + case 'prevWeek': + currentDate.setDate(currentDate.getDate() - 7); + break; + case 'nextWeek': + currentDate.setDate(currentDate.getDate() + 7); + break; + case 'prevMonth': + currentDate.setMonth(currentDate.getMonth() - 1); + break; + case 'nextMonth': + currentDate.setMonth(currentDate.getMonth() + 1); + break; + } + + this.calendar.currentDate = currentDate; + this.initializeCalendarDates(); } - - this.calendar.currentDate = currentDate; - this.initializeCalendarDates(); }, // 回到今天 goToToday() { - this.calendar.currentDate = new Date(); + const today = new Date(); + this.calendar.currentDate = today; + // 更新selectedDate为今天的日期 + this.calendar.selectedDate = this.formatDateToYYYYMMDD(today); this.initializeCalendarDates(); }, From 3d3e5fb233cc45cd39f612f8dbd7dd394522385d Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Tue, 23 Dec 2025 01:13:58 +0800 Subject: [PATCH 27/34] =?UTF-8?q?=E4=B8=BA=E6=A1=8C=E9=9D=A2=E7=AB=AF?= =?UTF-8?q?=E8=BF=BD=E5=89=A7=E6=97=A5=E5=8E=86=E8=A7=86=E5=9B=BE=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=80=89=E4=B8=AD=E6=97=A5=E6=9C=9F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 桌面端日历视图选中日期的号数高亮显示（使用 focus-border-color） - 默认进入日历视图时当天日期自动选中并高亮 - 支持点击日历单元格选中日期，再次点击已选中日期可取消选择并恢复为当天 - 在日历视图日期切换组件中增加前后一天按钮（与海报视图一致） - 支持通过前后一天按钮切换选中日期，跨月时自动切换月份视图 - 移动端选中日期功能保持不变（背景色高亮） --- app/static/css/main.css | 7 ++ app/templates/index.html | 166 +++++++++++++++++++++++++++++++++------ 2 files changed, 147 insertions(+), 26 deletions(-) diff --git a/app/static/css/main.css b/app/static/css/main.css index a0d1ec9..5eae137 100644 --- a/app/static/css/main.css +++ b/app/static/css/main.css @@ -7441,6 +7441,13 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { display: none; /* 隐藏蓝色圆形背景 */ } +/* 桌面端：选中日期的号数高亮显示（使用 focus-border-color） */ +@media (min-width: 577px) { + .calendar-month-cell.selected .calendar-month-date { + color: var(--focus-border-color); + } +} + .calendar-month-cell.has-episodes { background-color: transparent !important; /* 去除有播出集背景色 */ } diff --git a/app/templates/index.html b/app/templates/index.html index 4989354..310b251 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -2191,7 +2191,13 @@ + + @@ -4888,7 +4894,14 @@ selectCalendarDate(day) { try { if (!day || !day.date) return; - this.calendar.selectedDate = day.date; + // 如果点击的日期已经是选中日期，则取消选择，恢复为今天 + if (this.calendar.selectedDate === day.date) { + const today = new Date(); + this.calendar.selectedDate = this.formatDateToYYYYMMDD(today); + } else { + // 否则选中点击的日期 + this.calendar.selectedDate = day.date; + } } catch (e) {} }, // 选择海报视图日期 @@ -7301,32 +7314,133 @@ this.initializeCalendarDates(); } } else { - // 日历视图模式，保持原有逻辑 - const currentDate = new Date(this.calendar.currentDate); - - switch (action) { - case 'prevDay': - currentDate.setDate(currentDate.getDate() - 1); - break; - case 'nextDay': - currentDate.setDate(currentDate.getDate() + 1); - break; - case 'prevWeek': - currentDate.setDate(currentDate.getDate() - 7); - break; - case 'nextWeek': - currentDate.setDate(currentDate.getDate() + 7); - break; - case 'prevMonth': - currentDate.setMonth(currentDate.getMonth() - 1); - break; - case 'nextMonth': - currentDate.setMonth(currentDate.getMonth() + 1); - break; + // 日历视图模式 + if (action === 'prevDay' || action === 'nextDay') { + // 前后一天切换：基于选中的日期进行切换 + const selectedDateStr = this.calendar.selectedDate; + if (!selectedDateStr) { + // 如果没有选中日期，使用当前日期 + const currentDate = new Date(this.calendar.currentDate); + if (action === 'prevDay') { + currentDate.setDate(currentDate.getDate() - 1); + } else { + currentDate.setDate(currentDate.getDate() + 1); + } + this.calendar.currentDate = currentDate; + this.calendar.selectedDate = this.formatDateToYYYYMMDD(currentDate); + this.initializeCalendarDates(); + return; + } + + // 解析选中日期 + let selectedDate; + try { + const selectedDateParts = selectedDateStr.split('-'); + if (selectedDateParts.length !== 3) { + throw new Error('Invalid date format'); + } + selectedDate = new Date( + parseInt(selectedDateParts[0], 10), + parseInt(selectedDateParts[1], 10) - 1, + parseInt(selectedDateParts[2], 10) + ); + if (isNaN(selectedDate.getTime())) { + throw new Error('Invalid date'); + } + } catch (e) { + // 日期解析失败，回退到使用当前日期 + const currentDate = new Date(this.calendar.currentDate); + if (action === 'prevDay') { + currentDate.setDate(currentDate.getDate() - 1); + } else { + currentDate.setDate(currentDate.getDate() + 1); + } + this.calendar.currentDate = currentDate; + this.calendar.selectedDate = this.formatDateToYYYYMMDD(currentDate); + this.initializeCalendarDates(); + return; + } + + // 计算新日期 + const newDate = new Date(selectedDate); + if (action === 'prevDay') { + newDate.setDate(newDate.getDate() - 1); + } else { + newDate.setDate(newDate.getDate() + 1); + } + + const newDateStr = this.formatDateToYYYYMMDD(newDate); + + // 检查新日期是否在当前月份 + const currentMonth = this.calendar.currentDate.getMonth(); + const currentYear = this.calendar.currentDate.getFullYear(); + const newMonth = newDate.getMonth(); + const newYear = newDate.getFullYear(); + + // 如果新日期是当月，只更新选中日期 + if (newYear === currentYear && newMonth === currentMonth) { + this.calendar.selectedDate = newDateStr; + } else { + // 如果新日期跨月了，切换到对应月份的日期范围和视图 + this.calendar.currentDate = newDate; + this.calendar.selectedDate = newDateStr; + this.initializeCalendarDates(); + } + } else { + // 其他操作（前后一月、前后一周等）保持原有逻辑 + const currentDate = new Date(this.calendar.currentDate); + + switch (action) { + case 'prevWeek': + currentDate.setDate(currentDate.getDate() - 7); + break; + case 'nextWeek': + currentDate.setDate(currentDate.getDate() + 7); + break; + case 'prevMonth': + currentDate.setMonth(currentDate.getMonth() - 1); + break; + case 'nextMonth': + currentDate.setMonth(currentDate.getMonth() + 1); + break; + } + + this.calendar.currentDate = currentDate; + // 切换月份后，如果当前没有选中日期或选中日期不在新月份，则选中新月份的第一天 + const newMonth = currentDate.getMonth(); + const newYear = currentDate.getFullYear(); + const selectedDateStr = this.calendar.selectedDate; + let needUpdateSelected = true; + + if (selectedDateStr) { + try { + const selectedDateParts = selectedDateStr.split('-'); + if (selectedDateParts.length === 3) { + const selectedDate = new Date( + parseInt(selectedDateParts[0], 10), + parseInt(selectedDateParts[1], 10) - 1, + parseInt(selectedDateParts[2], 10) + ); + if (!isNaN(selectedDate.getTime()) && + selectedDate.getFullYear() === newYear && + selectedDate.getMonth() === newMonth) { + // 选中日期在新月份内，保持不变 + needUpdateSelected = false; + } + } + } catch (e) { + // 解析失败，需要更新 + } + } + + if (needUpdateSelected) { + // 选中新月份的第一天 + const firstDay = new Date(newYear, newMonth, 1); + this.calendar.selectedDate = this.formatDateToYYYYMMDD(firstDay); + } + + this.initializeCalendarDates(); } - - this.calendar.currentDate = currentDate; - this.initializeCalendarDates(); } }, From 05002019fb13a08b1e52c3d15c122aa118b5e7a0 Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Tue, 23 Dec 2025 01:31:08 +0800 Subject: [PATCH 28/34] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=82=AC=E5=81=9C=E6=8C=87=E9=92=88=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将任务列表和追剧日历页面的排序下拉框（未下拉状态）的悬停指针从手型改为普通指针 - 保持与下拉菜单交互的一致性 --- app/static/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/static/css/main.css b/app/static/css/main.css index 5eae137..808b2dc 100644 --- a/app/static/css/main.css +++ b/app/static/css/main.css @@ -8040,7 +8040,7 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { -webkit-appearance: none; -moz-appearance: none; background: #fff !important; - cursor: pointer; + cursor: default; background-image: none; height: 32px; line-height: 30px; From b3e525bb9bc1fe1afb6cbd9d5d190d8c279431ed Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Tue, 23 Dec 2025 02:14:35 +0800 Subject: [PATCH 29/34] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=85=83=E7=B4=A0=E7=9A=84=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E6=8C=87=E9=92=88=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将背景色为 --button-gray-background-color 但不可操作的标题和内容元素的鼠标指针从文本指针改为普通指针，提升用户体验和界面一致性。 修改内容： - CSS样式调整： * 任务数量指示器、表头、输入组文本等不可操作元素使用 cursor: default * 系统配置页面模块大标题、模态框标题使用普通指针 * 海报卡片下方的类型/集数信息使用普通指针 * 保持可点击元素（按钮、链接、图标）的指针样式不变 - HTML模板调整： * 为"账号设置"、"Cookie"、"定时规则"三个大标题添加 title 属性 * 使其与问号图标的悬停提示信息保持一致 影响范围： - 任务列表页面、影视发现页面、追剧日历页面 - 系统配置页面、所有模态框 - 表格表头、输入组前缀文本等 安全性： - 仅修改视觉样式，不影响功能逻辑 - 向后兼容，无破坏性变更 --- app/static/css/main.css | 31 ++++++++++++++++++++++++++++--- app/templates/index.html | 6 +++--- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/app/static/css/main.css b/app/static/css/main.css index 808b2dc..54f03e0 100644 --- a/app/static/css/main.css +++ b/app/static/css/main.css @@ -208,6 +208,7 @@ main .row.title h2 { margin-top: 0; line-height: 1.5; padding-left: 0px; /* 标题文字左内边距 */ + cursor: default; /* 不可操作的模块大标题使用普通指针 */ } /* 标题旁边的问号图标容器样式 */ @@ -1110,6 +1111,7 @@ select.form-control { display: flex; align-items: center; justify-content: center; + cursor: pointer; /* 可点击的图标按钮使用指针 */ } .input-group-text:has(.bi-google):hover, @@ -1172,6 +1174,7 @@ textarea.form-control { border-color: var(--border-color) !important; /* 使用变量替代硬编码颜色 */ background-color: #ededf0!important; /* 修改背景色为更浅的灰色 */ border-width: 1px !important; /* 确保边框宽度为1px */ + cursor: default; /* 不可操作的配置选项标题使用普通指针 */ } .input-group-prepend .input-group-text { @@ -1259,6 +1262,7 @@ table.table thead th { height: 40px !important; /* 确保表头高度为40px */ line-height: 24px !important; /* 设置行高以确保文字垂直居中 */ box-sizing: border-box !important; /* 确保边框包含在总高度内 */ + cursor: default; /* 不可操作的表头使用普通指针 */ } /* 表头悬停样式 */ @@ -1483,6 +1487,7 @@ button.close:focus, color: var(--dark-text-color); display: flex; align-items: center; + cursor: default; /* 不可操作的模态框标题使用普通指针 */ } #logModal .modal-title b { @@ -1576,6 +1581,7 @@ button.close:focus, color: var(--dark-text-color); display: flex; align-items: center; + cursor: default; /* 不可操作的模态框标题使用普通指针 */ } #fileSelectModal .modal-title b, @@ -1669,6 +1675,7 @@ button.close:focus, /* 编辑元数据模态框：输入前标题灰底，统一输入高度与字体，与创建任务保持一致 */ #editMetadataModal .input-group-prepend .input-group-text { background-color: var(--button-gray-background-color) !important; + cursor: default; /* 不可操作的前缀文本使用普通指针 */ } #editMetadataModal .form-control, #editMetadataModal .input-group-text, @@ -1845,6 +1852,7 @@ button.close:focus, z-index: 5; vertical-align: middle; /* 添加：垂直居中对齐 */ height: 40px !important; /* 添加：自动高度，确保与内容一致 */ + cursor: default; /* 不可操作的表头使用普通指针 */ } /* 模态框表格列宽设置 - 基于内容类型 */ @@ -2734,6 +2742,11 @@ body { color: var(--dark-text-color); } +/* 所有模态框标题使用普通指针 */ +.modal-title { + cursor: default; /* 不可操作的模态框标题使用普通指针 */ +} + /* 设置输入框占位符的颜色 */ .form-control::placeholder { color: var(--light-text-color); /* 修改占位符颜色 */ @@ -5248,6 +5261,7 @@ table.selectable-files th { height: 40px !important; /* 确保表头高度为40px */ line-height: 24px !important; /* 设置行高以确保文字垂直居中 */ box-sizing: border-box !important; /* 确保边框包含在总高度内 */ + cursor: default; /* 不可操作的表头使用普通指针 */ } /* 文件整理页面表格单元格样式，与转存记录页面保持一致 */ @@ -6028,6 +6042,7 @@ body .selectable-files tr.selected-file:has([style*="white-space: normal"]) .fil justify-content: center; padding: 0 8px; transition: all 0.2s ease; + cursor: pointer; /* 可点击的按钮使用指针 */ } #createTaskModal .input-group-text:hover { @@ -6041,12 +6056,14 @@ body .selectable-files tr.selected-file:has([style*="white-space: normal"]) .fil background-color: var(--button-gray-background-color) !important; border-color: var(--border-color) !important; color: var(--dark-text-color) !important; + cursor: default; /* 不可操作的后缀文本使用普通指针 */ } #createTaskModal .input-group-text:has(input[type="checkbox"]):hover { background-color: var(--button-gray-background-color) !important; border-color: var(--border-color) !important; color: var(--dark-text-color) !important; + cursor: default; /* 悬停时也保持普通指针 */ } /* 创建任务模态框中的按钮样式 - 完全复制任务列表样式 */ @@ -6781,6 +6798,7 @@ body .selectable-files tr.selected-file:has([style*="white-space: normal"]) .fil overflow: hidden; text-overflow: ellipsis; white-space: nowrap; + cursor: default; /* 不可操作的类型/集数信息使用普通指针 */ } .genre-slash { @@ -7363,6 +7381,7 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + cursor: default; /* 不可操作的星期表头使用普通指针 */ } /* 移除星期导航最后一列的右侧分割线，避免溢出 */ @@ -7948,11 +7967,16 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { border-color: #0A42CC !important; } -/* 显示设置：拖拽时显示“移动”而非“添加”视觉提示 */ +/* 显示设置：拖拽时显示"移动"而非"添加"视觉提示 */ .draggable-item { cursor: move; /* 显示移动光标 */ } +/* 显示设置可拖动配置项的标题也使用拖拽指针 */ +.draggable-item .input-group-text { + cursor: move !important; /* 可拖动配置项的标题使用拖拽指针 */ +} + .draggable-item:active { opacity: 1; } @@ -8020,7 +8044,7 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { font-size: 0.95rem; /* 与左侧类型按钮一致 */ } -/* 左侧“按”按钮：保留边框，去右边框，与中间边框重叠 */ +/* 左侧"按"按钮：保留边框，去右边框，与中间边框重叠 */ .tasklist-sort-pill-icon { width: 31px; min-width: 31px; @@ -8029,6 +8053,7 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { border-right: none !important; border-radius: 6px 0 0 6px; background-color: var(--button-gray-background-color); + cursor: default; /* 不可操作的"按"按钮使用普通指针 */ } /* 中间下拉：白底，负责显示唯一可见边框（上下左右均有） */ @@ -8488,7 +8513,7 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { } .tasklist-count-number { - cursor: text; + cursor: default; user-select: text; } diff --git a/app/templates/index.html b/app/templates/index.html index 310b251..2c48dc2 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -430,7 +430,7 @@
    -
    +

    账号设置

    @@ -462,7 +462,7 @@
    -
    +

    Cookie

    @@ -488,7 +488,7 @@
    -
    +

    定时规则

    From b6820174996c5cbd4321bf212e554a35e9248be3 Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Tue, 23 Dec 2025 15:54:51 +0800 Subject: [PATCH 30/34] =?UTF-8?q?=E5=9C=A8=E8=BF=BD=E5=89=A7=E6=97=A5?= =?UTF-8?q?=E5=8E=86=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=92=8C=E6=97=A5=E6=9C=9F=E6=82=AC=E5=81=9C?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在追剧日历页面右上角排序组件后方增加计数模块，样式与任务列表一致 - 海报/日历视图：显示选中日期当天的节目数和集数（合并集按实际分集数计算） - 内容管理模式：显示匹配和未匹配任务总数，悬停显示详细匹配情况 - 日历视图日期号数和海报视图日期导航增加悬停信息，显示对应日期的计数信息 --- app/static/css/main.css | 5 ++ app/templates/index.html | 180 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 184 insertions(+), 1 deletion(-) diff --git a/app/static/css/main.css b/app/static/css/main.css index 54f03e0..b8e354e 100644 --- a/app/static/css/main.css +++ b/app/static/css/main.css @@ -8517,6 +8517,11 @@ div:has(> .collapse:not(.show)):has(+ .row.title[title^="资源搜索"]) { user-select: text; } +/* 追剧日历计数模块：减少左侧与排序组件的间距8px（ml-2是8px，减少8px后为0） */ +.calendar-count-indicator { + margin-left: 0 !important; +} + /* 运行日志页面日志行样式：与运行日志弹窗保持一致 */ .runlog-content .runlog-line { margin: 0; diff --git a/app/templates/index.html b/app/templates/index.html index 2c48dc2..4f588da 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -2170,6 +2170,13 @@
    + +
    + {{ calendarCountValue }} +
    @@ -2315,6 +2322,7 @@ v-for="(date, index) in calendar.weekDates" :key="index" :class="{ 'selected': date.date === calendar.selectedDate }" + :title="getDateCountInfo(date.date)" @click="selectPosterDate(date.date)">
    {{ date.weekday }}
    {{ date.day }}
    @@ -2409,7 +2417,9 @@ 'selected': day.date === calendar.selectedDate }" @click="selectCalendarDate(day)"> -
    +
    {{ day.isCurrentMonth ? (calendar.currentDate.getMonth() + 1) : (calendar.currentDate.getMonth() + 2) }}/1 @@ -3808,6 +3818,135 @@ } }, + // 追剧日历：选中日期当天的节目数（去重后的节目名称数量） + calendarSelectedDateShowCount() { + try { + if (this.calendar.manageMode) return 0; + if (!this.calendar.selectedDate) return 0; + const episodes = this.getEpisodesByDate(this.calendar.selectedDate); + if (!episodes || episodes.length === 0) return 0; + const showNames = new Set(); + episodes.forEach(episode => { + if (episode && episode.show_name) { + showNames.add(episode.show_name); + } + }); + return showNames.size; + } catch (e) { + return 0; + } + }, + + // 追剧日历：选中日期当天的集数（始终按实际分集数计算，不考虑合并集） + calendarSelectedDateEpisodeCount() { + try { + if (this.calendar.manageMode) return 0; + if (!this.calendar.selectedDate) return 0; + const episodes = this.getEpisodesByDate(this.calendar.selectedDate); + if (!episodes || episodes.length === 0) return 0; + + // 始终按实际分集数计算，合并集需要展开计算 + let totalCount = 0; + episodes.forEach(episode => { + if (episode && episode.is_merged && episode.original_episodes && episode.original_episodes.length > 0) { + // 合并集：使用原始集数 + totalCount += episode.original_episodes.length; + } else { + // 单集：计为1 + totalCount += 1; + } + }); + return totalCount; + } catch (e) { + return 0; + } + }, + + // 追剧日历：内容管理模式下的已匹配节目数 + calendarMatchedShowCount() { + try { + if (!this.calendar.manageMode) return 0; + const tasks = this.managementTasksFiltered || []; + return tasks.filter(task => { + return task && (task.match_tmdb_id || (task.matched_show_name && task.matched_show_name.trim() !== '')); + }).length; + } catch (e) { + return 0; + } + }, + + // 追剧日历：内容管理模式下的未匹配任务数 + calendarUnmatchedTaskCount() { + try { + if (!this.calendar.manageMode) return 0; + const tasks = this.managementTasksFiltered || []; + return tasks.filter(task => { + return !task || (!task.match_tmdb_id && (!task.matched_show_name || task.matched_show_name.trim() === '')); + }).length; + } catch (e) { + return 0; + } + }, + + // 追剧日历：计数模块显示的值 + calendarCountValue() { + try { + if (this.calendar.manageMode) { + // 内容管理模式：显示匹配和未匹配的总数 + const matched = this.calendarMatchedShowCount; + const unmatched = this.calendarUnmatchedTaskCount; + return matched + unmatched; + } else { + // 海报视图和日历视图：显示选中日期当天的集数 + return this.calendarSelectedDateEpisodeCount; + } + } catch (e) { + return 0; + } + }, + + // 追剧日历：计数模块的悬停信息 + calendarCountTooltip() { + try { + if (this.calendar.manageMode) { + // 内容管理模式 + const matched = this.calendarMatchedShowCount; + const unmatched = this.calendarUnmatchedTaskCount; + + // 全部匹配的情况 + if (matched > 0 && unmatched === 0) { + return `共${matched}个节目`; + } + + // 全部未匹配的情况 + if (matched === 0 && unmatched > 0) { + return `共${unmatched}个未匹配任务`; + } + + // 部分匹配的情况 + if (matched > 0 && unmatched > 0) { + return `共${matched}个节目，${unmatched}个未匹配任务`; + } + + // 匹配和未匹配的数量全都是0的情况（参考总集数为0的处理） + return '暂无数据'; + } else { + // 海报视图和日历视图 + const showCount = this.calendarSelectedDateShowCount; + const episodeCount = this.calendarSelectedDateEpisodeCount; + + if (showCount > 0 && episodeCount > 0) { + return `当日播出${showCount}个节目，共${episodeCount}集`; + } + + // 如果节目数和集数都为0，参考总集数为0的处理 + return '暂无数据'; + } + } catch (e) { + return '暂无数据'; + } + }, + // 判断是否应该显示任务列表（避免排序闪烁） shouldShowTasklist() { const { by } = this.tasklistSort || { by: 'index' }; @@ -4529,6 +4668,45 @@ this.stopRuntimeLogPolling(); }, methods: { + // 追剧日历：获取指定日期的计数信息（用于悬停提示） + getDateCountInfo(date) { + try { + if (!date) return '暂无数据'; + if (this.calendar.manageMode) return '暂无数据'; + + const episodes = this.getEpisodesByDate(date); + if (!episodes || episodes.length === 0) return '暂无数据'; + + // 计算节目数（去重） + const showNames = new Set(); + episodes.forEach(episode => { + if (episode && episode.show_name) { + showNames.add(episode.show_name); + } + }); + const showCount = showNames.size; + + // 计算集数（始终按实际分集数计算，不考虑合并集） + let episodeCount = 0; + episodes.forEach(episode => { + if (episode && episode.is_merged && episode.original_episodes && episode.original_episodes.length > 0) { + // 合并集：使用原始集数 + episodeCount += episode.original_episodes.length; + } else { + // 单集：计为1 + episodeCount += 1; + } + }); + + if (showCount > 0 && episodeCount > 0) { + return `当日播出${showCount}个节目，共${episodeCount}集`; + } + + return '暂无数据'; + } catch (e) { + return '暂无数据'; + } + }, // 计算来源徽标 class：多来源时使用 multi-source，单来源使用小写来源名 getSourceBadgeClass(source) { try { From 4771f2545d52248222466476c131eb96b35d7053 Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Tue, 23 Dec 2025 16:05:53 +0800 Subject: [PATCH 31/34] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BF=BD=E5=89=A7?= =?UTF-8?q?=E6=97=A5=E5=8E=86=E6=9C=88=E4=BB=BD=E6=98=BE=E7=A4=BA=20BUG=20?= =?UTF-8?q?=E5=B9=B6=E6=94=AF=E6=8C=81=E8=B7=A8=E6=9C=88=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复 12 月后显示 13/1 的 bug：从日期字符串中正确解析月份，替代错误的月份计算方式 - 点击跨月日期时自动切换月份视图：检测点击日期是否在当前月份，如不在则自动切换到对应月份 - 新增 getDateMonthFromString 方法：从 YYYY-MM-DD 格式日期字符串中提取月份 - 优化 selectCalendarDate 方法：增加跨月检测和自动切换逻辑，提升用户体验 --- app/templates/index.html | 47 ++++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/app/templates/index.html b/app/templates/index.html index 4f588da..6df9a64 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -2421,7 +2421,7 @@ :title="getDateCountInfo(day.date)" style="cursor: default;"> - {{ day.isCurrentMonth ? (calendar.currentDate.getMonth() + 1) : (calendar.currentDate.getMonth() + 2) }}/1 + {{ getDateMonthFromString(day.date) }}/1 {{ day.dayNumber }} @@ -4668,6 +4668,19 @@ this.stopRuntimeLogPolling(); }, methods: { + // 从日期字符串（YYYY-MM-DD）中提取月份 + getDateMonthFromString(dateStr) { + try { + if (!dateStr) return ''; + const parts = dateStr.split('-'); + if (parts.length >= 2) { + return parseInt(parts[1], 10); + } + return ''; + } catch (e) { + return ''; + } + }, // 追剧日历：获取指定日期的计数信息（用于悬停提示） getDateCountInfo(date) { try { @@ -5072,13 +5085,33 @@ selectCalendarDate(day) { try { if (!day || !day.date) return; - // 如果点击的日期已经是选中日期，则取消选择，恢复为今天 - if (this.calendar.selectedDate === day.date) { - const today = new Date(); - this.calendar.selectedDate = this.formatDateToYYYYMMDD(today); - } else { - // 否则选中点击的日期 + + // 解析点击的日期 + const dateParts = day.date.split('-'); + if (dateParts.length !== 3) return; + + const clickedYear = parseInt(dateParts[0], 10); + const clickedMonth = parseInt(dateParts[1], 10) - 1; // 月份从0开始 + const clickedDay = parseInt(dateParts[2], 10); + + // 获取当前视图的年份和月份 + const currentYear = this.calendar.currentDate.getFullYear(); + const currentMonth = this.calendar.currentDate.getMonth(); + + // 如果点击的日期不在当前月份，切换到对应月份 + if (clickedYear !== currentYear || clickedMonth !== currentMonth) { + this.calendar.currentDate = new Date(clickedYear, clickedMonth, clickedDay); this.calendar.selectedDate = day.date; + this.initializeCalendarDates(); + } else { + // 如果点击的日期已经是选中日期，则取消选择，恢复为今天 + if (this.calendar.selectedDate === day.date) { + const today = new Date(); + this.calendar.selectedDate = this.formatDateToYYYYMMDD(today); + } else { + // 否则选中点击的日期 + this.calendar.selectedDate = day.date; + } } } catch (e) {} }, From f7814dd0a36147658015c2dac7fcaa16c814483e Mon Sep 17 00:00:00 2001 From: x1ao4 Date: Tue, 23 Dec 2025 16:23:42 +0800 Subject: [PATCH 32/34] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A8=A1=E6=80=81?= =?UTF-8?q?=E6=A1=86=E8=A1=A8=E6=A0=BC=E5=B1=95=E5=BC=80=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8C=E5=AE=9E=E7=8E=B0=E4=B8=8E=E8=BD=AC=E5=AD=98=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E4=B8=80=E8=87=B4=E7=9A=84=E8=A1=8C?= =?UTF-8?q?=E7=BA=A7=E5=B1=95=E5=BC=80=E8=A1=8C=E4=B8=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 toggleModalExpand 函数，点击展开按钮时展开同一行的所有超长字段 - 点击收起按钮时收起同一行的所有字段 - 统一展开按钮图标显示逻辑，该行有字段展开时所有按钮显示向上箭头 - 添加事件参数处理，确保代码安全性和一致性 --- app/templates/index.html | 43 ++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/app/templates/index.html b/app/templates/index.html index 6df9a64..32cc6a3 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -2649,8 +2649,8 @@ v-check-modal-overflow="key + '|file_name'"> {{file.file_name}}
    -
    - +
    +
    {{file.file_name}} @@ -2668,8 +2668,8 @@ {{file.file_name_re || '×'}}
    -
    - +
    +