neoris/dizquetv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #178 from vexorian/20201030_dev

Browse Source 
20201030 dev
This commit is contained in:
vexorian 2020-10-30 01:10:31 -04:00 committed by GitHub
commit 27c06f5ea0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dizquetv-nvidia.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<Container version="2">
<Name>dizquetv</Name>
<Repository>vexorian/dizquetv:latest</Repository>
<Repository>vexorian/dizquetv:latest-nvidia</Repository>
<Registry>https://hub.docker.com/r/vexorian/dizquetv</Registry>
<Network>host</Network>
<MyIP/>

37
src/tv-guide-service.js
View File

@ -113,6 +113,7 @@ class TVGuideService
let playing = {};
if (
(typeof(previousKnown) !== 'undefined')
&& (previousKnown.index !== -1)
&& (previousKnown.program.duration == channel.programs[previousKnown.index].duration )
&& (previousKnown.start + previousKnown.program.duration == t)
) {
@ -126,6 +127,17 @@ class TVGuideService
} else {
playing = await this.getCurrentPlayingIndex(channel, t);
}
if ( (playing.program == null) || (typeof(playing) === 'undefined') ) {
console.log("There is a weird issue with the TV guide generation. A placeholder program is placed to prevent further issues. Please report this.");
playing = {
index: -1,
program: {
isOffline: true,
duration: 30*60*1000,
},
start: t
}
}
if ( playing.program.isOffline && playing.program.type === 'redirect') {
let ch2 = playing.program.channel;
@ -189,13 +201,15 @@ class TVGuideService
) {
y.program.duration -= melded;
programs[ programs.length - 1] = y;
programs.push( {
start: y.start + y.program.duration,
program: {
isOffline : true,
duration: melded,
},
} );
if (y.start + y.program.duration < t1) {
programs.push( {
start: y.start + y.program.duration,
program: {
isOffline : true,
duration: melded,
},
} );
}
melded = 0;
} else {
programs[ programs.length - 1] = y;
@ -216,7 +230,14 @@ class TVGuideService
};
while (x.start < t1) {
await push(x);
x = await this.getChannelPlaying(channel, x, x.start + x.program.duration);
let t2 = x.start + x.program.duration;
x = await this.getChannelPlaying(channel, x, t2);
if (x.start < t2) {
let d = t2 - x.start;
x.start = t2;
x.program = clone(x.program);
x.program.duration -= d;
}
if (x.program.duration == 0) throw Error("D");
}
result.programs = [];