From a88dd7c40cd322d8e55fb6b2924dd8b8832f65d7 Mon Sep 17 00:00:00 2001 From: shinya Date: Mon, 25 Aug 2025 00:44:46 +0800 Subject: [PATCH] feat: add support for multi epg, fix today programs filter --- src/app/live/page.tsx | 26 ++++++++------------------ src/lib/live.ts | 5 +++-- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/src/app/live/page.tsx b/src/app/live/page.tsx index 1f658d2..6c61c8b 100644 --- a/src/app/live/page.tsx +++ b/src/app/live/page.tsx @@ -153,16 +153,11 @@ function LivePageClient() { const existingStart = parseCustomTimeFormat(existingProgram.start); const existingEnd = parseCustomTimeFormat(existingProgram.end); - // 检查时间重叠（只考虑时间部分，忽略日期） - const currentTime = currentStart.getHours() * 60 + currentStart.getMinutes(); - const currentEndTime = currentEnd.getHours() * 60 + currentEnd.getMinutes(); - const existingTime = existingStart.getHours() * 60 + existingStart.getMinutes(); - const existingEndTime = existingEnd.getHours() * 60 + existingEnd.getMinutes(); - + // 检查时间重叠（考虑完整的日期和时间） if ( - (currentTime >= existingTime && currentTime < existingEndTime) || // 当前节目开始时间在已存在节目时间段内 - (currentEndTime > existingTime && currentEndTime <= existingEndTime) || // 当前节目结束时间在已存在节目时间段内 - (currentTime <= existingTime && currentEndTime >= existingEndTime) // 当前节目完全包含已存在节目 + (currentStart >= existingStart && currentStart < existingEnd) || // 当前节目开始时间在已存在节目时间段内 + (currentEnd > existingStart && currentEnd <= existingEnd) || // 当前节目结束时间在已存在节目时间段内 + (currentStart <= existingStart && currentEnd >= existingEnd) // 当前节目完全包含已存在节目 ) { hasOverlap = true; break; @@ -179,16 +174,11 @@ function LivePageClient() { const existingStart = parseCustomTimeFormat(existingProgram.start); const existingEnd = parseCustomTimeFormat(existingProgram.end); - // 检查是否与当前节目重叠（只考虑时间部分） - const currentTime = currentStart.getHours() * 60 + currentStart.getMinutes(); - const currentEndTime = currentEnd.getHours() * 60 + currentEnd.getMinutes(); - const existingTime = existingStart.getHours() * 60 + existingStart.getMinutes(); - const existingEndTime = existingEnd.getHours() * 60 + existingEnd.getMinutes(); - + // 检查是否与当前节目重叠（考虑完整的日期和时间） if ( - (currentTime >= existingTime && currentTime < existingEndTime) || - (currentEndTime > existingTime && currentEndTime <= existingEndTime) || - (currentTime <= existingTime && currentEndTime >= existingEndTime) + (currentStart >= existingStart && currentStart < existingEnd) || + (currentEnd > existingStart && currentEnd <= existingEnd) || + (currentStart <= existingStart && currentEnd >= existingEnd) ) { // 计算节目时长 const currentDuration = currentEnd.getTime() - currentStart.getTime(); diff --git a/src/lib/live.ts b/src/lib/live.ts index af461bc..fa4a5e9 100644 --- a/src/lib/live.ts +++ b/src/lib/live.ts @@ -216,8 +216,9 @@ function parseM3U(sourceKey: string, m3uContent: string): { // 检查是否是 #EXTM3U 行，提取 tvg-url if (line.startsWith('#EXTM3U')) { - const tvgUrlMatch = line.match(/x-tvg-url="([^"]*)"/); - tvgUrl = tvgUrlMatch ? tvgUrlMatch[1] : ''; + // 支持两种格式：x-tvg-url 和 url-tvg + const tvgUrlMatch = line.match(/(?:x-tvg-url|url-tvg)="([^"]*)"/); + tvgUrl = tvgUrlMatch ? tvgUrlMatch[1].split(',')[0].trim() : ''; continue; }