From 1abdaa68f15a5ccda7c67dd61aa5089804b20224 Mon Sep 17 00:00:00 2001 From: vexorian Date: Mon, 1 Dec 2025 11:24:23 -0400 Subject: [PATCH 01/13] Update PR template --- pull_request_template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pull_request_template.md b/pull_request_template.md index b45a9ec..75eb426 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -7,8 +7,8 @@ * [ ] I have read the code of conduct. * [ ] I am submitting to the correct base branch ### Changes that modify the db structure From ba4ca135640858f9033911329fc6834ceef6fe84 Mon Sep 17 00:00:00 2001 From: vexorian Date: Mon, 1 Dec 2025 11:27:33 -0400 Subject: [PATCH 02/13] Revert start/end time changes. They are being included in 1.6.x --- src/helperFuncs.js | 69 +++-------- src/plex-player.js | 68 ++--------- src/services/channel-service.js | 30 +---- src/services/tv-guide-service.js | 69 +---------- web/directives/channel-config.js | 17 +-- web/directives/program-config.js | 147 +++-------------------- web/public/templates/channel-config.html | 9 -- web/public/templates/program-config.html | 81 ------------- web/services/common-program-tools.js | 10 +- 9 files changed, 60 insertions(+), 440 deletions(-) diff --git a/src/helperFuncs.js b/src/helperFuncs.js index 453dd57..1d905f9 100644 --- a/src/helperFuncs.js +++ b/src/helperFuncs.js @@ -27,13 +27,6 @@ const CHANNEL_CONTEXT_KEYS = [ module.exports.random = random; function getCurrentProgramAndTimeElapsed(date, channel) { - // If seekPosition is not set, default to 0 - function getSeek(program) { - return typeof program.seekPosition === 'number' ? program.seekPosition : 0; - } - function getEnd(program) { - return typeof program.endPosition === 'number' ? program.endPosition : null; - } let channelStartTime = (new Date(channel.startTime)).getTime(); if (channelStartTime > date) { let t0 = date; @@ -51,36 +44,23 @@ function getCurrentProgramAndTimeElapsed(date, channel) { let timeElapsed = (date - channelStartTime) % channel.duration let currentProgramIndex = -1 for (let y = 0, l2 = channel.programs.length; y < l2; y++) { - let program = channel.programs[y]; - // Compute effective duration based on seek/end - let seek = getSeek(program); - let end = getEnd(program); - let effectiveDurationForProgram = (end !== null ? end : program.duration) - seek; - if (timeElapsed - effectiveDurationForProgram < 0) { + let program = channel.programs[y] + if (timeElapsed - program.duration < 0) { currentProgramIndex = y - if ( ((end !== null ? end - seek : program.duration - seek) > 2*SLACK) && (timeElapsed > (end !== null ? end - seek : program.duration - seek) - SLACK) ) { + if ( (program.duration > 2*SLACK) && (timeElapsed > program.duration - SLACK) ) { timeElapsed = 0; currentProgramIndex = (y + 1) % channel.programs.length; } break; } else { - timeElapsed -= (end !== null ? end - seek : program.duration - seek); + timeElapsed -= program.duration } } if (currentProgramIndex === -1) throw new Error("No program found; find algorithm fucked up") - // Attach seek/end for downstream use - let program = channel.programs[currentProgramIndex]; - let seek = getSeek(program); - let end = getEnd(program); - let effectiveDurationForProgram = (end !== null ? end : program.duration) - seek; - return { - program: Object.assign({}, program, { seekPosition: seek, endPosition: end, effectiveDuration: effectiveDurationForProgram }), - timeElapsed: timeElapsed, - programIndex: currentProgramIndex - } + return { program: channel.programs[currentProgramIndex], timeElapsed: timeElapsed, programIndex: currentProgramIndex } } function createLineup(programPlayTime, obj, channel, fillers, isFirst) { @@ -90,9 +70,6 @@ function createLineup(programPlayTime, obj, channel, fillers, isFirst) { // Helps prevents loosing first few seconds of an episode upon lineup change let activeProgram = obj.program let beginningOffset = 0; - // Use seekPosition and endPosition for effective start and duration - let seek = typeof activeProgram.seekPosition === 'number' ? activeProgram.seekPosition : 0; - let end = typeof activeProgram.endPosition === 'number' ? activeProgram.endPosition : null; let lineup = [] @@ -184,29 +161,19 @@ function createLineup(programPlayTime, obj, channel, fillers, isFirst) { } beginningOffset = Math.max(0, originalTimeElapsed - timeElapsed); - // Calculate effective start, duration, and streamDuration using seek/end - const effectiveSeek = seek; - const effectiveEnd = end !== null ? end : activeProgram.duration; - const effectiveDuration = effectiveEnd - effectiveSeek; - const effectiveTimeElapsed = Math.max(0, timeElapsed); - const effectiveStreamDuration = effectiveDuration - effectiveTimeElapsed; - - return [{ - type: 'program', - title: activeProgram.title, - key: activeProgram.key, - plexFile: activeProgram.plexFile, - file: activeProgram.file, - ratingKey: activeProgram.ratingKey, - start: effectiveSeek + effectiveTimeElapsed, // playback should start at seek + elapsed - streamDuration: effectiveStreamDuration, - beginningOffset: beginningOffset, - duration: effectiveDuration, - originalDuration: activeProgram.duration, - serverKey: activeProgram.serverKey, - seekPosition: effectiveSeek, - endPosition: end - }]; + return [ { + type: 'program', + title: activeProgram.title, + key: activeProgram.key, + plexFile: activeProgram.plexFile, + file: activeProgram.file, + ratingKey: activeProgram.ratingKey, + start: timeElapsed, + streamDuration: activeProgram.duration - timeElapsed, + beginningOffset: beginningOffset, + duration: activeProgram.duration, + serverKey: activeProgram.serverKey + } ]; } function weighedPick(a, total) { diff --git a/src/plex-player.js b/src/plex-player.js index 2f20ae1..9a75f84 100644 --- a/src/plex-player.js +++ b/src/plex-player.js @@ -64,66 +64,24 @@ class PlexPlayer { let ffmpeg = new FFMPEG(ffmpegSettings, channel); // Set the transcoder options ffmpeg.setAudioOnly( this.context.audioOnly ); this.ffmpeg = ffmpeg; - - // Get basic parameters - let seek = typeof lineupItem.seekPosition === 'number' ? lineupItem.seekPosition : 0; - let end = typeof lineupItem.endPosition === 'number' ? lineupItem.endPosition : null; - let currentElapsed = typeof lineupItem.start === 'number' ? lineupItem.start : 0; - let programEnd = end !== null ? end : lineupItem.duration; - - let deinterlace = ffmpegSettings.enableFFMPEGTranscoding; - - // Get stream first so we can handle direct play correctly + let streamDuration; + if (typeof(lineupItem.streamDuration)!=='undefined') { + if (lineupItem.start + lineupItem.streamDuration + constants.SLACK < lineupItem.duration) { + streamDuration = lineupItem.streamDuration / 1000; + } + } + let deinterlace = ffmpegSettings.enableFFMPEGTranscoding; //for now it will always deinterlace when transcoding is enabled but this is sub-optimal + let stream = await plexTranscoder.getStream(deinterlace); if (this.killed) { return; } - - // Calculate parameters differently for direct play vs transcoded mode - let streamDuration; - let streamStart; - - if (stream.directPlay) { - // DIRECT PLAY: - // 1. Calculate duration from endPos to currentElapsed (not from seek to endPos) - streamDuration = Math.max(0, programEnd - currentElapsed) / 1000; - - // 2. Start should be ONLY currentElapsed - streamStart = currentElapsed / 1000; - - console.log(`[PLEX-PLAYER] Direct Play: Using duration=${streamDuration}s (from currentElapsed=${currentElapsed/1000}s to endPos=${programEnd/1000}s)`); - - // For direct play, ignore the streamDuration override with custom end times - if (end !== null && typeof(lineupItem.streamDuration) !== 'undefined') { - // Store original value for reference - stream.streamStats.originalDuration = lineupItem.streamDuration; - stream.streamStats.duration = Math.max(streamDuration * 1000, 60000); - - console.log(`[PLEX-PLAYER] Direct Play: Custom end time detected, ignoring streamDuration override: ${lineupItem.streamDuration/1000}s`); - lineupItem.streamDuration = undefined; - } - } else { - // TRANSCODED: Keep existing behavior - streamStart = undefined; // Plex handles this internally for transcoded streams - - // Calculate duration based on programEnd and seek - streamDuration = Math.max(0, programEnd - seek) / 1000; - - // Apply streamDuration override if present - only for transcoded streams - if (typeof(lineupItem.streamDuration) !== 'undefined') { - streamDuration = lineupItem.streamDuration / 1000; - console.log(`[PLEX-PLAYER] Transcoding: Using override streamDuration: ${streamDuration}s`); - } - - console.log(`[PLEX-PLAYER] Transcoding: Using duration=${streamDuration}s (seek=${seek/1000}s, end=${programEnd/1000}s)`); - } - + + //let streamStart = (stream.directPlay) ? plexTranscoder.currTimeS : undefined; + //let streamStart = (stream.directPlay) ? plexTranscoder.currTimeS : lineupItem.start; + let streamStart = (stream.directPlay) ? plexTranscoder.currTimeS : undefined; let streamStats = stream.streamStats; - - // Ensure we have a valid duration for error handling - if (!streamStats.duration) { - streamStats.duration = Math.max(streamDuration * 1000, 60000); - } + streamStats.duration = lineupItem.streamDuration; let emitter = new EventEmitter(); //setTimeout( () => { diff --git a/src/services/channel-service.js b/src/services/channel-service.js index 831675e..cffcf70 100644 --- a/src/services/channel-service.js +++ b/src/services/channel-service.js @@ -59,19 +59,8 @@ class ChannelService extends events.EventEmitter { function cleanUpProgram(program) { - if (program.startPosition != null && program.startPosition !== '') { - // Convert startPosition to seekPosition for consistency - program.seekPosition = parseInt(program.startPosition, 10); - delete program.startPosition; - } - - if (program.endPosition != null && program.endPosition !== '') { - program.endPosition = parseInt(program.endPosition, 10); - } - - if (program.start && program.stop) { - program.duration = new Date(program.stop) - new Date(program.start); - } + delete program.start + delete program.stop delete program.streams; delete program.durationStr; delete program.commercials; @@ -102,23 +91,12 @@ function cleanUpChannel(channel) { delete channel.fillerContent; delete channel.filler; channel.fallback = channel.fallback.flatMap( cleanUpProgram ); - - // Set default for mergeAdjacentPrograms if not already defined - if (typeof channel.mergeAdjacentPrograms === 'undefined') { - channel.mergeAdjacentPrograms = false; // Disabled by default for backward compatibility - } - - // Calculate total channel duration using effective durations channel.duration = 0; for (let i = 0; i < channel.programs.length; i++) { - let program = channel.programs[i]; - let seek = typeof program.seekPosition === 'number' ? program.seekPosition : 0; - let end = typeof program.endPosition === 'number' ? program.endPosition : null; - let effectiveDuration = (end !== null ? end : program.duration) - seek; - - channel.duration += effectiveDuration; + channel.duration += channel.programs[i].duration; } return channel; + } diff --git a/src/services/tv-guide-service.js b/src/services/tv-guide-service.js index 85bbe3e..1b33c54 100644 --- a/src/services/tv-guide-service.js +++ b/src/services/tv-guide-service.js @@ -83,12 +83,7 @@ class TVGuideService extends events.EventEmitter let arr = new Array( channel.programs.length + 1); arr[0] = 0; for (let i = 0; i < n; i++) { - // Calculate effective duration based on seekPosition and endPosition - let program = channel.programs[i]; - let seek = typeof program.seekPosition === 'number' ? program.seekPosition : 0; - let end = typeof program.endPosition === 'number' ? program.endPosition : null; - let d = (end !== null ? end : program.duration) - seek; - + let d = channel.programs[i].duration; if (d == 0) { console.log("Found program with duration 0, correcting it"); d = 1; @@ -97,6 +92,7 @@ class TVGuideService extends events.EventEmitter console.log( `Found program in channel ${channel.number} with non-integer duration ${d}, correcting it`); d = Math.ceil(d); } + channel.programs[i].duration = d; arr[i+1] = arr[i] + d; await this._throttle(); } @@ -364,70 +360,10 @@ class TVGuideService extends events.EventEmitter result.programs.push( makeEntry(channel, programs[i] ) ); } } - - // Only merge programs if enabled in channel settings - if (channel.mergeAdjacentPrograms === true) { - result.programs = this.mergeAdjacentSamePrograms(result.programs); - } return result; } - // Merge adjacent programs that have the same ratingKey - mergeAdjacentSamePrograms(programs) { - if (!programs || programs.length <= 1) { - return programs; - } - - console.log(`Before merging: ${programs.length} programs`); - - // Debug: Check how many programs have ratingKeys - const programsWithRatingKey = programs.filter(p => p.ratingKey); - console.log(`Programs with ratingKey: ${programsWithRatingKey.length}`); - - const mergedPrograms = []; - let i = 0; - - while (i < programs.length) { - const currentProgram = programs[i]; - - // Skip if this is a flex/placeholder program with no ratingKey - if (!currentProgram.ratingKey) { - mergedPrograms.push(currentProgram); - i++; - continue; - } - - // Look ahead to see if there are adjacent programs with the same ratingKey - let j = i + 1; - while (j < programs.length && - programs[j].ratingKey && - programs[j].ratingKey === currentProgram.ratingKey) { - j++; - } - - if (j > i + 1) { - // We found programs to merge - console.log(`Merging ${j-i} programs with ratingKey ${currentProgram.ratingKey}`); - - const mergedProgram = {...currentProgram}; - mergedProgram.stop = programs[j-1].stop; - mergedPrograms.push(mergedProgram); - - // Skip all the programs we just merged - i = j; - } else { - // No programs to merge, just add the current one - mergedPrograms.push(currentProgram); - i++; - } - } - - console.log(`After merging: ${mergedPrograms.length} programs`); - - return mergedPrograms; - } - async buildItManaged() { let t0 = this.currentUpdate; let t1 = this.currentLimit; @@ -644,7 +580,6 @@ function makeEntry(channel, x) { icon: icon, title: title, sub: sub, - ratingKey: x.program.ratingKey // Add ratingKey to preserve it for merging } } diff --git a/web/directives/channel-config.js b/web/directives/channel-config.js index adce35a..d8da0fe 100644 --- a/web/directives/channel-config.js +++ b/web/directives/channel-config.js @@ -964,24 +964,9 @@ module.exports = function ($timeout, $location, dizquetv, resolutionOptions, get scope.hasFlex = false; for (let i = 0, l = scope.channel.programs.length; i < l; i++) { - // Calculate effective duration using seekPosition and endPosition - let program = scope.channel.programs[i]; - let seek = typeof program.seekPosition === 'number' ? program.seekPosition : 0; - let end = typeof program.endPosition === 'number' ? program.endPosition : null; - let effectiveDuration = (end !== null ? end : program.duration) - seek; - - // Store effective values for consistency - program.effectiveStart = seek; - program.effectiveDuration = effectiveDuration; - - // Set start time based on accumulated duration scope.channel.programs[i].start = new Date(scope.channel.startTime.valueOf() + scope.channel.duration) scope.channel.programs[i].$index = i; - - // Use effectiveDuration for timeline calculation - scope.channel.duration += effectiveDuration; - - // Set stop time using the updated duration + scope.channel.duration += scope.channel.programs[i].duration scope.channel.programs[i].stop = new Date(scope.channel.startTime.valueOf() + scope.channel.duration) if (scope.channel.programs[i].isOffline) { scope.hasFlex = true; diff --git a/web/directives/program-config.js b/web/directives/program-config.js index 0715b45..f274eb5 100644 --- a/web/directives/program-config.js +++ b/web/directives/program-config.js @@ -9,138 +9,29 @@ module.exports = function ($timeout) { onDone: "=onDone" }, link: function (scope, element, attrs) { - // Conversion functions remain the same (using NaN for invalid) - scope.msToTimeString = function(ms) { - if (typeof ms !== 'number' || isNaN(ms) || ms < 0) { return ''; } - let totalS = Math.floor(ms / 1000); - let s = totalS % 60; - let m = Math.floor(totalS / 60); - return m + ":" + ( (s < 10) ? ("0" + s) : s ); - }; - - scope.timeStringToMs = function(timeString) { - if (timeString == null || timeString.trim() === '') { return 0; } // Empty is 0ms - let parts = timeString.split(':'); - if (parts.length !== 2) { return NaN; } // Invalid format - let min = parseInt(parts[0], 10); - let sec = parseInt(parts[1], 10); - if (isNaN(min) || isNaN(sec) || sec < 0 || sec >= 60 || min < 0) { return NaN; } // Invalid numbers - return (min * 60 + sec) * 1000; - }; - - // Intermediate model for UI binding - scope.timeInput = { - seek: '', - end: '' - }; - - let initialProgramLoad = true; // Flag for first load - - // Watch program to initialize/reset intermediate model ONLY - scope.$watch('program', function(newProgram) { - if (newProgram) { - console.log("Program loaded/changed. Initializing timeInput."); - // Initialize timeInput from program data - let initialSeekMs = newProgram.seekPosition; - let initialEndMs = newProgram.endPosition; - - scope.timeInput.seek = scope.msToTimeString( (typeof initialSeekMs === 'number' && !isNaN(initialSeekMs)) ? initialSeekMs : 0 ); - scope.timeInput.end = (typeof initialEndMs === 'number' && !isNaN(initialEndMs) && initialEndMs > 0) ? scope.msToTimeString(initialEndMs) : ''; - - initialProgramLoad = false; // Mark initial load complete - } else { - // Clear inputs if program is removed - scope.timeInput.seek = ''; - scope.timeInput.end = ''; - initialProgramLoad = true; // Reset flag if program is cleared - } - }); - scope.finished = (prog) => { - // prog here is the original program object passed to the directive - // We need to validate and apply changes from scope.timeInput + if (prog.title === "") + scope.error = { title: 'You must set a program title.' } + else if (prog.type === "episode" && prog.showTitle == "") + scope.error = { showTitle: 'You must set a show title when the program type is an episode.' } + else if (prog.type === "episode" && (prog.season == null)) + scope.error = { season: 'You must set a season number when the program type is an episode.' } + else if (prog.type === "episode" && prog.season <= 0) + scope.error = { season: 'Season number musat be greater than 0' } + else if (prog.type === "episode" && (prog.episode == null)) + scope.error = { episode: 'You must set a episode number when the program type is an episode.' } + else if (prog.type === "episode" && prog.episode <= 0) + scope.error = { episode: 'Episode number musat be greater than 0' } - let currentError = null; - - // --- Validate Time Inputs --- - let seekInputString = scope.timeInput.seek; - let endInputString = scope.timeInput.end; - - let seekMs = scope.timeStringToMs(seekInputString); - let endMs = scope.timeStringToMs(endInputString); // Will be 0 if empty, NaN if invalid - - // Check for invalid formats (NaN) - if (isNaN(seekMs)) { - currentError = { seekPosition: 'Invalid start time format. Use MM:SS.' }; - } else if (isNaN(endMs) && endInputString && endInputString.trim() !== '') { - // Only error on endMs if it's not empty but is invalid - currentError = { endPosition: 'Invalid end time format. Use MM:SS.' }; - } else { - // Format is valid or empty, now check relationship - // Treat endMs === 0 (from empty input) as 'undefined' for comparison - let effectiveEndMs = (endMs === 0 && (endInputString == null || endInputString.trim() === '')) ? undefined : endMs; - - // Validate Seek Position against Duration first - if (prog.duration && seekMs >= (prog.duration - 1000)) { - currentError = currentError || {}; - currentError.seekPosition = 'Start time must be at least 1 second before the program ends.'; - } - // Then validate End Position if specified - else if (typeof effectiveEndMs === 'number') { - if (effectiveEndMs <= seekMs) { - currentError = currentError || {}; - currentError.endPosition = 'End position must be greater than start position.'; - } else if (prog.duration && effectiveEndMs > prog.duration) { - // Error if end time EXCEEDS program duration - currentError = currentError || {}; - currentError.endPosition = 'End position cannot exceed program duration (' + scope.msToTimeString(prog.duration) + ').'; - } - // Check if start/end combination is valid (at least 1s apart) - else if ((effectiveEndMs - seekMs) < 1000) { - currentError = currentError || {}; - // Apply error to the field being edited or a general one if needed - currentError.endPosition = 'Effective program length must be at least 1 second.'; - } - } + if (scope.error != null) { + $timeout(() => { + scope.error = null + }, 3500) + return } - // --- Standard Validation (on original prog object) --- - if (!currentError) { // Only proceed if time validation passed - if (!prog.title) { currentError = { title: 'You must set a program title.' }; } - else if (prog.type === "episode" && !prog.showTitle) { currentError = { showTitle: 'You must set a show title when the program type is an episode.' }; } - else if (prog.type === "episode" && (prog.season == null || prog.season <= 0)) { currentError = { season: 'Season number must be greater than 0.' }; } - else if (prog.type === "episode" && (prog.episode == null || prog.episode <= 0)) { currentError = { episode: 'Episode number must be greater than 0.' }; } - // Add any other existing standard validations here, setting currentError - } - - // --- Error Handling --- - if (currentError && Object.keys(currentError).length !== 0) { - scope.error = currentError; - $timeout(() => { scope.error = null }, 3500); - return; // Stop execution - } - - // --- Prepare Final Object --- - // Create a clean object based on the original prog and validated time inputs - // Ensure seekMs is a valid number before assigning - let finalSeekMs = isNaN(seekMs) ? 0 : seekMs; - // Ensure endMs is valid number > 0 or undefined - let finalEndMs = (typeof endMs === 'number' && !isNaN(endMs) && endMs > 0) ? endMs : undefined; - - let finalProgData = { - ...prog, // Copy original properties - seekPosition: finalSeekMs, - endPosition: finalEndMs - }; - - // Explicitly remove endPosition if undefined - if (finalProgData.endPosition === undefined) { - delete finalProgData.endPosition; - } - - console.log("Validation passed. Calling onDone with:", finalProgData); - scope.onDone(JSON.parse(angular.toJson(finalProgData))); - scope.program = null; + scope.onDone(JSON.parse(angular.toJson(prog))) + scope.program = null } } }; diff --git a/web/public/templates/channel-config.html b/web/public/templates/channel-config.html index 7c60b99..081300d 100644 --- a/web/public/templates/channel-config.html +++ b/web/public/templates/channel-config.html @@ -727,15 +727,6 @@ (This will hide the channel from TV guides, spoofed HDHR, m3u playlist... The channel can still be streamed directly or be used as a redirect target.) - -
-
- - - - (When enabled, adjacent programs with the same content ID will appear as a single program in the guide. This is useful for shows split by commercials or bumpers.) -
-


