From d0972738594a0f702ba912479834bc38e76e688d Mon Sep 17 00:00:00 2001
From: Thulinma <jaron@vietors.com>
Date: Thu, 30 Mar 2023 02:20:23 +0200
Subject: [PATCH] Fixes to downloader range requests, improvements to input
 bufferFrame code

---
 lib/downloader.cpp  | 11 ++++++++++-
 src/input/input.cpp | 21 +++++++++++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/lib/downloader.cpp b/lib/downloader.cpp
index 6bfa1232..0c44dde8 100644
--- a/lib/downloader.cpp
+++ b/lib/downloader.cpp
@@ -270,8 +270,17 @@ namespace HTTP{
     }else{
       sprintf(tmp, "bytes=%zu-%zu", byteStart, byteEnd - 1);
     }
+    extraHeaders.erase("Range");
     setHeader("Range", tmp);
-    return getNonBlocking(link, 6);
+    if (!canRequest(link)){return false;}
+    nbLink = link;
+    nbMaxRecursiveDepth = 6;
+    nbLoop = retryCount + 1; // max 5 attempts
+    isComplete = false;
+    doRequest(nbLink);
+    nbReqTime = Util::bootSecs();
+    nbLastOff = getSocket().dataDown();
+    return true;
   }
 
   bool Downloader::getRange(const HTTP::URL &link, size_t byteStart, size_t byteEnd, Util::DataCallback &cb){
diff --git a/src/input/input.cpp b/src/input/input.cpp
index e56b4633..03f82798 100644
--- a/src/input/input.cpp
+++ b/src/input/input.cpp
@@ -1526,7 +1526,15 @@ namespace Mist{
           size_t dataLen;
           thisPacket.getString("data", data, dataLen);
           if (dataLen != parts.getSize(partNo)){
-            INFO_MSG("Part %zu (@%" PRIu64 ") size mismatch: %zu (actual) != %zu (expected)", partNo, thisTime, dataLen, parts.getSize(partNo));
+            if (partNo && dataLen == parts.getSize(partNo-1)){
+              FAIL_MSG("Part size for part %zu (%" PRIu64 "ms) matches part before it, instead. Aborting page load!", partNo, thisTime);
+              break;
+            }else if (dataLen == parts.getSize(partNo+1)){
+              FAIL_MSG("Part size for part %zu (%" PRIu64 "ms) matches part after it, instead. Aborting page load!", partNo, thisTime);
+              break;
+            }else{
+              INFO_MSG("Part %zu (@%" PRIu64 ") size mismatch: %zu (actual) != %zu (expected)", partNo, thisTime, dataLen, parts.getSize(partNo));
+            }
           }
           ++partNo;
           HIGH_MSG("Buffering VoD packet (%zuB) @%" PRIu64 " ms on track %zu with offset %" PRIu64, dataLen, thisTime, idx, thisPacket.getInt("offset"));
@@ -1559,15 +1567,16 @@ namespace Mist{
     bufferFinalize(idx, page);
     bufferTimer = Util::bootMS() - bufferTimer;
     if (packCounter != tPages.getInt("parts", pageIdx)){
-      FAIL_MSG("Track %zu, page %" PRIu32 " (%" PRIu64 " - %" PRIu64 " ms) NOT FULLY buffered in %" PRIu64 "ms",
-               idx, pageNumber, tPages.getInt("firsttime", pageIdx), thisTime, bufferTimer);
+      FAIL_MSG("Track %zu, page %" PRIu32 " (" PRETTY_PRINT_MSTIME " - " PRETTY_PRINT_MSTIME ") NOT FULLY buffered in %" PRIu64 "ms - erasing for later retry",
+               idx, pageNumber, PRETTY_ARG_MSTIME(tPages.getInt("firsttime", pageIdx)), PRETTY_ARG_MSTIME(thisTime), bufferTimer);
       INFO_MSG("  (%" PRIu32 "/%" PRIu64 " parts, %" PRIu64 " bytes)", packCounter,
                tPages.getInt("parts", pageIdx), byteCounter);
-      pageCounter[idx][pageNumber] = Util::bootSecs();
+      pageCounter[idx].erase(pageNumber);
+      bufferRemove(idx, pageNumber);
       return false;
     }else{
-      INFO_MSG("Track %zu, page %" PRIu32 " (%" PRIu64 " - %" PRIu64 " ms) buffered in %" PRIu64 "ms",
-               idx, pageNumber, tPages.getInt("firsttime", pageIdx), thisTime, bufferTimer);
+      INFO_MSG("Track %zu, page %" PRIu32 " (" PRETTY_PRINT_MSTIME " - " PRETTY_PRINT_MSTIME ") buffered in %" PRIu64 "ms",
+               idx, pageNumber, PRETTY_ARG_MSTIME(tPages.getInt("firsttime", pageIdx)), PRETTY_ARG_MSTIME(thisTime), bufferTimer);
       INFO_MSG("  (%" PRIu32 "/%" PRIu64 " parts, %" PRIu64 " bytes)", packCounter,
                tPages.getInt("parts", pageIdx), byteCounter);
       pageCounter[idx][pageNumber] = Util::bootSecs();