From 43bf85db2053d333baf59100e014702956ab71ae Mon Sep 17 00:00:00 2001
From: vexorian <vexorian@gmail.com>
Date: Wed, 23 Sep 2020 18:38:56 -0400
Subject: [PATCH] Fix #69 (nice?) Hopefully for good this time. It was already
 very difficult to create an infinite cache loop. Now even if the worst
 happens, it might repeat the last few seconds of a video once but nothing
 more.

---
 src/channel-cache.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/channel-cache.js b/src/channel-cache.js
index 681e99a..a0459f2 100644
--- a/src/channel-cache.js
+++ b/src/channel-cache.js
@@ -31,10 +31,21 @@ function getCurrentLineupItem(channelId, t1) {
     let recorded = cache[channelId];
     let lineupItem =  JSON.parse( JSON.stringify(recorded.lineupItem) );
     let diff = t1 - recorded.t0;
-    if ( (diff <= SLACK) && (lineupItem.duration >= 2*SLACK) ) {
+    let rem = lineupItem.duration - lineupItem.start;
+    if (typeof(lineupItem.streamDuration) !== 'undefined') {
+        rem = Math.min(rem, lineupItem.streamDuration);
+    }
+    if ( (diff <= SLACK) && (diff + SLACK < rem) ) {
         //closed the stream and opened it again let's not lose seconds for
         //no reason
-        return lineupItem;
+        let originalT0 = recorded.lineupItem.originalT0;
+        if (typeof(originalT0) === 'undefined') {
+            originalT0 = recorded.t0;
+        }
+        if (t1 - originalT0 <= SLACK) {
+            lineupItem.originalT0 = originalT0;
+            return lineupItem;
+        }
     }
    
     lineupItem.start += diff;