diff --git a/web/public/templates/program-config.html b/web/public/templates/program-config.html index b86ebb8..5ba9c7f 100644 --- a/web/public/templates/program-config.html +++ b/web/public/templates/program-config.html @@ -30,33 +30,6 @@
- -
-
-
Advanced Options
-
-
-
- -
-
- - Format: minutes:seconds (e.g. 5:30) -
{{error.seekPosition}}
-
-
- -
-
- - Format: minutes:seconds (e.g. 10:45) -
-
-
-
-
- -
-
-
Advanced Options
-
-
-
- -
-
- - Format: minutes:seconds (e.g. 5:30) -
{{error.seekPosition}}
-
-
- -
-
- - Format: minutes:seconds (e.g. 10:45) -
-
-
-
-
diff --git a/web/services/common-program-tools.js b/web/services/common-program-tools.js index 5bf354a..2d47910 100644 --- a/web/services/common-program-tools.js +++ b/web/services/common-program-tools.js @@ -210,16 +210,12 @@ module.exports = function (getShowData) { background = "repeating-linear-gradient( " + angle + "deg, " + rgb1 + ", " + rgb1 + " " + w + "px, " + rgb2 + " " + w + "px, " + rgb2 + " " + (w*2) + "px)"; } - - // Width calculation based on effective duration - let seek = typeof program.seekPosition === 'number' ? program.seekPosition : 0; - let end = typeof program.endPosition === 'number' ? program.endPosition : null; - let effectiveDuration = (end !== null ? end : program.duration) - seek; - let f = interpolate; let w = 15.0; let t = 4*60*60*1000; - let a = (f(effectiveDuration) *w) / f(t); + //let d = Math.log( Math.min(t, program.duration) ) / Math.log(2); + //let a = (d * Math.log(2) ) / Math.log(t); + let a = ( f(program.duration) *w) / f(t); a = Math.min( w, Math.max(0.3, a) ); b = w - a + 0.01; From 1ed31d22e9c42c184779224c24e58793e20652e2 Mon Sep 17 00:00:00 2001 From: vexorian Date: Mon, 1 Dec 2025 11:28:31 -0400 Subject: [PATCH 03/13] The new development branch is dev/1.6.x --- .github/workflows/development-binaries.yaml | 2 +- .github/workflows/development-tag.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/development-binaries.yaml b/.github/workflows/development-binaries.yaml index 4a2705b..2d70da3 100644 --- a/.github/workflows/development-binaries.yaml +++ b/.github/workflows/development-binaries.yaml @@ -3,7 +3,7 @@ name: Development Binaries on: push: branches: - - dev/1.5.x + - dev/1.6.x jobs: binaries: diff --git a/.github/workflows/development-tag.yaml b/.github/workflows/development-tag.yaml index a3dc0ee..23db34c 100644 --- a/.github/workflows/development-tag.yaml +++ b/.github/workflows/development-tag.yaml @@ -3,7 +3,7 @@ name: Development Tag on: push: branches: - - dev/1.5.x + - dev/1.6.x jobs: docker: From b65eaae38acd89450e1bddf2e50554c8fb74eee3 Mon Sep 17 00:00:00 2001 From: tim000x3 Date: Wed, 16 Apr 2025 04:24:23 -0400 Subject: [PATCH 04/13] Start and end time can be set in program config but only applies in direct play got seek and end time working on non-direct play Enhance program duration calculation and entry creation in channel services and guide improved guide generation Add debug logging and really agressive program merging logic and placeholder avoidence in XMLTV writer Add a final pass duplicate detection and merging logic in _smartMerge function Refactor XMLTV writing logic: enhance debug logging, streamline program merging, and improve error handling backwards compatibly Human readable time Refactor program configuration modal: move optional position offsets to collapsible advanced options section Update program configuration modal: rename position offset labels to custom start and end time Changed how I build the guide based on an implementation that's closer to the original implementation and requires less changes. Reverted Unneeded Changes Simplified how StreamSeeK and custom end positions are applied in both transcoding and direct play. Implement merging of adjacent programs with the same ratingKey in TVGuideService Made merging-adjacent programs optional and disabled by default custom time can actuall be set cleanup Enhance time input validation for program duration and seek positions --- src/helperFuncs.js | 69 ++++++++--- src/plex-player.js | 68 +++++++++-- src/services/channel-service.js | 30 ++++- src/services/tv-guide-service.js | 69 ++++++++++- web/directives/channel-config.js | 17 ++- web/directives/program-config.js | 149 ++++++++++++++++++++--- web/public/templates/channel-config.html | 9 ++ web/public/templates/program-config.html | 81 ++++++++++++ web/services/common-program-tools.js | 10 +- 9 files changed, 441 insertions(+), 61 deletions(-) diff --git a/src/helperFuncs.js b/src/helperFuncs.js index 45f28bf..dd05edb 100644 --- a/src/helperFuncs.js +++ b/src/helperFuncs.js @@ -27,6 +27,13 @@ const CHANNEL_CONTEXT_KEYS = [ module.exports.random = random; function getCurrentProgramAndTimeElapsed(date, channel) { + // If seekPosition is not set, default to 0 + function getSeek(program) { + return typeof program.seekPosition === 'number' ? program.seekPosition : 0; + } + function getEnd(program) { + return typeof program.endPosition === 'number' ? program.endPosition : null; + } let channelStartTime = (new Date(channel.startTime)).getTime(); if (channelStartTime > date) { let t0 = date; @@ -44,23 +51,36 @@ function getCurrentProgramAndTimeElapsed(date, channel) { let timeElapsed = (date - channelStartTime) % channel.duration let currentProgramIndex = -1 for (let y = 0, l2 = channel.programs.length; y < l2; y++) { - let program = channel.programs[y] - if (timeElapsed - program.duration < 0) { + let program = channel.programs[y]; + // Compute effective duration based on seek/end + let seek = getSeek(program); + let end = getEnd(program); + let effectiveDurationForProgram = (end !== null ? end : program.duration) - seek; + if (timeElapsed - effectiveDurationForProgram < 0) { currentProgramIndex = y - if ( (program.duration > 2*SLACK) && (timeElapsed > program.duration - SLACK) ) { + if ( ((end !== null ? end - seek : program.duration - seek) > 2*SLACK) && (timeElapsed > (end !== null ? end - seek : program.duration - seek) - SLACK) ) { timeElapsed = 0; currentProgramIndex = (y + 1) % channel.programs.length; } break; } else { - timeElapsed -= program.duration + timeElapsed -= (end !== null ? end - seek : program.duration - seek); } } if (currentProgramIndex === -1) throw new Error("No program found; find algorithm fucked up") - return { program: channel.programs[currentProgramIndex], timeElapsed: timeElapsed, programIndex: currentProgramIndex } + // Attach seek/end for downstream use + let program = channel.programs[currentProgramIndex]; + let seek = getSeek(program); + let end = getEnd(program); + let effectiveDurationForProgram = (end !== null ? end : program.duration) - seek; + return { + program: Object.assign({}, program, { seekPosition: seek, endPosition: end, effectiveDuration: effectiveDurationForProgram }), + timeElapsed: timeElapsed, + programIndex: currentProgramIndex + } } function createLineup(programPlayTime, obj, channel, fillers, isFirst) { @@ -70,6 +90,9 @@ function createLineup(programPlayTime, obj, channel, fillers, isFirst) { // Helps prevents loosing first few seconds of an episode upon lineup change let activeProgram = obj.program let beginningOffset = 0; + // Use seekPosition and endPosition for effective start and duration + let seek = typeof activeProgram.seekPosition === 'number' ? activeProgram.seekPosition : 0; + let end = typeof activeProgram.endPosition === 'number' ? activeProgram.endPosition : null; let lineup = [] @@ -159,19 +182,29 @@ function createLineup(programPlayTime, obj, channel, fillers, isFirst) { } beginningOffset = Math.max(0, originalTimeElapsed - timeElapsed); - return [ { - type: 'program', - title: activeProgram.title, - key: activeProgram.key, - plexFile: activeProgram.plexFile, - file: activeProgram.file, - ratingKey: activeProgram.ratingKey, - start: timeElapsed, - streamDuration: activeProgram.duration - timeElapsed, - beginningOffset: beginningOffset, - duration: activeProgram.duration, - serverKey: activeProgram.serverKey - } ]; + // Calculate effective start, duration, and streamDuration using seek/end + const effectiveSeek = seek; + const effectiveEnd = end !== null ? end : activeProgram.duration; + const effectiveDuration = effectiveEnd - effectiveSeek; + const effectiveTimeElapsed = Math.max(0, timeElapsed); + const effectiveStreamDuration = effectiveDuration - effectiveTimeElapsed; + + return [{ + type: 'program', + title: activeProgram.title, + key: activeProgram.key, + plexFile: activeProgram.plexFile, + file: activeProgram.file, + ratingKey: activeProgram.ratingKey, + start: effectiveSeek + effectiveTimeElapsed, // playback should start at seek + elapsed + streamDuration: effectiveStreamDuration, + beginningOffset: beginningOffset, + duration: effectiveDuration, + originalDuration: activeProgram.duration, + serverKey: activeProgram.serverKey, + seekPosition: effectiveSeek, + endPosition: end + }]; } function weighedPick(a, total) { diff --git a/src/plex-player.js b/src/plex-player.js index 9a75f84..2f20ae1 100644 --- a/src/plex-player.js +++ b/src/plex-player.js @@ -64,24 +64,66 @@ class PlexPlayer { let ffmpeg = new FFMPEG(ffmpegSettings, channel); // Set the transcoder options ffmpeg.setAudioOnly( this.context.audioOnly ); this.ffmpeg = ffmpeg; - let streamDuration; - if (typeof(lineupItem.streamDuration)!=='undefined') { - if (lineupItem.start + lineupItem.streamDuration + constants.SLACK < lineupItem.duration) { - streamDuration = lineupItem.streamDuration / 1000; - } - } - let deinterlace = ffmpegSettings.enableFFMPEGTranscoding; //for now it will always deinterlace when transcoding is enabled but this is sub-optimal - + + // Get basic parameters + let seek = typeof lineupItem.seekPosition === 'number' ? lineupItem.seekPosition : 0; + let end = typeof lineupItem.endPosition === 'number' ? lineupItem.endPosition : null; + let currentElapsed = typeof lineupItem.start === 'number' ? lineupItem.start : 0; + let programEnd = end !== null ? end : lineupItem.duration; + + let deinterlace = ffmpegSettings.enableFFMPEGTranscoding; + + // Get stream first so we can handle direct play correctly let stream = await plexTranscoder.getStream(deinterlace); if (this.killed) { return; } - - //let streamStart = (stream.directPlay) ? plexTranscoder.currTimeS : undefined; - //let streamStart = (stream.directPlay) ? plexTranscoder.currTimeS : lineupItem.start; - let streamStart = (stream.directPlay) ? plexTranscoder.currTimeS : undefined; + + // Calculate parameters differently for direct play vs transcoded mode + let streamDuration; + let streamStart; + + if (stream.directPlay) { + // DIRECT PLAY: + // 1. Calculate duration from endPos to currentElapsed (not from seek to endPos) + streamDuration = Math.max(0, programEnd - currentElapsed) / 1000; + + // 2. Start should be ONLY currentElapsed + streamStart = currentElapsed / 1000; + + console.log(`[PLEX-PLAYER] Direct Play: Using duration=${streamDuration}s (from currentElapsed=${currentElapsed/1000}s to endPos=${programEnd/1000}s)`); + + // For direct play, ignore the streamDuration override with custom end times + if (end !== null && typeof(lineupItem.streamDuration) !== 'undefined') { + // Store original value for reference + stream.streamStats.originalDuration = lineupItem.streamDuration; + stream.streamStats.duration = Math.max(streamDuration * 1000, 60000); + + console.log(`[PLEX-PLAYER] Direct Play: Custom end time detected, ignoring streamDuration override: ${lineupItem.streamDuration/1000}s`); + lineupItem.streamDuration = undefined; + } + } else { + // TRANSCODED: Keep existing behavior + streamStart = undefined; // Plex handles this internally for transcoded streams + + // Calculate duration based on programEnd and seek + streamDuration = Math.max(0, programEnd - seek) / 1000; + + // Apply streamDuration override if present - only for transcoded streams + if (typeof(lineupItem.streamDuration) !== 'undefined') { + streamDuration = lineupItem.streamDuration / 1000; + console.log(`[PLEX-PLAYER] Transcoding: Using override streamDuration: ${streamDuration}s`); + } + + console.log(`[PLEX-PLAYER] Transcoding: Using duration=${streamDuration}s (seek=${seek/1000}s, end=${programEnd/1000}s)`); + } + let streamStats = stream.streamStats; - streamStats.duration = lineupItem.streamDuration; + + // Ensure we have a valid duration for error handling + if (!streamStats.duration) { + streamStats.duration = Math.max(streamDuration * 1000, 60000); + } let emitter = new EventEmitter(); //setTimeout( () => { diff --git a/src/services/channel-service.js b/src/services/channel-service.js index cffcf70..831675e 100644 --- a/src/services/channel-service.js +++ b/src/services/channel-service.js @@ -59,8 +59,19 @@ class ChannelService extends events.EventEmitter { function cleanUpProgram(program) { - delete program.start - delete program.stop + if (program.startPosition != null && program.startPosition !== '') { + // Convert startPosition to seekPosition for consistency + program.seekPosition = parseInt(program.startPosition, 10); + delete program.startPosition; + } + + if (program.endPosition != null && program.endPosition !== '') { + program.endPosition = parseInt(program.endPosition, 10); + } + + if (program.start && program.stop) { + program.duration = new Date(program.stop) - new Date(program.start); + } delete program.streams; delete program.durationStr; delete program.commercials; @@ -91,12 +102,23 @@ function cleanUpChannel(channel) { delete channel.fillerContent; delete channel.filler; channel.fallback = channel.fallback.flatMap( cleanUpProgram ); + + // Set default for mergeAdjacentPrograms if not already defined + if (typeof channel.mergeAdjacentPrograms === 'undefined') { + channel.mergeAdjacentPrograms = false; // Disabled by default for backward compatibility + } + + // Calculate total channel duration using effective durations channel.duration = 0; for (let i = 0; i < channel.programs.length; i++) { - channel.duration += channel.programs[i].duration; + let program = channel.programs[i]; + let seek = typeof program.seekPosition === 'number' ? program.seekPosition : 0; + let end = typeof program.endPosition === 'number' ? program.endPosition : null; + let effectiveDuration = (end !== null ? end : program.duration) - seek; + + channel.duration += effectiveDuration; } return channel; - } diff --git a/src/services/tv-guide-service.js b/src/services/tv-guide-service.js index a97a5b7..0d5bb6a 100644 --- a/src/services/tv-guide-service.js +++ b/src/services/tv-guide-service.js @@ -83,7 +83,12 @@ class TVGuideService extends events.EventEmitter let arr = new Array( channel.programs.length + 1); arr[0] = 0; for (let i = 0; i < n; i++) { - let d = channel.programs[i].duration; + // Calculate effective duration based on seekPosition and endPosition + let program = channel.programs[i]; + let seek = typeof program.seekPosition === 'number' ? program.seekPosition : 0; + let end = typeof program.endPosition === 'number' ? program.endPosition : null; + let d = (end !== null ? end : program.duration) - seek; + if (d == 0) { console.log("Found program with duration 0, correcting it"); d = 1; @@ -92,7 +97,6 @@ class TVGuideService extends events.EventEmitter console.log( `Found program in channel ${channel.number} with non-integer duration ${d}, correcting it`); d = Math.ceil(d); } - channel.programs[i].duration = d; arr[i+1] = arr[i] + d; await this._throttle(); } @@ -360,10 +364,70 @@ class TVGuideService extends events.EventEmitter result.programs.push( makeEntry(channel, programs[i] ) ); } } + + // Only merge programs if enabled in channel settings + if (channel.mergeAdjacentPrograms === true) { + result.programs = this.mergeAdjacentSamePrograms(result.programs); + } return result; } + // Merge adjacent programs that have the same ratingKey + mergeAdjacentSamePrograms(programs) { + if (!programs || programs.length <= 1) { + return programs; + } + + console.log(`Before merging: ${programs.length} programs`); + + // Debug: Check how many programs have ratingKeys + const programsWithRatingKey = programs.filter(p => p.ratingKey); + console.log(`Programs with ratingKey: ${programsWithRatingKey.length}`); + + const mergedPrograms = []; + let i = 0; + + while (i < programs.length) { + const currentProgram = programs[i]; + + // Skip if this is a flex/placeholder program with no ratingKey + if (!currentProgram.ratingKey) { + mergedPrograms.push(currentProgram); + i++; + continue; + } + + // Look ahead to see if there are adjacent programs with the same ratingKey + let j = i + 1; + while (j < programs.length && + programs[j].ratingKey && + programs[j].ratingKey === currentProgram.ratingKey) { + j++; + } + + if (j > i + 1) { + // We found programs to merge + console.log(`Merging ${j-i} programs with ratingKey ${currentProgram.ratingKey}`); + + const mergedProgram = {...currentProgram}; + mergedProgram.stop = programs[j-1].stop; + mergedPrograms.push(mergedProgram); + + // Skip all the programs we just merged + i = j; + } else { + // No programs to merge, just add the current one + mergedPrograms.push(currentProgram); + i++; + } + } + + console.log(`After merging: ${mergedPrograms.length} programs`); + + return mergedPrograms; + } + async buildItManaged() { let t0 = this.currentUpdate; let t1 = this.currentLimit; @@ -580,6 +644,7 @@ function makeEntry(channel, x) { icon: icon, title: title, sub: sub, + ratingKey: x.program.ratingKey // Add ratingKey to preserve it for merging } } diff --git a/web/directives/channel-config.js b/web/directives/channel-config.js index ed81e9a..8383404 100644 --- a/web/directives/channel-config.js +++ b/web/directives/channel-config.js @@ -964,9 +964,24 @@ module.exports = function ($timeout, $location, dizquetv, resolutionOptions, get scope.hasFlex = false; for (let i = 0, l = scope.channel.programs.length; i < l; i++) { + // Calculate effective duration using seekPosition and endPosition + let program = scope.channel.programs[i]; + let seek = typeof program.seekPosition === 'number' ? program.seekPosition : 0; + let end = typeof program.endPosition === 'number' ? program.endPosition : null; + let effectiveDuration = (end !== null ? end : program.duration) - seek; + + // Store effective values for consistency + program.effectiveStart = seek; + program.effectiveDuration = effectiveDuration; + + // Set start time based on accumulated duration scope.channel.programs[i].start = new Date(scope.channel.startTime.valueOf() + scope.channel.duration) scope.channel.programs[i].$index = i; - scope.channel.duration += scope.channel.programs[i].duration + + // Use effectiveDuration for timeline calculation + scope.channel.duration += effectiveDuration; + + // Set stop time using the updated duration scope.channel.programs[i].stop = new Date(scope.channel.startTime.valueOf() + scope.channel.duration) if (scope.channel.programs[i].isOffline) { scope.hasFlex = true; diff --git a/web/directives/program-config.js b/web/directives/program-config.js index f274eb5..0715b45 100644 --- a/web/directives/program-config.js +++ b/web/directives/program-config.js @@ -9,29 +9,138 @@ module.exports = function ($timeout) { onDone: "=onDone" }, link: function (scope, element, attrs) { - scope.finished = (prog) => { - if (prog.title === "") - scope.error = { title: 'You must set a program title.' } - else if (prog.type === "episode" && prog.showTitle == "") - scope.error = { showTitle: 'You must set a show title when the program type is an episode.' } - else if (prog.type === "episode" && (prog.season == null)) - scope.error = { season: 'You must set a season number when the program type is an episode.' } - else if (prog.type === "episode" && prog.season <= 0) - scope.error = { season: 'Season number musat be greater than 0' } - else if (prog.type === "episode" && (prog.episode == null)) - scope.error = { episode: 'You must set a episode number when the program type is an episode.' } - else if (prog.type === "episode" && prog.episode <= 0) - scope.error = { episode: 'Episode number musat be greater than 0' } + // Conversion functions remain the same (using NaN for invalid) + scope.msToTimeString = function(ms) { + if (typeof ms !== 'number' || isNaN(ms) || ms < 0) { return ''; } + let totalS = Math.floor(ms / 1000); + let s = totalS % 60; + let m = Math.floor(totalS / 60); + return m + ":" + ( (s < 10) ? ("0" + s) : s ); + }; + + scope.timeStringToMs = function(timeString) { + if (timeString == null || timeString.trim() === '') { return 0; } // Empty is 0ms + let parts = timeString.split(':'); + if (parts.length !== 2) { return NaN; } // Invalid format + let min = parseInt(parts[0], 10); + let sec = parseInt(parts[1], 10); + if (isNaN(min) || isNaN(sec) || sec < 0 || sec >= 60 || min < 0) { return NaN; } // Invalid numbers + return (min * 60 + sec) * 1000; + }; + + // Intermediate model for UI binding + scope.timeInput = { + seek: '', + end: '' + }; + + let initialProgramLoad = true; // Flag for first load - if (scope.error != null) { - $timeout(() => { - scope.error = null - }, 3500) - return + // Watch program to initialize/reset intermediate model ONLY + scope.$watch('program', function(newProgram) { + if (newProgram) { + console.log("Program loaded/changed. Initializing timeInput."); + // Initialize timeInput from program data + let initialSeekMs = newProgram.seekPosition; + let initialEndMs = newProgram.endPosition; + + scope.timeInput.seek = scope.msToTimeString( (typeof initialSeekMs === 'number' && !isNaN(initialSeekMs)) ? initialSeekMs : 0 ); + scope.timeInput.end = (typeof initialEndMs === 'number' && !isNaN(initialEndMs) && initialEndMs > 0) ? scope.msToTimeString(initialEndMs) : ''; + + initialProgramLoad = false; // Mark initial load complete + } else { + // Clear inputs if program is removed + scope.timeInput.seek = ''; + scope.timeInput.end = ''; + initialProgramLoad = true; // Reset flag if program is cleared + } + }); + + scope.finished = (prog) => { + // prog here is the original program object passed to the directive + // We need to validate and apply changes from scope.timeInput + + let currentError = null; + + // --- Validate Time Inputs --- + let seekInputString = scope.timeInput.seek; + let endInputString = scope.timeInput.end; + + let seekMs = scope.timeStringToMs(seekInputString); + let endMs = scope.timeStringToMs(endInputString); // Will be 0 if empty, NaN if invalid + + // Check for invalid formats (NaN) + if (isNaN(seekMs)) { + currentError = { seekPosition: 'Invalid start time format. Use MM:SS.' }; + } else if (isNaN(endMs) && endInputString && endInputString.trim() !== '') { + // Only error on endMs if it's not empty but is invalid + currentError = { endPosition: 'Invalid end time format. Use MM:SS.' }; + } else { + // Format is valid or empty, now check relationship + // Treat endMs === 0 (from empty input) as 'undefined' for comparison + let effectiveEndMs = (endMs === 0 && (endInputString == null || endInputString.trim() === '')) ? undefined : endMs; + + // Validate Seek Position against Duration first + if (prog.duration && seekMs >= (prog.duration - 1000)) { + currentError = currentError || {}; + currentError.seekPosition = 'Start time must be at least 1 second before the program ends.'; + } + // Then validate End Position if specified + else if (typeof effectiveEndMs === 'number') { + if (effectiveEndMs <= seekMs) { + currentError = currentError || {}; + currentError.endPosition = 'End position must be greater than start position.'; + } else if (prog.duration && effectiveEndMs > prog.duration) { + // Error if end time EXCEEDS program duration + currentError = currentError || {}; + currentError.endPosition = 'End position cannot exceed program duration (' + scope.msToTimeString(prog.duration) + ').'; + } + // Check if start/end combination is valid (at least 1s apart) + else if ((effectiveEndMs - seekMs) < 1000) { + currentError = currentError || {}; + // Apply error to the field being edited or a general one if needed + currentError.endPosition = 'Effective program length must be at least 1 second.'; + } + } } - scope.onDone(JSON.parse(angular.toJson(prog))) - scope.program = null + // --- Standard Validation (on original prog object) --- + if (!currentError) { // Only proceed if time validation passed + if (!prog.title) { currentError = { title: 'You must set a program title.' }; } + else if (prog.type === "episode" && !prog.showTitle) { currentError = { showTitle: 'You must set a show title when the program type is an episode.' }; } + else if (prog.type === "episode" && (prog.season == null || prog.season <= 0)) { currentError = { season: 'Season number must be greater than 0.' }; } + else if (prog.type === "episode" && (prog.episode == null || prog.episode <= 0)) { currentError = { episode: 'Episode number must be greater than 0.' }; } + // Add any other existing standard validations here, setting currentError + } + + // --- Error Handling --- + if (currentError && Object.keys(currentError).length !== 0) { + scope.error = currentError; + $timeout(() => { scope.error = null }, 3500); + return; // Stop execution + } + + // --- Prepare Final Object --- + // Create a clean object based on the original prog and validated time inputs + // Ensure seekMs is a valid number before assigning + let finalSeekMs = isNaN(seekMs) ? 0 : seekMs; + // Ensure endMs is valid number > 0 or undefined + let finalEndMs = (typeof endMs === 'number' && !isNaN(endMs) && endMs > 0) ? endMs : undefined; + + let finalProgData = { + ...prog, // Copy original properties + seekPosition: finalSeekMs, + endPosition: finalEndMs + }; + + // Explicitly remove endPosition if undefined + if (finalProgData.endPosition === undefined) { + delete finalProgData.endPosition; + } + + console.log("Validation passed. Calling onDone with:", finalProgData); + scope.onDone(JSON.parse(angular.toJson(finalProgData))); + scope.program = null; } } }; diff --git a/web/public/templates/channel-config.html b/web/public/templates/channel-config.html index 081300d..7c60b99 100644 --- a/web/public/templates/channel-config.html +++ b/web/public/templates/channel-config.html @@ -727,6 +727,15 @@ (This will hide the channel from TV guides, spoofed HDHR, m3u playlist... The channel can still be streamed directly or be used as a redirect target.)
+ +
+
+ + + + (When enabled, adjacent programs with the same content ID will appear as a single program in the guide. This is useful for shows split by commercials or bumpers.) +
+


diff --git a/web/public/templates/program-config.html b/web/public/templates/program-config.html index 5ba9c7f..b86ebb8 100644 --- a/web/public/templates/program-config.html +++ b/web/public/templates/program-config.html @@ -30,6 +30,33 @@
+ +
+
+
Advanced Options
+
+
+
+ +
+
+ + Format: minutes:seconds (e.g. 5:30) +
{{error.seekPosition}}
+
+
+ +
+
+ + Format: minutes:seconds (e.g. 10:45) +
+
+
+
+
+ +
+
+
Advanced Options
+
+
+
+ +
+
+ + Format: minutes:seconds (e.g. 5:30) +
{{error.seekPosition}}
+
+
+ +
+
+ + Format: minutes:seconds (e.g. 10:45) +
+
+
+
+
diff --git a/web/services/common-program-tools.js b/web/services/common-program-tools.js index 2d47910..5bf354a 100644 --- a/web/services/common-program-tools.js +++ b/web/services/common-program-tools.js @@ -210,12 +210,16 @@ module.exports = function (getShowData) { background = "repeating-linear-gradient( " + angle + "deg, " + rgb1 + ", " + rgb1 + " " + w + "px, " + rgb2 + " " + w + "px, " + rgb2 + " " + (w*2) + "px)"; } + + // Width calculation based on effective duration + let seek = typeof program.seekPosition === 'number' ? program.seekPosition : 0; + let end = typeof program.endPosition === 'number' ? program.endPosition : null; + let effectiveDuration = (end !== null ? end : program.duration) - seek; + let f = interpolate; let w = 15.0; let t = 4*60*60*1000; - //let d = Math.log( Math.min(t, program.duration) ) / Math.log(2); - //let a = (d * Math.log(2) ) / Math.log(t); - let a = ( f(program.duration) *w) / f(t); + let a = (f(effectiveDuration) *w) / f(t); a = Math.min( w, Math.max(0.3, a) ); b = w - a + 0.01; From 0346a67ca9ea3cd9b3b04a1310bd46cc207e32eb Mon Sep 17 00:00:00 2001 From: vexorian Date: Mon, 1 Dec 2025 11:33:09 -0400 Subject: [PATCH 05/13] Prepare 1.6.1 development --- README.md | 2 +- src/constants.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4ce4696..79648dd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# dizqueTV 1.6.0 +# dizqueTV 1.6.1-development ![Discord](https://img.shields.io/discord/711313431457693727?logo=discord&logoColor=fff&style=flat-square) ![GitHub top language](https://img.shields.io/github/languages/top/vexorian/dizquetv?logo=github&style=flat-square) ![Docker Pulls](https://img.shields.io/docker/pulls/vexorian/dizquetv?logo=docker&logoColor=fff&style=flat-square) Create live TV channel streams from media on your Plex servers. diff --git a/src/constants.js b/src/constants.js index 9346a71..41eeaa7 100644 --- a/src/constants.js +++ b/src/constants.js @@ -35,5 +35,5 @@ module.exports = { // staying active, it checks every 5 seconds PLAYED_MONITOR_CHECK_FREQUENCY: 5*1000, - VERSION_NAME: "1.6.0" + VERSION_NAME: "1.6.1-development" } From b54c64445e60f76018ec713b3dbddee6edaa050a Mon Sep 17 00:00:00 2001 From: tim000x3 Date: Tue, 2 Dec 2025 10:50:14 -0500 Subject: [PATCH 06/13] Fix original duration override bug --- src/services/channel-service.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/services/channel-service.js b/src/services/channel-service.js index 831675e..92b67bc 100644 --- a/src/services/channel-service.js +++ b/src/services/channel-service.js @@ -69,9 +69,6 @@ function cleanUpProgram(program) { program.endPosition = parseInt(program.endPosition, 10); } - if (program.start && program.stop) { - program.duration = new Date(program.stop) - new Date(program.start); - } delete program.streams; delete program.durationStr; delete program.commercials; From 8be607a81b1877038a3c5d99e69d0d958ddbe8e0 Mon Sep 17 00:00:00 2001 From: vexorian Date: Sun, 14 Dec 2025 21:12:04 -0400 Subject: [PATCH 07/13] Updating the workflow, now with less branch renames. --- .github/workflows/README.md | 13 +++++++++++++ .github/workflows/development-binaries.yaml | 2 +- .github/workflows/development-tag.yaml | 2 +- pull_request_template.md | 4 ++-- 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/README.md diff --git a/.github/workflows/README.md b/.github/workflows/README.md new file mode 100644 index 0000000..bfd8cc9 --- /dev/null +++ b/.github/workflows/README.md @@ -0,0 +1,13 @@ +# The workflow + + edge main + ^ \ ^ + | \------2--\ | + 1 \ 3 + | \ | + development <-4-- patch + +1. Releasing a new 'edge' version. +2. Moving an 'edge' version to stable. +3. Releasing a stable version +4. Aligning bug fixes with the new features. \ No newline at end of file diff --git a/.github/workflows/development-binaries.yaml b/.github/workflows/development-binaries.yaml index 2d70da3..21b1be9 100644 --- a/.github/workflows/development-binaries.yaml +++ b/.github/workflows/development-binaries.yaml @@ -3,7 +3,7 @@ name: Development Binaries on: push: branches: - - dev/1.6.x + - development jobs: binaries: diff --git a/.github/workflows/development-tag.yaml b/.github/workflows/development-tag.yaml index 23db34c..198d9e6 100644 --- a/.github/workflows/development-tag.yaml +++ b/.github/workflows/development-tag.yaml @@ -3,7 +3,7 @@ name: Development Tag on: push: branches: - - dev/1.6.x + - development jobs: docker: diff --git a/pull_request_template.md b/pull_request_template.md index 75eb426..3190e7b 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -7,8 +7,8 @@ * [ ] I have read the code of conduct. * [ ] I am submitting to the correct base branch ### Changes that modify the db structure From 4cdf87121a96d5f7e8cb84d8cfbcb6a1adcf453a Mon Sep 17 00:00:00 2001 From: vexorian Date: Sun, 14 Dec 2025 21:18:46 -0400 Subject: [PATCH 08/13] Prepare 1.7.0 development --- README.md | 2 +- src/constants.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 79648dd..3d3d1df 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# dizqueTV 1.6.1-development +# dizqueTV 1.7.0-development ![Discord](https://img.shields.io/discord/711313431457693727?logo=discord&logoColor=fff&style=flat-square) ![GitHub top language](https://img.shields.io/github/languages/top/vexorian/dizquetv?logo=github&style=flat-square) ![Docker Pulls](https://img.shields.io/docker/pulls/vexorian/dizquetv?logo=docker&logoColor=fff&style=flat-square) Create live TV channel streams from media on your Plex servers. diff --git a/src/constants.js b/src/constants.js index 41eeaa7..c1c919c 100644 --- a/src/constants.js +++ b/src/constants.js @@ -35,5 +35,5 @@ module.exports = { // staying active, it checks every 5 seconds PLAYED_MONITOR_CHECK_FREQUENCY: 5*1000, - VERSION_NAME: "1.6.1-development" + VERSION_NAME: "1.7.0-development" } From 7daad9e33f9ad5f6220142534d04ae8eed737bd4 Mon Sep 17 00:00:00 2001 From: vexorian Date: Mon, 8 Dec 2025 10:23:47 -0400 Subject: [PATCH 09/13] When adding media from plex, the UI will now use dizqueTV as a proxy to connect to Plex. Thanks to this the 'ui route' is no longer necessary. Connection to plex through UI is still in use for authenticating with plex when adding the servers. --- index.js | 36 ++++++++++++++++++++++++- src/api.js | 13 ++++++--- src/dao/plex-server-db.js | 11 ++++++++ src/services/plex-proxy-service.js | 30 +++++++++++++++++++++ web/directives/plex-library.js | 27 +++++++++++-------- web/directives/plex-settings.js | 28 ------------------- web/public/locales/en/main.json | 6 ++--- web/public/templates/plex-library.html | 10 +++++-- web/public/templates/plex-settings.html | 13 +-------- web/services/dizquetv.js | 9 +++++++ web/services/plex.js | 22 +++++++-------- 11 files changed, 132 insertions(+), 73 deletions(-) create mode 100644 src/services/plex-proxy-service.js diff --git a/index.js b/index.js index 5805ef7..9f614e6 100644 --- a/index.js +++ b/index.js @@ -32,6 +32,8 @@ const ProgrammingService = require("./src/services/programming-service"); const ActiveChannelService = require('./src/services/active-channel-service') const ProgramPlayTimeDB = require('./src/dao/program-play-time-db') const FfmpegSettingsService = require('./src/services/ffmpeg-settings-service') +const PlexProxyService = require('./src/services/plex-proxy-service') +const PlexServerDB = require('./src/dao/plex-server-db'); const onShutdown = require("node-graceful-shutdown").onShutdown; @@ -107,6 +109,9 @@ fillerDB = new FillerDB( path.join(process.env.DATABASE, 'filler') , channelServ customShowDB = new CustomShowDB( path.join(process.env.DATABASE, 'custom-shows') ); let programPlayTimeDB = new ProgramPlayTimeDB( path.join(process.env.DATABASE, 'play-cache') ); let ffmpegSettingsService = new FfmpegSettingsService(db, unlockPath); +let plexServerDB = new PlexServerDB(channelService, fillerDB, customShowDB, db); +let plexProxyService = new PlexProxyService(plexServerDB); + async function initializeProgramPlayTimeDB() { try { @@ -251,6 +256,35 @@ channelService.on("channel-update", (data) => { let hdhr = HDHR(db, channelDB) let app = express() + +const responseInterceptor = ( + req, + res, + next +) => { + + let t0 = new Date().getTime(); + + const originalSend = res.send; + let responseSent = false; + console.log(`${req.method} ${req.url} ...`); + + res.send = function (body) { + + if (!responseSent) { + let t1 = new Date().getTime(); + let dt = t1 - t0; + console.log(`${req.method} ${req.url} ${res.statusCode} in ${dt}ms`); + responseSent = true; + } + + return originalSend.call(this, body); + }; + + next(); +}; +app.use(responseInterceptor); + eventService.setup(app); app.use( @@ -290,7 +324,7 @@ app.use('/favicon.svg', express.static( app.use('/custom.css', express.static(path.join(process.env.DATABASE, 'custom.css'))) // API Routers -app.use(api.router(db, channelService, fillerDB, customShowDB, xmltvInterval, guideService, m3uService, eventService, ffmpegSettingsService)) +app.use(api.router(db, channelService, fillerDB, customShowDB, xmltvInterval, guideService, m3uService, eventService, ffmpegSettingsService, plexServerDB, plexProxyService)) app.use('/api/cache/images', cacheImageService.apiRouters()) app.use('/' + fontAwesome, express.static(path.join(process.env.DATABASE, fontAwesome))) app.use('/' + bootstrap, express.static(path.join(process.env.DATABASE, bootstrap))) diff --git a/src/api.js b/src/api.js index 7d21f4d..904574a 100644 --- a/src/api.js +++ b/src/api.js @@ -24,10 +24,9 @@ function safeString(object) { } module.exports = { router: api } -function api(db, channelService, fillerDB, customShowDB, xmltvInterval, guideService, _m3uService, eventService, ffmpegSettingsService ) { +function api(db, channelService, fillerDB, customShowDB, xmltvInterval, guideService, _m3uService, eventService, ffmpegSettingsService, plexServerDB, plexProxyService ) { let m3uService = _m3uService; const router = express.Router() - const plexServerDB = new PlexServerDB(channelService, fillerDB, customShowDB, db); router.get('/api/version', async (req, res) => { try { @@ -216,7 +215,15 @@ function api(db, channelService, fillerDB, customShowDB, xmltvInterval, guideSe ); } }) - + router.get('/api/plex-server/:serverName64/:path(*)', async (req, res) => { + try { + let result = await plexProxyService.get(req.params.serverName64, req.params.path); + res.status(200).send(result); + } catch (err) { + console.error("Could not use plex proxy.", err); + res.status(404).send("Could not call plex server."); + } + }); // Channels router.get('/api/channels', async (req, res) => { diff --git a/src/dao/plex-server-db.js b/src/dao/plex-server-db.js index cd35d4c..a3a7000 100644 --- a/src/dao/plex-server-db.js +++ b/src/dao/plex-server-db.js @@ -15,6 +15,17 @@ class PlexServerDB this.showDB = showDB; } + async getPlexServerByName(name) { + let servers = this.db['plex-servers'].find() + let server = servers.sort( (a,b) => { return a.index - b.index } ) + .filter( (server) => name === server.name ) + [0]; + if (typeof(server) === "undefined") { + return null; + } + return server; + } + async fixupAllChannels(name, newServer) { let channelNumbers = await this.channelService.getAllChannelNumbers(); let report = await Promise.all( channelNumbers.map( async (i) => { diff --git a/src/services/plex-proxy-service.js b/src/services/plex-proxy-service.js new file mode 100644 index 0000000..8a14ba1 --- /dev/null +++ b/src/services/plex-proxy-service.js @@ -0,0 +1,30 @@ +const Plex = require('../plex.js') +const events = require('events') + +class PlexProxyService extends events.EventEmitter { + + constructor(plexServerDB) { + super(); + this.plexServerDB = plexServerDB; + } + + async get(serverName64, path) { + let plexServer = await getPlexServer(this.plexServerDB, serverName64); + let client = new Plex(plexServer); + return { MediaContainer: await client.Get("/" + path) }; + } +} + + + +async function getPlexServer(plexServerDB, serverName64) { + let serverKey = Buffer.from(serverName64, 'base64').toString('utf-8'); + let server = await plexServerDB.getPlexServerByName(serverKey); + if (server == null) { + throw Error("server not found"); + } + return server; + +} + +module.exports = PlexProxyService \ No newline at end of file diff --git a/web/directives/plex-library.js b/web/directives/plex-library.js index 153b2e2..0406d89 100644 --- a/web/directives/plex-library.js +++ b/web/directives/plex-library.js @@ -31,13 +31,7 @@ module.exports = function (plex, dizquetv, $timeout, commonProgramTools) { }); } scope.selectOrigin = function (origin) { - if ( origin.type === 'plex' ) { - scope.plexServer = origin.server; - updateLibrary(scope.plexServer); - } else { - scope.plexServer = undefined; - updateCustomShows(); - } + updateLibrary(origin); } scope._onFinish = (s, insertPoint) => { if (s.length > scope.limit) { @@ -99,20 +93,31 @@ module.exports = function (plex, dizquetv, $timeout, commonProgramTools) { "type" : "plex", "name" : `Plex - ${s.name}`, "server": s, + "loaded" : false, } } ); - scope.currentOrigin = scope.origins[0]; - scope.plexServer = scope.currentOrigin.server; scope.origins.push( { "type": "dizquetv", "name" : "dizqueTV - Custom Shows", + "loaded" : false, } ); - updateLibrary(scope.plexServer) + updateLibrary(scope.origins[0]) }) - let updateLibrary = async(server) => { + let updateLibrary = async(origin) => { + scope.currentOrigin = origin; + origin.loaded = false; + if ( origin.type !== 'plex' ) { + scope.plexServer = undefined; + await updateCustomShows(); + origin.loaded = true; + return; + } + let server = scope.currentOrigin.server; let lib = await plex.getLibrary(server); let play = await plex.getPlaylists(server); + scope.currentOrigin.loaded = true; + scope.plexServer = server; play.forEach( p => { p.type = "playlist"; diff --git a/web/directives/plex-settings.js b/web/directives/plex-settings.js index 53a51a2..83994fd 100644 --- a/web/directives/plex-settings.js +++ b/web/directives/plex-settings.js @@ -20,12 +20,9 @@ module.exports = function (plex, dizquetv, $timeout) { scope.servers = servers; if(servers) { for (let i = 0; i < scope.servers.length; i++) { - scope.servers[i].uiStatus = 0; scope.servers[i].backendStatus = 0; let t = (new Date()).getTime(); - scope.servers[i].uiPending = t; scope.servers[i].backendPending = t; - scope.refreshUIStatus(t, i); scope.refreshBackendStatus(t, i); } } @@ -51,22 +48,6 @@ module.exports = function (plex, dizquetv, $timeout) { scope.refreshServerList(); } - scope.isAnyUIBad = () => { - let t = (new Date()).getTime(); - if(scope.servers) { - for (let i = 0; i < scope.servers.length; i++) { - let s = scope.servers[i]; - if ( - (s.uiStatus == -1) - || ( (s.uiStatus == 0) && (s.uiPending + 30000 < t) ) - ) { - return true; - } - } - } - return false; - }; - scope.isAnyBackendBad = () => { let t = (new Date()).getTime(); if(scope.servers) { @@ -84,15 +65,6 @@ module.exports = function (plex, dizquetv, $timeout) { }; - scope.refreshUIStatus = async (t, i) => { - let s = await plex.check(scope.servers[i]); - if (scope.servers[i].uiPending == t) { - // avoid updating for a previous instance of the row - scope.servers[i].uiStatus = s; - } - scope.$apply(); - }; - scope.refreshBackendStatus = async (t, i) => { let s = await dizquetv.checkExistingPlexServer(scope.servers[i].name); if (scope.servers[i].backendPending == t) { diff --git a/web/public/locales/en/main.json b/web/public/locales/en/main.json index 3bf946d..a067645 100644 --- a/web/public/locales/en/main.json +++ b/web/public/locales/en/main.json @@ -19,12 +19,10 @@ "minutes_to_sign_plex": "You have 2 minutes to sign into your Plex Account.", "name": "Name", "uri": "URI", - "ui_route": "UI Route", - "backend_route": "Backend Route", + "routeStatus": "Route Status", "ok": "ok", "error": "error", - "ui_bad": "If a Plex server configuration has problems with the UI route, the channel editor won't be able to access its content.", - "backend_bad": "If a Plex server configuration has problems with the backend route, dizqueTV won't be able to play its content.", + "backend_bad": "A route problem means the dizqueTV server can't establish a connection with the configured Plex server.", "plex_transcoder_settings": "Plex Transcoder Settings", "update": "Update", "reset_options": "Reset Options", diff --git a/web/public/templates/plex-library.html b/web/public/templates/plex-library.html index adc2f58..74d0a78 100644 --- a/web/public/templates/plex-library.html +++ b/web/public/templates/plex-library.html @@ -43,7 +43,13 @@ Content: -
    + +
      + +
    • Loading Library Contents...
      • + +
    +
    • @@ -122,7 +128,7 @@
-
    +
    • diff --git a/web/public/templates/plex-settings.html b/web/public/templates/plex-settings.html index 805d147..4b7b58e 100644 --- a/web/public/templates/plex-settings.html +++ b/web/public/templates/plex-settings.html @@ -16,8 +16,7 @@ {{'settings_server.name' | i18next}} {{'settings_server.uri' | i18next}} - {{'settings_server.ui_route' | i18next}} - {{'settings_server.backend_route' | i18next}} + {{'settings_server.routeStatus' | i18next}} @@ -31,11 +30,6 @@ {{ x.name }} {{ x.uri }} - -
      -
      {{'settings_server.ok' | i18next}}
      -
      {{'settings_server.error' | i18next}}
      -
      {{'settings_server.ok' | i18next}}
      @@ -51,11 +45,6 @@

      {{serverError}}

      - - -

      {{'settings_server.ui_bad' | i18next}}

      - -

      {{'settings_server.server_bad' | i18next}}

      diff --git a/web/services/dizquetv.js b/web/services/dizquetv.js index 4e8b8f6..396ece5 100644 --- a/web/services/dizquetv.js +++ b/web/services/dizquetv.js @@ -49,6 +49,15 @@ module.exports = function ($http, $q) { }); return d.data; }, + getFromPlexProxy: async (serverName, path) => { + let serverName64 = Buffer.from(serverName, 'utf-8').toString('base64'); + let tmp = await ($http({ + method: 'GET', + url : `api/plex-server/${serverName64}${path}`, + headers: { "Cache-Control": "no-cache"}, + })) + return tmp.data.MediaContainer; + }, getPlexSettings: () => { return $http.get('/api/plex-settings').then((d) => { return d.data }) }, diff --git a/web/services/plex.js b/web/services/plex.js index 18913bc..f36734f 100644 --- a/web/services/plex.js +++ b/web/services/plex.js @@ -1,6 +1,6 @@ const Plex = require('../../src/plex'); -module.exports = function ($http, $window, $interval) { +module.exports = function (dizquetv, $http, $window, $interval) { let exported = { login: async () => { const headers = { @@ -108,14 +108,13 @@ module.exports = function ($http, $window, $interval) { }, getLibrary: async (server) => { - var client = new Plex(server) - const res = await client.Get('/library/sections') + const res = await dizquetv.getFromPlexProxy(server.name, '/library/sections') var sections = [] for (let i = 0, l = typeof res.Directory !== 'undefined' ? res.Directory.length : 0; i < l; i++) if (res.Directory[i].type === 'movie' || res.Directory[i].type === 'show' || res.Directory[i].type === 'artist' ) { var genres = [] if (res.Directory[i].type === 'movie') { - const genresRes = await client.Get(`/library/sections/${res.Directory[i].key}/genre`) + const genresRes = await dizquetv.getFromPlexProxy(server.name,`/library/sections/${res.Directory[i].key}/genre`) for (let q = 0, k = typeof genresRes.Directory !== 'undefined' ? genresRes.Directory.length : 0; q < k; q++) { if (genresRes.Directory[q].type === 'genre') { genres.push({ @@ -138,8 +137,7 @@ module.exports = function ($http, $window, $interval) { return sections }, getPlaylists: async (server) => { - var client = new Plex(server) - const res = await client.Get('/playlists') + const res = await dizquetv.getFromPlexProxy(server.name, '/playlists'); var playlists = [] for (let i = 0, l = typeof res.Metadata !== 'undefined' ? res.Metadata.length : 0; i < l; i++) if ( @@ -157,8 +155,7 @@ module.exports = function ($http, $window, $interval) { return playlists }, getStreams: async (server, key) => { - var client = new Plex(server) - return client.Get(key).then((res) => { + return dizquetv.getFromPlexProxy(server.name, key).then((res) => { let streams = res.Metadata[0].Media[0].Part[0].Stream for (let i = 0, l = streams.length; i < l; i++) { if (typeof streams[i].key !== 'undefined') { @@ -169,9 +166,9 @@ module.exports = function ($http, $window, $interval) { }) }, getNested: async (server, lib, includeCollections, errors) => { - var client = new Plex(server) + const key = lib.key - const res = await client.Get(key) + const res = await dizquetv.getFromPlexProxy(server.name, key) const size = (typeof(res.Metadata) !== 'undefined') ? res.Metadata.length : 0; var nested = [] @@ -191,7 +188,8 @@ module.exports = function ($http, $window, $interval) { albumKeys = Object.keys( albumKeys ); await Promise.all( albumKeys.map( async(albumKey) => { try { - let album = await client.Get(albumKey); + let album = await dizquetv.getFromPlexProxy( + server.name, albumKey); if ( (typeof(album)!=='undefined') && album.size == 1) { album = album.Metadata[0]; } @@ -287,7 +285,7 @@ module.exports = function ($http, $window, $interval) { let k = res.librarySectionID; k = `/library/sections/${k}/collections`; - let collections = await client.Get(k); + let collections = await dizquetv.getFromPlexProxy(server.name, k); if ( typeof(collections.Metadata) === 'undefined') { collections.Metadata = []; } From caf3b3b72cfcdaa476a4d548f110f2493f884cc8 Mon Sep 17 00:00:00 2001 From: vexorian Date: Sun, 14 Dec 2025 23:05:32 -0400 Subject: [PATCH 10/13] FFMpeg path is now set by environment var or file.. --- Dockerfile | 1 + Dockerfile-nvidia | 1 + index.js | 13 ++- src/api.js | 19 +++- src/database-migration.js | 28 +++--- src/ffmpeg-info.js | 106 +++++++++++++++++++++- src/ffmpeg.js | 4 +- src/services/ffmpeg-settings-service.js | 13 +-- src/video.js | 31 ++++--- web/directives/ffmpeg-settings.js | 9 +- web/public/templates/ffmpeg-settings.html | 36 ++------ 11 files changed, 174 insertions(+), 87 deletions(-) diff --git a/Dockerfile b/Dockerfile index 991ecd6..d24b18c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,5 +10,6 @@ FROM akashisn/ffmpeg:4.4.5 EXPOSE 8000 WORKDIR /home/node/app ENTRYPOINT [ "./dizquetv" ] +ENV DIZQUETV_FFMPEG_PATH=/usr/bin/ffmpeg COPY --from=0 /home/node/app/dist/dizquetv /home/node/app/ RUN ln -s /usr/local/bin/ffmpeg /usr/bin/ffmpeg diff --git a/Dockerfile-nvidia b/Dockerfile-nvidia index 52fc831..ad468b3 100644 --- a/Dockerfile-nvidia +++ b/Dockerfile-nvidia @@ -10,5 +10,6 @@ FROM jrottenberg/ffmpeg:4.4.5-nvidia2204 EXPOSE 8000 WORKDIR /home/node/app ENTRYPOINT [ "./dizquetv" ] +ENV DIZQUETV_FFMPEG_PATH=/usr/bin/ffmpeg COPY --from=0 /home/node/app/dist/dizquetv /home/node/app/ RUN ln -s /usr/local/bin/ffmpeg /usr/bin/ffmpeg diff --git a/index.js b/index.js index 9f614e6..390c6e9 100644 --- a/index.js +++ b/index.js @@ -34,6 +34,7 @@ const ProgramPlayTimeDB = require('./src/dao/program-play-time-db') const FfmpegSettingsService = require('./src/services/ffmpeg-settings-service') const PlexProxyService = require('./src/services/plex-proxy-service') const PlexServerDB = require('./src/dao/plex-server-db'); +const FFMPEGInfo = require('./src/ffmpeg-info'); const onShutdown = require("node-graceful-shutdown").onShutdown; @@ -53,16 +54,12 @@ if (NODE < 12) { console.error(`WARNING: Your nodejs version ${process.version} is lower than supported. dizqueTV has been tested best on nodejs 12.16.`); } -unlockPath = false; for (let i = 0, l = process.argv.length; i < l; i++) { if ((process.argv[i] === "-p" || process.argv[i] === "--port") && i + 1 !== l) process.env.PORT = process.argv[i + 1] if ((process.argv[i] === "-d" || process.argv[i] === "--database") && i + 1 !== l) process.env.DATABASE = process.argv[i + 1] - if (process.argv[i] === "--unlock") { - unlockPath = true; - } } process.env.DATABASE = process.env.DATABASE || path.join(".", ".dizquetv") @@ -94,6 +91,8 @@ if(!fs.existsSync(path.join(process.env.DATABASE, 'cache','images'))) { fs.mkdirSync(path.join(process.env.DATABASE, 'cache','images')) } +const ffmpegInfo = new FFMPEGInfo(process.env, process.env.DATABASE); +ffmpegInfo.initialize(); channelDB = new ChannelDB( path.join(process.env.DATABASE, 'channels') ); @@ -108,7 +107,7 @@ channelService = new ChannelService(channelDB); fillerDB = new FillerDB( path.join(process.env.DATABASE, 'filler') , channelService ); customShowDB = new CustomShowDB( path.join(process.env.DATABASE, 'custom-shows') ); let programPlayTimeDB = new ProgramPlayTimeDB( path.join(process.env.DATABASE, 'play-cache') ); -let ffmpegSettingsService = new FfmpegSettingsService(db, unlockPath); +let ffmpegSettingsService = new FfmpegSettingsService(db); let plexServerDB = new PlexServerDB(channelService, fillerDB, customShowDB, db); let plexProxyService = new PlexProxyService(plexServerDB); @@ -324,12 +323,12 @@ app.use('/favicon.svg', express.static( app.use('/custom.css', express.static(path.join(process.env.DATABASE, 'custom.css'))) // API Routers -app.use(api.router(db, channelService, fillerDB, customShowDB, xmltvInterval, guideService, m3uService, eventService, ffmpegSettingsService, plexServerDB, plexProxyService)) +app.use(api.router(db, channelService, fillerDB, customShowDB, xmltvInterval, guideService, m3uService, eventService, ffmpegSettingsService, plexServerDB, plexProxyService, ffmpegInfo)) app.use('/api/cache/images', cacheImageService.apiRouters()) app.use('/' + fontAwesome, express.static(path.join(process.env.DATABASE, fontAwesome))) app.use('/' + bootstrap, express.static(path.join(process.env.DATABASE, bootstrap))) -app.use(video.router( channelService, fillerDB, db, programmingService, activeChannelService, programPlayTimeDB )) +app.use(video.router( channelService, fillerDB, db, programmingService, activeChannelService, programPlayTimeDB, ffmpegInfo )) app.use(hdhr.router) app.listen(process.env.PORT, () => { console.log(`HTTP server running on port: http://*:${process.env.PORT}`) diff --git a/src/api.js b/src/api.js index 904574a..3e5cba9 100644 --- a/src/api.js +++ b/src/api.js @@ -4,8 +4,6 @@ const path = require('path') const fs = require('fs') const constants = require('./constants'); const JSONStream = require('JSONStream'); -const FFMPEGInfo = require('./ffmpeg-info'); -const PlexServerDB = require('./dao/plex-server-db'); const Plex = require("./plex.js"); const timeSlotsService = require('./services/time-slots-service'); @@ -24,14 +22,13 @@ function safeString(object) { } module.exports = { router: api } -function api(db, channelService, fillerDB, customShowDB, xmltvInterval, guideService, _m3uService, eventService, ffmpegSettingsService, plexServerDB, plexProxyService ) { +function api(db, channelService, fillerDB, customShowDB, xmltvInterval, guideService, _m3uService, eventService, ffmpegSettingsService, plexServerDB, plexProxyService, ffmpegInfo ) { let m3uService = _m3uService; const router = express.Router() router.get('/api/version', async (req, res) => { try { - let ffmpegSettings = db['ffmpeg-settings'].find()[0]; - let v = await (new FFMPEGInfo(ffmpegSettings)).getVersion(); + let v = await ffmpegInfo.getVersion(); res.send( { "dizquetv" : constants.VERSION_NAME, "ffmpeg" : v, @@ -616,6 +613,18 @@ function api(db, channelService, fillerDB, customShowDB, xmltvInterval, guideSe }) + router.get('/api/ffmpeg-info', async (req, res) => { + try { + let ffmpeg = await ffmpegInfo.getPath(); + let obj = { ffmpegPath: ffmpeg } + res.send(obj) + } catch(err) { + console.error(err); + res.status(500).send("error"); + } + }) + + // PLEX SETTINGS router.get('/api/plex-settings', (req, res) => { try { diff --git a/src/database-migration.js b/src/database-migration.js index cef34a7..a5e5771 100644 --- a/src/database-migration.js +++ b/src/database-migration.js @@ -20,8 +20,7 @@ const path = require('path'); var fs = require('fs'); -const TARGET_VERSION = 805; -const DAY_MS = 1000 * 60 * 60 * 24; +const TARGET_VERSION = 900; const STEPS = [ // [v, v2, x] : if the current version is v, call x(db), and version becomes v2 @@ -44,8 +43,9 @@ const STEPS = [ [ 800, 801, (db) => addImageCache(db) ], [ 801, 802, () => addGroupTitle() ], [ 802, 803, () => fixNonIntegerDurations() ], - [ 803, 805, (db) => addFFMpegLock(db) ], - [ 804, 805, (db) => addFFMpegLock(db) ], + [ 803, 900, (db) => fixFFMpegPathSetting(db) ], + [ 804, 900, (db) => fixFFMpegPathSetting(db) ], + [ 805, 900, (db) => fixFFMpegPathSetting(db) ], ] const { v4: uuidv4 } = require('uuid'); @@ -75,7 +75,7 @@ function appNameChange(db) { function basicDB(db) { //this one should either try recovering the db from a very old version - //or buildl a completely empty db at version 0 + //or build a completely empty db at version 0 let ffmpegSettings = db['ffmpeg-settings'].find() let plexSettings = db['plex-settings'].find() @@ -386,8 +386,6 @@ function ffmpeg() { return { //How default ffmpeg settings should look configVersion: 5, - ffmpegPath: "/usr/bin/ffmpeg", - ffmpegPathLockDate: new Date().getTime() + DAY_MS, threads: 4, concatMuxDelay: "0", logFfmpeg: false, @@ -769,19 +767,23 @@ function addScalingAlgorithm(db) { fs.writeFileSync( f, JSON.stringify( [ffmpegSettings] ) ); } -function addFFMpegLock(db) { +function fixFFMpegPathSetting(db) { let ffmpegSettings = db['ffmpeg-settings'].find()[0]; let f = path.join(process.env.DATABASE, 'ffmpeg-settings.json'); - if ( typeof(ffmpegSettings.ffmpegPathLockDate) === 'undefined' || ffmpegSettings.ffmpegPathLockDate == null ) { + let f2 = path.join(process.env.DATABASE, 'ffmpeg-path.json'); + delete ffmpegSettings.ffmpegPathLockDate; + let fpath = ffmpegSettings.ffmpegPath; + delete ffmpegSettings.ffmpegPath; - console.log("Adding ffmpeg lock. For your security it will not be possible to modify the ffmpeg path using the UI anymore unless you launch dizquetv by following special instructions.."); - // We are migrating an existing db that had a ffmpeg path. Make sure - // it's already locked. - ffmpegSettings.ffmpegPathLockDate = new Date().getTime() - 2 * DAY_MS; + if (typeof(fpath) === "string" ) { + console.log(`Found existing setting ffmpegPath=${fpath}, creating setting file (This file will get ignored if you are already setting an environment variable (the docker images do that)).`); + let pathJson = { ffmpegPath : fpath }; + fs.writeFileSync( f2, JSON.stringify( pathJson ) ); } fs.writeFileSync( f, JSON.stringify( [ffmpegSettings] ) ); } + function moveBackup(path) { if (fs.existsSync(`${process.env.DATABASE}${path}`) ) { let i = 0; diff --git a/src/ffmpeg-info.js b/src/ffmpeg-info.js index e7dd7f0..cceddcf 100644 --- a/src/ffmpeg-info.js +++ b/src/ffmpeg-info.js @@ -1,13 +1,98 @@ const exec = require('child_process').exec; +const fs = require('fs'); +const path = require('path'); class FFMPEGInfo { - constructor(opts) { - this.ffmpegPath = opts.ffmpegPath + + constructor(env, dbPath) { + this.initialized = false; + this.env = env; + this.dbPath = dbPath; + this.ffmpegPath = null; + this.origin = "Not found"; } - async getVersion() { + + async initialize() { + let selectedPath = null; + if (typeof(this.env.DIZQUETV_FFMPEG_PATH) === "string") { + selectedPath = this.env.DIZQUETV_FFMPEG_PATH; + this.origin = "env.DIZQUETV_FFMPEG_PATH"; + } else { + selectedPath = await this.getPathFromFile(this.dbPath, 'ffmpeg-path.json'); + this.origin = "ffmpeg-path.json"; + } + if (selectedPath == null) { + //windows Path environment var + let paths = this.env.Path; + if (typeof(paths) === "string") { + let maybe = paths.split(";").filter( + (str) => str.contains("ffmpeg" ) + )[0]; + if (typeof(maybe) === "string") { + selectedPath = path.join(maybe, "ffmpeg.exe"); + this.origin = "Widnows Env. Path"; + } + } + } + if (selectedPath == null) { + //Default install path for ffmpeg in n*x OSes. + // if someone has built ffmpeg manually or wants an alternate + // path, they are most likely capable of configuring it manually. + selectedPath = "/usr/bin/ffmpeg"; + this.origin = "Default"; + } + + if (selectedPath != null) { + let version = await this.checkVersion(selectedPath); + if (version == null) { + selectedPath = null; + } else { + console.log(`FFmpeg found: ${selectedPath} from: ${this.origin}. version: ${version}`); + this.ffmpegPath = selectedPath; + } + } + this.initialized = true; + + } + + async getPath() { + if (! this.initialized) { + await this.initialize(); + } + return this.ffmpegPath; + } + + async getPathFromFile(folder, fileName) { + let f = path.join(folder, fileName); + try { + let json = await new Promise( (resolve, reject) => { + fs.readFile(f, (err, data) => { + if (err) { + return reject(err); + } + try { + resolve( JSON.parse(data) ) + } catch (err) { + reject(err); + } + }) + }); + let ffmpeg = json["ffmpegPath"]; + if (typeof(ffmpeg) === "string") { + return ffmpeg; + } else { + return null; + } + } catch (err) { + console.error(err); + return null; + } + } + + async checkVersion(ffmpegPath) { try { let s = await new Promise( (resolve, reject) => { - exec( `"${this.ffmpegPath}" -version`, function(error, stdout, stderr){ + exec( `"${ffmpegPath}" -version`, function(error, stdout, stderr){ if (error !== null) { reject(error); } else { @@ -23,7 +108,20 @@ class FFMPEGInfo { return m[1]; } catch (err) { console.error("Error getting ffmpeg version", err); + return null; + } + } + + + async getVersion() { + if (! this.initialized) { + await this.initialize(); + } + let version = await this.checkVersion(this.ffmpegPath); + if (version == null) { return "Error"; + } else { + return version; } } } diff --git a/src/ffmpeg.js b/src/ffmpeg.js index c503279..08b43b0 100644 --- a/src/ffmpeg.js +++ b/src/ffmpeg.js @@ -7,6 +7,7 @@ const REALLY_RIDICULOUSLY_HIGH_FPS_FOR_DIZQUETVS_USECASE = 120; class FFMPEG extends events.EventEmitter { constructor(opts, channel) { super() + this.ffmpegPath = opts.ffmpegPath; this.opts = opts; this.errorPicturePath = `http://localhost:${process.env.PORT}/images/generic-error-screen.png`; this.ffmpegName = "unnamed ffmpeg"; @@ -22,7 +23,6 @@ class FFMPEG extends events.EventEmitter { this.opts.maxFPS = REALLY_RIDICULOUSLY_HIGH_FPS_FOR_DIZQUETVS_USECASE; } this.channel = channel - this.ffmpegPath = opts.ffmpegPath let resString = opts.targetResolution; if ( @@ -601,7 +601,7 @@ class FFMPEG extends events.EventEmitter { return; } if (! this.sentData) { - this.emit('error', { code: code, cmd: `${this.opts.ffmpegPath} ${ffmpegArgs.join(' ')}` }) + this.emit('error', { code: code, cmd: `${this.ffmpegPath} ${ffmpegArgs.join(' ')}` }) } console.log( `${this.ffmpegName} exited with code 255.` ); this.emit('close', code) diff --git a/src/services/ffmpeg-settings-service.js b/src/services/ffmpeg-settings-service.js index 6e4b149..0308488 100644 --- a/src/services/ffmpeg-settings-service.js +++ b/src/services/ffmpeg-settings-service.js @@ -4,11 +4,8 @@ const path = require('path'); const fs = require('fs'); class FfmpegSettingsService { - constructor(db, unlock) { + constructor(db) { this.db = db; - if (unlock) { - this.unlock(); - } } get() { @@ -21,13 +18,6 @@ class FfmpegSettingsService { return ffmpeg; } - unlock() { - let ffmpeg = this.getCurrentState(); - console.log("ffmpeg path UI unlocked for another day..."); - ffmpeg.ffmpegPathLockDate = new Date().getTime() + DAY_MS; - this.db['ffmpeg-settings'].update({ _id: ffmpeg._id }, ffmpeg) - } - update(attempt) { let ffmpeg = this.getCurrentState(); @@ -62,7 +52,6 @@ class FfmpegSettingsService { } reset() { - // Even if reseting, it's impossible to unlock the ffmpeg path let ffmpeg = databaseMigration.defaultFFMPEG() ; this.update(ffmpeg); return this.get(); diff --git a/src/video.js b/src/video.js index f113ab2..acea791 100644 --- a/src/video.js +++ b/src/video.js @@ -18,17 +18,18 @@ async function shutdown() { stopPlayback = true; } -function video( channelService, fillerDB, db, programmingService, activeChannelService, programPlayTimeDB ) { +function video( channelService, fillerDB, db, programmingService, activeChannelService, programPlayTimeDB, ffmpegInfo ) { var router = express.Router() - router.get('/setup', (req, res) => { + router.get('/setup', async (req, res) => { let ffmpegSettings = db['ffmpeg-settings'].find()[0] // Check if ffmpeg path is valid - if (!fs.existsSync(ffmpegSettings.ffmpegPath)) { - res.status(500).send("FFMPEG path is invalid. The file (executable) doesn't exist.") - console.error("The FFMPEG Path is invalid. Please check your configuration.") + let ffmpegPath = await ffmpegInfo.getPath(); + if (ffmpegPath == null) { + res.status(500).send("Missing FFmpeg.") return } + ffmpegSettings.ffmpegPath = ffmpegPath; console.log(`\r\nStream starting. Channel: 1 (dizqueTV)`) @@ -72,14 +73,14 @@ function video( channelService, fillerDB, db, programmingService, activeChannelS return } - let ffmpegSettings = db['ffmpeg-settings'].find()[0] - // Check if ffmpeg path is valid - if (!fs.existsSync(ffmpegSettings.ffmpegPath)) { - res.status(500).send("FFMPEG path is invalid. The file (executable) doesn't exist.") - console.error("The FFMPEG Path is invalid. Please check your configuration.") + let ffmpegSettings = db['ffmpeg-settings'].find()[0] + let ffmpegPath = await ffmpegInfo.getPath(); + if (ffmpegPath == null) { + res.status(500).send("Missing FFmpeg.") return } + ffmpegSettings.ffmpegPath = ffmpegPath; if (step == 0) { res.writeHead(200, { @@ -174,14 +175,14 @@ function video( channelService, fillerDB, db, programmingService, activeChannelS let isBetween = ( (typeof req.query.between !== 'undefined') && (req.query.between=='1') ); - let ffmpegSettings = db['ffmpeg-settings'].find()[0] - // Check if ffmpeg path is valid - if (!fs.existsSync(ffmpegSettings.ffmpegPath)) { - res.status(500).send("FFMPEG path is invalid. The file (executable) doesn't exist.") - console.error("The FFMPEG Path is invalid. Please check your configuration.") + let ffmpegSettings = db['ffmpeg-settings'].find()[0] + let ffmpegPath = await ffmpegInfo.getPath(); + if (ffmpegPath == null) { + res.status(500).send("Missing FFmpeg.") return } + ffmpegSettings.ffmpegPath = ffmpegPath; if (ffmpegSettings.disablePreludes === true) { //disable the preludes diff --git a/web/directives/ffmpeg-settings.js b/web/directives/ffmpeg-settings.js index e474097..df409b9 100644 --- a/web/directives/ffmpeg-settings.js +++ b/web/directives/ffmpeg-settings.js @@ -6,7 +6,14 @@ module.exports = function (dizquetv, resolutionOptions) { scope: { }, link: function (scope, element, attrs) { - //add validations to ffmpeg settings, speciall commas in codec name + + scope.ffmpegPathLoading = true; + scope.ffmpegPath = "" + dizquetv.getFFMpegPath().then( (fpath) => { + scope.ffmpegPath = fpath.ffmpegPath; + scope.ffmpegPathLoading = false; + }); + //add validations to ffmpeg settings, special commas in codec name dizquetv.getFfmpegSettings().then((settings) => { scope.settings = settings }) diff --git a/web/public/templates/ffmpeg-settings.html b/web/public/templates/ffmpeg-settings.html index bcaa3f7..4f0f9bf 100644 --- a/web/public/templates/ffmpeg-settings.html +++ b/web/public/templates/ffmpeg-settings.html @@ -15,40 +15,20 @@
      FFMPEG Executable Path
      -
      + +
      - - - The path to the ffmpeg executable. (e.g: /usr/bin/ffmpeg or C:\ffmpeg\bin\ffmpeg.exe) FFMPEG version 4.2+ required. Check by opening the version tab. - +
      + + + The path to the ffmpeg executable. Please check the instructions if you need to change it. - -
      -
      -
      -
      -
      - - - This will lock the ffmpeg path setting so that it is no longer editable from UI. Even if you don't toggle this option, the setting will get locked in 24 hours. -
      -
      -
      - - -
      -
      -
      -
      - - - - The ffmpeg path setting is currently locked and can't be edited from the UI. It's not usually necessary to update this path once it's known to be working. Run dizquetv with the --unlock command line argument to enable editing it again. + + dizqueTV uses FFmpeg to create video streams. Please check the instructions for info about how to set this up. -
      From 2541e4251362575a9ce201e1b702c55d0fb6f8df Mon Sep 17 00:00:00 2001 From: vexorian Date: Sun, 14 Dec 2025 23:12:57 -0400 Subject: [PATCH 11/13] Fillers can be set up to import playlists or collections from Plex automatically. Filler Service refactor. --- index.js | 10 +- src/api.js | 10 +- src/dao/filler-db.js | 58 +------ src/database-migration.js | 22 ++- src/services/filler-service.js | 150 ++++++++++++++++++ src/services/plex-proxy-service.js | 72 ++++++++- src/video.js | 4 +- web/directives/filler-config.js | 200 +++++++++++++++++++++++- web/public/templates/filler-config.html | 52 +++++- web/services/dizquetv.js | 7 +- 10 files changed, 501 insertions(+), 84 deletions(-) create mode 100644 src/services/filler-service.js diff --git a/index.js b/index.js index 390c6e9..fab64c3 100644 --- a/index.js +++ b/index.js @@ -17,6 +17,7 @@ const HDHR = require('./src/hdhr') const FileCacheService = require('./src/services/file-cache-service'); const CacheImageService = require('./src/services/cache-image-service'); const ChannelService = require("./src/services/channel-service"); +const FillerService = require("./src/services/filler-service"); const xmltv = require('./src/xmltv') const Plex = require('./src/plex'); @@ -104,7 +105,7 @@ initDB(db, channelDB) channelService = new ChannelService(channelDB); -fillerDB = new FillerDB( path.join(process.env.DATABASE, 'filler') , channelService ); +let fillerDB = new FillerDB( path.join(process.env.DATABASE, 'filler') ); customShowDB = new CustomShowDB( path.join(process.env.DATABASE, 'custom-shows') ); let programPlayTimeDB = new ProgramPlayTimeDB( path.join(process.env.DATABASE, 'play-cache') ); let ffmpegSettingsService = new FfmpegSettingsService(db); @@ -134,6 +135,9 @@ activeChannelService = new ActiveChannelService(onDemandService, channelService) eventService = new EventService(); +let fillerService = new FillerService(fillerDB, plexProxyService, + channelService); + i18next .use(i18nextBackend) .use(i18nextMiddleware.LanguageDetector) @@ -323,12 +327,12 @@ app.use('/favicon.svg', express.static( app.use('/custom.css', express.static(path.join(process.env.DATABASE, 'custom.css'))) // API Routers -app.use(api.router(db, channelService, fillerDB, customShowDB, xmltvInterval, guideService, m3uService, eventService, ffmpegSettingsService, plexServerDB, plexProxyService, ffmpegInfo)) +app.use(api.router(db, channelService, fillerDB, customShowDB, xmltvInterval, guideService, m3uService, eventService, ffmpegSettingsService, plexServerDB, plexProxyService, ffmpegInfo, fillerService)) app.use('/api/cache/images', cacheImageService.apiRouters()) app.use('/' + fontAwesome, express.static(path.join(process.env.DATABASE, fontAwesome))) app.use('/' + bootstrap, express.static(path.join(process.env.DATABASE, bootstrap))) -app.use(video.router( channelService, fillerDB, db, programmingService, activeChannelService, programPlayTimeDB, ffmpegInfo )) +app.use(video.router( channelService, fillerService, db, programmingService, activeChannelService, programPlayTimeDB, ffmpegInfo )) app.use(hdhr.router) app.listen(process.env.PORT, () => { console.log(`HTTP server running on port: http://*:${process.env.PORT}`) diff --git a/src/api.js b/src/api.js index 3e5cba9..bb4c72d 100644 --- a/src/api.js +++ b/src/api.js @@ -22,7 +22,7 @@ function safeString(object) { } module.exports = { router: api } -function api(db, channelService, fillerDB, customShowDB, xmltvInterval, guideService, _m3uService, eventService, ffmpegSettingsService, plexServerDB, plexProxyService, ffmpegInfo ) { +function api(db, channelService, fillerDB, customShowDB, xmltvInterval, guideService, _m3uService, eventService, ffmpegSettingsService, plexServerDB, plexProxyService, ffmpegInfo, fillerService ) { let m3uService = _m3uService; const router = express.Router() @@ -419,7 +419,7 @@ function api(db, channelService, fillerDB, customShowDB, xmltvInterval, guideSe if (typeof(id) === 'undefined') { return res.status(400).send("Missing id"); } - await fillerDB.saveFiller(id, req.body ); + await fillerService.saveFiller(id, req.body ); return res.status(204).send({}); } catch(err) { console.error(err); @@ -428,7 +428,7 @@ function api(db, channelService, fillerDB, customShowDB, xmltvInterval, guideSe }) router.put('/api/filler', async (req, res) => { try { - let uuid = await fillerDB.createFiller(req.body ); + let uuid = await fillerService.createFiller(req.body ); return res.status(201).send({id: uuid}); } catch(err) { console.error(err); @@ -441,7 +441,7 @@ function api(db, channelService, fillerDB, customShowDB, xmltvInterval, guideSe if (typeof(id) === 'undefined') { return res.status(400).send("Missing id"); } - await fillerDB.deleteFiller(id); + await fillerService.deleteFiller(id); return res.status(204).send({}); } catch(err) { console.error(err); @@ -455,7 +455,7 @@ function api(db, channelService, fillerDB, customShowDB, xmltvInterval, guideSe if (typeof(id) === 'undefined') { return res.status(400).send("Missing id"); } - let channels = await fillerDB.getFillerChannels(id); + let channels = await fillerService.getFillerChannels(id); if (channels == null) { return res.status(404).send("Filler not found"); } diff --git a/src/dao/filler-db.js b/src/dao/filler-db.js index 0718ceb..9bd3d0b 100644 --- a/src/dao/filler-db.js +++ b/src/dao/filler-db.js @@ -4,12 +4,9 @@ let fs = require('fs'); class FillerDB { - constructor(folder, channelService) { + constructor(folder) { this.folder = folder; this.cache = {}; - this.channelService = channelService; - - } async $loadFiller(id) { @@ -77,40 +74,8 @@ class FillerDB { return id; } - async getFillerChannels(id) { - let numbers = await this.channelService.getAllChannelNumbers(); - let channels = []; - await Promise.all( numbers.map( async(number) => { - let ch = await this.channelService.getChannel(number); - let name = ch.name; - let fillerCollections = ch.fillerCollections; - for (let i = 0 ; i < fillerCollections.length; i++) { - if (fillerCollections[i].id === id) { - channels.push( { - number: number, - name : name, - } ); - break; - } - } - ch = null; - - } ) ); - return channels; - } - async deleteFiller(id) { try { - let channels = await this.getFillerChannels(id); - await Promise.all( channels.map( async(channel) => { - console.log(`Updating channel ${channel.number} , remove filler: ${id}`); - let json = await channelService.getChannel(channel.number); - json.fillerCollections = json.fillerCollections.filter( (col) => { - return col.id != id; - } ); - await this.channelService.saveChannel( channel.number, json ); - } ) ); - let f = path.join(this.folder, `${id}.json` ); await new Promise( (resolve, reject) => { fs.unlink(f, function (err) { @@ -162,27 +127,6 @@ class FillerDB { } ); } - async getFillersFromChannel(channel) { - - let loadChannelFiller = async(fillerEntry) => { - let content = []; - try { - let filler = await this.getFiller(fillerEntry.id); - content = filler.content; - } catch(e) { - console.error(`Channel #${channel.number} - ${channel.name} references an unattainable filler id: ${fillerEntry.id}`); - } - return { - id: fillerEntry.id, - content: content, - weight: fillerEntry.weight, - cooldown: fillerEntry.cooldown, - } - }; - return await Promise.all( - channel.fillerCollections.map(loadChannelFiller) - ); - } } diff --git a/src/database-migration.js b/src/database-migration.js index a5e5771..3059081 100644 --- a/src/database-migration.js +++ b/src/database-migration.js @@ -20,7 +20,7 @@ const path = require('path'); var fs = require('fs'); -const TARGET_VERSION = 900; +const TARGET_VERSION = 1000; const STEPS = [ // [v, v2, x] : if the current version is v, call x(db), and version becomes v2 @@ -46,6 +46,7 @@ const STEPS = [ [ 803, 900, (db) => fixFFMpegPathSetting(db) ], [ 804, 900, (db) => fixFFMpegPathSetting(db) ], [ 805, 900, (db) => fixFFMpegPathSetting(db) ], + [ 900, 1000, () => fixFillerModes() ], ] const { v4: uuidv4 } = require('uuid'); @@ -679,6 +680,25 @@ function extractFillersFromChannels() { } +function fixFillerModes() { + console.log("Fixing filler modes..."); + let fillers = path.join(process.env.DATABASE, 'filler'); + let fillerFiles = fs.readdirSync(fillers); + + for (let i = 0; i < fillerFiles.length; i++) { + if (path.extname( fillerFiles[i] ) === '.json') { + console.log("Migrating filler : " + fillerFiles[i] +"..." ); + let fillerPath = path.join(fillers, fillerFiles[i]); + let filler = JSON.parse(fs.readFileSync(fillerPath, 'utf-8')); + if ( typeof(filler.mode) !== "string" ) { + filler.mode = "custom"; + } + fs.writeFileSync( fillerPath, JSON.stringify(filler), 'utf-8'); + } + } + console.log("Done fixing filler modes."); +} + function addFPS(db) { let ffmpegSettings = db['ffmpeg-settings'].find()[0]; let f = path.join(process.env.DATABASE, 'ffmpeg-settings.json'); diff --git a/src/services/filler-service.js b/src/services/filler-service.js new file mode 100644 index 0000000..e715fa0 --- /dev/null +++ b/src/services/filler-service.js @@ -0,0 +1,150 @@ +const events = require('events') + +const FILLER_UPDATE = 30 * 60 * 1000; //30 minutes might be too aggressive +//this will be configurable one day. + +class FillerService extends events.EventEmitter { + + constructor(fillerDB, plexProxyService, channelService) { + super(); + this.fillerDB = fillerDB; + this.plexProxyService = plexProxyService; + this.channelService = channelService; + } + + async saveFiller(id, body) { + body = await this.prework(body); + return this.fillerDB.saveFiller(id, body); + } + + async createFiller(body) { + body = await this.prework(body); + return this.fillerDB.createFiller(body); + } + + async getFillerChannels(id) { + let numbers = await this.channelService.getAllChannelNumbers(); + let channels = []; + await Promise.all( numbers.map( async(number) => { + let ch = await this.channelService.getChannel(number); + let name = ch.name; + let fillerCollections = ch.fillerCollections; + for (let i = 0 ; i < fillerCollections.length; i++) { + if (fillerCollections[i].id === id) { + channels.push( { + number: number, + name : name, + } ); + break; + } + } + ch = null; + + } ) ); + return channels; + } + + async deleteFiller(id) { + try { + let channels = await this.getFillerChannels(id); + await Promise.all( channels.map( async(channel) => { + console.log(`Updating channel ${channel.number} , remove filler: ${id}`); + let json = await channelService.getChannel(channel.number); + json.fillerCollections = json.fillerCollections.filter( (col) => { + return col.id != id; + } ); + await this.channelService.saveChannel( channel.number, json ); + } ) ); + } finally { + await this.fillerDB.deleteFiller(id); + } + } + + async prework(body) { + if (body.mode === "import") { + body.content = await this.getContents(body); + body.import.lastRefreshTime = new Date().getTime(); + } else { + delete body.import; + } + return body; + } + + async getContents(body) { + let serverKey = body.import.serverName; + let key = body.import.key; + let content = await this.plexProxyService.getKeyMediaContents(serverKey, key); + console.log(JSON.stringify(content)); + return content; + } + + async getFillersFromChannel(channel) { + + let loadChannelFiller = async(fillerEntry) => { + let content = []; + try { + let filler = await this.fillerDB.getFiller(fillerEntry.id); + await this.fillerUsageWatcher(fillerEntry.id, filler); + content = filler.content; + } catch(e) { + console.error(`Channel #${channel.number} - ${channel.name} references an unattainable filler id: ${fillerEntry.id}`, e); + } + return { + id: fillerEntry.id, + content: content, + weight: fillerEntry.weight, + cooldown: fillerEntry.cooldown, + } + }; + return await Promise.all( + channel.fillerCollections.map(loadChannelFiller) + ); + } + + async fillerUsageWatcher(id, filler) { + if (filler.mode === "import") { + //I need to upgrade nodejs version ASAP + let lastTime = 0; + if ( + (typeof(filler.import) !== "undefined") + && + !isNaN(filler.import.lastRefreshTime) + ) { + lastTime = filler.import.lastRefreshTime; + } + let t = new Date().getTime(); + if ( t - lastTime >= FILLER_UPDATE) { + //time to do an update. + if ( (typeof(filler.content) === "undefined") + || (filler.content.length == 0) + ) { + //It should probably be an sync update... + await this.refreshFiller(id); + } else { + this.refreshFiller(id); + } + } + } + } + + async refreshFiller(id) { + let t0 = new Date().getTime(); + console.log(`Refreshing filler with id=${id}`); + try { + let filler = await this.fillerDB.getFiller(id); + await this.saveFiller(id, filler); + } catch (err) { + console.log(`Unable to update filler: ${id}`, err); + } finally { + let t1 = new Date().getTime(); + console.log(`Refreshed filler with id=${id} in ${t1-t0}ms`); + } + } + + +} + + + + +module.exports = FillerService \ No newline at end of file diff --git a/src/services/plex-proxy-service.js b/src/services/plex-proxy-service.js index 8a14ba1..7ef9f21 100644 --- a/src/services/plex-proxy-service.js +++ b/src/services/plex-proxy-service.js @@ -9,22 +9,86 @@ class PlexProxyService extends events.EventEmitter { } async get(serverName64, path) { - let plexServer = await getPlexServer(this.plexServerDB, serverName64); + let plexServer = await getPlexServer64(this.plexServerDB, serverName64); + // A potential area of improvement is to reuse the client when possible let client = new Plex(plexServer); return { MediaContainer: await client.Get("/" + path) }; } + + async getKeyMediaContents(serverName, key) { + let plexServer = await getPlexServer(this.plexServerDB, serverName); + let client = new Plex(plexServer); + let obj = { MediaContainer: await client.Get(key) }; + let metadata = obj.MediaContainer.Metadata; + if ( typeof(metadata) !== "object") { + return []; + } + metadata = metadata.map( (item) => fillerMapper(serverName, item) ); + + return metadata; + } } +function fillerMapper(serverName, plexMetadata) { + let image = {}; + if ( (typeof(plexMetadata.Image) === "object") + && (typeof(plexMetadata.Image[0]) === "object") + ) { + image = plexMetadata.Image[0]; + } + + let media = {}; + if ( (typeof(plexMetadata.Media) === "object") + && (typeof(plexMetadata.Media[0]) === "object") + ) { + media = plexMetadata.Media[0]; + } -async function getPlexServer(plexServerDB, serverName64) { - let serverKey = Buffer.from(serverName64, 'base64').toString('utf-8'); + let part = {}; + if ( (typeof(media.Part) === "object") + && (typeof(media.Part[0]) === "object") + ) { + part = media.Part[0]; + } + + + return { + title : plexMetadata.title, + key : plexMetadata.key, + ratingKey: plexMetadata.ratingKey, + icon : image.url, + type : plexMetadata.type, + duration : part.duration, + durationStr : undefined, + summary : "", + date : "", + year : plexMetadata.year, + plexFile : part.key, + file : part.file, + showTitle: plexMetadata.title, + episode : 1, + season : 1, + serverKey: serverName, + commercials: [], + } +} + +async function getPlexServer(plexServerDB, serverKey) { let server = await plexServerDB.getPlexServerByName(serverKey); if (server == null) { throw Error("server not found"); } return server; - } + + +async function getPlexServer64(plexServerDB, serverName64) { + let serverKey = Buffer.from(serverName64, 'base64').toString('utf-8'); + return await getPlexServer(plexServerDB, serverKey); +} + + + module.exports = PlexProxyService \ No newline at end of file diff --git a/src/video.js b/src/video.js index acea791..512004b 100644 --- a/src/video.js +++ b/src/video.js @@ -18,7 +18,7 @@ async function shutdown() { stopPlayback = true; } -function video( channelService, fillerDB, db, programmingService, activeChannelService, programPlayTimeDB, ffmpegInfo ) { +function video( channelService, fillerService, db, programmingService, activeChannelService, programPlayTimeDB, ffmpegInfo ) { var router = express.Router() router.get('/setup', async (req, res) => { @@ -304,7 +304,7 @@ function video( channelService, fillerDB, db, programmingService, activeChannelS if ( (prog == null) || (typeof(prog) === 'undefined') || (prog.program == null) || (typeof(prog.program) == "undefined") ) { throw "No video to play, this means there's a serious unexpected bug or the channel db is corrupted." } - let fillers = await fillerDB.getFillersFromChannel(brandChannel); + let fillers = await fillerService.getFillersFromChannel(brandChannel); try { let lineup = helperFuncs.createLineup(programPlayTimeDB, prog, brandChannel, fillers, isFirst) lineupItem = lineup.shift(); diff --git a/web/directives/filler-config.js b/web/directives/filler-config.js index 56cf2e3..f775eee 100644 --- a/web/directives/filler-config.js +++ b/web/directives/filler-config.js @@ -1,4 +1,4 @@ -module.exports = function ($timeout, commonProgramTools, getShowData) { +module.exports = function ($timeout, dizquetv, commonProgramTools, getShowData) { return { restrict: 'E', templateUrl: 'templates/filler-config.html', @@ -13,6 +13,16 @@ module.exports = function ($timeout, commonProgramTools, getShowData) { scope.content = []; scope.visible = false; scope.error = undefined; + scope.modes = [ { + name: "import", + description: "Collection/Playlist from Plex", + }, { + name: "custom", + description: "Custom List of Clips", + } ]; + scope.servers = []; + scope.libraries = []; + scope.sources = []; function refreshContentIndexes() { for (let i = 0; i < scope.content.length; i++) { @@ -47,20 +57,173 @@ module.exports = function ($timeout, commonProgramTools, getShowData) { console.log("movedFunction(" + index + ")"); } + scope.serverChanged = async () => { + if (scope.server === "") { + scope.libraryKey = ""; + return; + } + scope.loadingLibraries = true; + try { + let libraries = (await dizquetv.getFromPlexProxy(scope.server, "/library/sections")).Directory; + if ( typeof(libraries) === "undefined") { + libraries = [] + } + let officialLibraries = libraries.map( (library) => { + return { + "key" : library.key, + "description" : library.title, + } + } ); + + let defaultLibrary = { + "key": "", + "description" : "Select a Library...", + } + let playlists = [ + { + "key": "$PLAYLISTS", + "description" : "Playlists", + } + ]; + let combined = officialLibraries.concat(playlists); + if (! combined.some( (library) => library.key === scope.libraryKey) ) { + scope.libraryKey = ""; + scope.libraries = [defaultLibrary].concat(combined); + } else { + scope.libraries = combined; + } + } catch (err) { + scope.libraries = [ { name: "", description: "Unable to load libraries"} ]; + scope.libraryKey = "" + throw err; + } finally { + scope.loadingLibraries = false; + $timeout( () => {}, 0); + } + } - scope.linker( (filler) => { + scope.libraryChanged = async () => { + if (scope.libraryKey == null) { + throw Error(`null libraryKey? ${scope.libraryKey} ${new Date().getTime()} `); + } + if (scope.libraryKey === "") { + scope.sourceKey = ""; + return; + } + scope.loadingCollections = true; + try { + let collections; + if (scope.libraryKey === "$PLAYLISTS") { + collections = (await dizquetv.getFromPlexProxy(scope.server, `/playlists`)).Metadata; + } else { + collections = (await dizquetv.getFromPlexProxy(scope.server, `/library/sections/${scope.libraryKey}/collections`)); + collections = collections.Metadata + } + if (typeof(collections) === "undefined") { + //when the library has no collections it returns size=0 + //and no array + collections = []; + } + let officialCollections = collections.map( (col) => { + return { + "key" : col.key, + "description" : col.title, + } + } ); + let defaultSource = { + "key": "", + "description" : "Select a Source...", + }; + if (officialCollections.length == 0) { + defaultSource = { + "key": "", + "description" : "(No collections/lists found)", + } + } + if (! officialCollections.some( (col) => col.key === scope.sourceKey ) ) { + scope.sourceKey = ""; + scope.sources = [defaultSource].concat(officialCollections); + } else { + scope.sources = officialCollections; + } + } catch (err) { + scope.sources = [ { name: "", description: "Unable to load collections"} ]; + scope.sourceKey = ""; + throw err; + } finally { + scope.loadingCollections = false; + $timeout( () => {}, 0); + } + } + + let reloadServers = async() => { + scope.loadingServers = true; + try { + let servers = await dizquetv.getPlexServers(); + scope.servers = servers.map( (s) => { + return { + "name" : s.name, + "description" : `Plex - ${s.name}`, + } + } ); + let defaultServer = { + name: "", + description: "Select a Plex server..." + }; + if (! scope.servers.some( (server) => server.name === scope.server) ) { + scope.server = ""; + scope.servers = [defaultServer].concat(scope.servers); + } + } catch (err) { + scope.server = ""; + scope.servers = [ {name:"", description:"Could not load servers"} ]; + throw err; + } finally { + scope.loadingServers = false; + $timeout( () => {}, 0); + } + + await scope.serverChanged(); + await scope.libraryChanged(); + + }; + + + + + scope.linker( async (filler) => { + if ( typeof(filler) === 'undefined') { scope.name = ""; scope.content = []; scope.id = undefined; scope.title = "Create Filler List"; + scope.mode = "import"; + scope.server = ""; + scope.libraryKey = ""; + scope.sourceKey = ""; } else { scope.name = filler.name; scope.content = filler.content; scope.id = filler.id; scope.title = "Edit Filler List"; + scope.mode = filler.mode; + scope.server = filler?.import?.serverName; + if ( typeof(scope.server) !== "string" ) { + scope.server = ""; + } + scope.libraryKey = filler?.import?.meta?.libraryKey; + if ( typeof(scope.libraryKey) !== "string" ) { + scope.libraryKey = ""; + } + scope.sourceKey = filler?.import?.key; + if ( typeof(scope.sourceKey) !== "string" ) { + scope.sourceKey = ""; + } } + await reloadServers(); + scope.source = ""; refreshContentIndexes(); scope.visible = true; } ); @@ -73,8 +236,17 @@ module.exports = function ($timeout, commonProgramTools, getShowData) { if ( (typeof(scope.name) === 'undefined') || (scope.name.length == 0) ) { scope.error = "Please enter a name"; } - if ( scope.content.length == 0) { - scope.error = "Please add at least one clip."; + if ( scope?.mode === "import" ) { + if ( (typeof(scope?.server) !== "string" ) || (scope?.server === "") ) { + scope.error = "Please select a server" + } + if ( (typeof(scope?.source) !== "string" ) && (scope?.source === "") ) { + scope.error = "Please select a source." + } + } else { + if ( scope.content.length == 0) { + scope.error = "Please add at least one clip."; + } } if (typeof(scope.error) !== 'undefined') { $timeout( () => { @@ -83,14 +255,30 @@ module.exports = function ($timeout, commonProgramTools, getShowData) { return; } scope.visible = false; - scope.onDone( { + let object = { name: scope.name, content: scope.content.map( (c) => { delete c.$index return c; } ), id: scope.id, - } ); + mode: scope.mode, + + }; + if (object.mode === "import") { + object.content = []; + //In reality dizqueTV only needs to know the server name + //and the source key, the meta object is for extra data + //that is useful for external things like this UI. + object.import = { + serverName : scope.server, + key: scope.sourceKey, + meta: { + libraryKey : scope.libraryKey, + } + } + } + scope.onDone( object ); } scope.getText = (clip) => { let show = getShowData(clip); diff --git a/web/public/templates/filler-config.html b/web/public/templates/filler-config.html index 8724e10..21b1713 100644 --- a/web/public/templates/filler-config.html +++ b/web/public/templates/filler-config.html @@ -11,8 +11,52 @@
      + +
      Mode:
      +
      - + +
      +
      + + +
      + +
      +
      + + +
      + +
      +
      + + +
      + +
      +
      + +
      Clips
      @@ -65,10 +109,11 @@

      Click the to import filler content from your Plex server(s).

      +
      -
      -
      diff --git a/web/services/dizquetv.js b/web/services/dizquetv.js index 396ece5..c2d1352 100644 --- a/web/services/dizquetv.js +++ b/web/services/dizquetv.js @@ -3,8 +3,8 @@ module.exports = function ($http, $q) { getVersion: () => { return $http.get('/api/version').then((d) => { return d.data }) }, - getPlexServers: () => { - return $http.get('/api/plex-servers').then((d) => { return d.data }) + getPlexServers: async () => { + return (await $http.get('/api/plex-servers')).data; }, addPlexServer: (plexServer) => { return $http({ @@ -96,6 +96,9 @@ module.exports = function ($http, $q) { headers: { 'Content-Type': 'application/json; charset=utf-8' } }).then((d) => { return d.data }) }, + getFFMpegPath: () => { + return $http.get('/api/ffmpeg-info').then((d) => { return d.data }) + }, getXmltvSettings: () => { return $http.get('/api/xmltv-settings').then((d) => { return d.data }) }, From 647c401370223c2405da6c449a1785507ed7e253 Mon Sep 17 00:00:00 2001 From: vexorian Date: Mon, 15 Dec 2025 00:32:22 -0400 Subject: [PATCH 12/13] Apparently animated watermarks were getting constantly downloaded by ffmpeg. This hopefully prevents this a bit. --- index.js | 3 +++ src/ffmpeg.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index fab64c3..7e92b24 100644 --- a/index.js +++ b/index.js @@ -271,6 +271,9 @@ const responseInterceptor = ( const originalSend = res.send; let responseSent = false; console.log(`${req.method} ${req.url} ...`); + if (req.method === "GET" && req.url.includes("images/uploads") ) { + res.setHeader("Cache-Control", "public, max-age=86400"); + } res.send = function (body) { diff --git a/src/ffmpeg.js b/src/ffmpeg.js index 08b43b0..7c5c3df 100644 --- a/src/ffmpeg.js +++ b/src/ffmpeg.js @@ -322,7 +322,7 @@ class FFMPEG extends events.EventEmitter { if (watermark.animated === true) { ffmpegArgs.push('-ignore_loop', '0'); } - ffmpegArgs.push(`-i`, `${watermark.url}` ); + ffmpegArgs.push(`-i`, `async:cache:${watermark.url}` ); overlayFile = inputFiles++; this.ensureResolution = true; } From 9b5fef01b0e2e3f99d85fafe188c0431c434b6ef Mon Sep 17 00:00:00 2001 From: vexorian Date: Mon, 15 Dec 2025 00:38:07 -0400 Subject: [PATCH 13/13] 1.7.0 --- README.md | 2 +- src/constants.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3d3d1df..0a38998 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# dizqueTV 1.7.0-development +# dizqueTV 1.7.0 ![Discord](https://img.shields.io/discord/711313431457693727?logo=discord&logoColor=fff&style=flat-square) ![GitHub top language](https://img.shields.io/github/languages/top/vexorian/dizquetv?logo=github&style=flat-square) ![Docker Pulls](https://img.shields.io/docker/pulls/vexorian/dizquetv?logo=docker&logoColor=fff&style=flat-square) Create live TV channel streams from media on your Plex servers. diff --git a/src/constants.js b/src/constants.js index c1c919c..33e061c 100644 --- a/src/constants.js +++ b/src/constants.js @@ -35,5 +35,5 @@ module.exports = { // staying active, it checks every 5 seconds PLAYED_MONITOR_CHECK_FREQUENCY: 5*1000, - VERSION_NAME: "1.7.0-development" + VERSION_NAME: "1.7.0" }