recordings with streamdev

a-mair · Mar 29, 2024 · 7cbf8bb · 7cbf8bb
1 parent 6615038
commit 7cbf8bb
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 13 deletions.
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
@@ -410,6 +410,34 @@ if (LiveSetup().GetUseStreamdev() && LiveFeatures<features::streamdev_server>().
 </%cpp>
 </%def>
 
+<# ---------------------------------------------------------------------- #>
+<# stream_recording: marked for deletion #>
+
+<%def stream_recording>
+<%args>
+	std::string recid;
+	std::string linkText;
+</%args>
+<%cpp>
+#if TNT_WATCHDOG_SILENCE
+{
+const cRecording* recording = nullptr;
+if (!recid.empty()) recording = LiveRecordingsManager()->GetByMd5Hash(recid);
+cToSvConcat rfid;
+if (recording) {
+  struct stat st;
+	if (stat(recording->FileName(), &st) == 0)
+		rfid.appendFormated("%lu:%llu.rec", (unsigned long) st.st_dev, (unsigned long long) st.st_ino);
+}
+if (!rfid.empty() ) {
+</%cpp><a href="http://localhost:<$cToSvConcat(LiveSetup().GetStreamdevPort())$>/<$rfid$>.ts"><img src="<$ LiveSetup().GetThemedLink("img", "playlist.png") $>" alt="" <& tooltip.hint text=(tr("Stream this recording.")) &> /> <$ linkText $></a>
+<%cpp>
+}
+}
+#endif
+</%cpp>
+</%def>
+
 <# ---------------------------------------------------------------------- #>
 
 <%def event_timer>

diff --git a/pages/playlist.ecpp b/pages/playlist.ecpp
@@ -3,6 +3,7 @@
 #include <setup.h>
 #include <tools.h>
 #include <users.h>
+#include <recman.h>
 
 using namespace vdrlive;
 
@@ -44,7 +45,20 @@ using namespace vdrlive;
 		videourl = concat("#EXTM3U\n#EXTINF:-1,", channelname, "\nhttp://", server, ":", cToSvInt(streamdevPort), "/", LiveSetup().GetStreamdevType(), "/", *Channel->GetChannelID().ToString());
 	}
 	else {
-		videourl = concat("#EXTM3U\n#EXTINF:-1\nhttp://", server, ":", cToSvInt(LiveSetup().GetServerPort()), "/recstream.html?recid=", recid);
+    cToSvConcat rfid;
+    if (LiveSetup().GetUseStreamdev() ) {
+      const cRecording* recording = LiveRecordingsManager()->GetByMd5Hash(recid);
+      if (recording) {
+        struct stat st;
+        if (stat(recording->FileName(), &st) == 0)
+          rfid.appendFormated("%lu:%llu.rec", (unsigned long) st.st_dev, (unsigned long long) st.st_ino);
+      }
+    }
+
+    if (rfid.empty()) 
+      videourl = concat("#EXTM3U\n#EXTINF:-1\nhttp://", server, ":", cToSvInt(LiveSetup().GetServerPort()), "/recstream.html?recid=", recid);
+    else
+      videourl = concat("#EXTM3U\n#EXTINF:-1\nhttp://", server, ":", cToSvInt(LiveSetup().GetStreamdevPort()), "/", rfid, ".ts");
 	}
 </%cpp>
 <& playlist.m3u videourl=(videourl) &>

diff --git a/recman.cpp b/recman.cpp
@@ -651,8 +651,9 @@ bool searchNameDesc(RecordingsItemRecPtr &RecItem, const std::vector<RecordingsI
     m_timeImage = timeImage;
     m_timeDurationDeviation = timeDurationDeviation;
 
-//  m_imageLevels = cImageLevels(eImageLevel::episodeMovie, eImageLevel::seasonMovie, eImageLevel::tvShowCollection, eImageLevel::anySeasonCollection);
-    m_imageLevels = cImageLevels(eImageLevel::episodeMovie, eImageLevel::seasonMovie, eImageLevel::anySeasonCollection);
+    m_imageLevels = cImageLevels(eImageLevel::episodeMovie, eImageLevel::seasonMovie, eImageLevel::tvShowCollection, eImageLevel::anySeasonCollection);
+// this is for the image in "overview". We allow as many levels as we have, to ensure that there is an image
+//  m_imageLevels = cImageLevels(eImageLevel::episodeMovie, eImageLevel::seasonMovie, eImageLevel::anySeasonCollection);
     getScraperData();
     timeItemRec->stop();
 	}

diff --git a/stringhelpers.h b/stringhelpers.h
@@ -710,38 +710,54 @@ class cToSvFile: public cToSv {
     ~cToSvFile() { std::free(m_s); }
   private:
     void load(const char *filename, size_t max_length) {
+      for (int n_err = 0; n_err < 3; ++n_err) {
+        if (load_int(filename, max_length) ) return;
+        m_exists = false;
+        std::free(m_s);
+        m_s = nullptr;
+        if (n_err < 3) sleep(1);
+      }
+      esyslog("cToSvFile::load, ERROR: give up after 3 tries, filename %s", filename);
+    }
+    bool load_int(const char *filename, size_t max_length) {
+// return false if an error occured, and we should try again
       cOpen fd(filename, O_RDONLY);
-      if (!fd.exists()) return;
+      if (!fd.exists()) return true;
       struct stat buffer;
       if (fstat(fd, &buffer) != 0) {
-        if (errno != ENOENT) esyslog("cToSvFile::load, ERROR: in fstat, errno %d, filename %s\n", errno, filename);
-        return;
+        if (errno == ENOENT) return false;
+        esyslog("cToSvFile::load, ERROR: in fstat, errno %d, filename %s\n", errno, filename);
+        return true;
       }
 // file exists, length buffer.st_size
       m_exists = true;
-      if (buffer.st_size == 0) return; // empty file
+      if (buffer.st_size == 0) return true; // empty file
       size_t length = buffer.st_size;
       if (max_length != 0 && length > max_length) length = max_length;
       m_s = (char *) malloc((length + 1) * sizeof(char));  // add one. So we can add the 0 string terminator
       if (!m_s) {
         esyslog("cToSvFile::load, ERROR out of memory, filename = %s, requested size = %zu\n", filename, length + 1);
-        return;
+        return true;
       }
       size_t num_read = 0;
       ssize_t num_read1 = 1;
-      for (; num_read1 > 0 && num_read < length; num_read += num_read1) {
+      for (int num_errors = 0; num_errors < 3 && num_read < length; num_read += num_read1) {
         num_read1 = read(fd, m_s + num_read, length - num_read);
+        if (num_read1 == 0) ++num_errors; // should not happen, because fstat reported file size >= length
         if (num_read1 == -1) {
-          esyslog("cToSvFile::load, ERROR: read failed, errno %d, filename %s\n", errno, filename);
-          m_s[0] = 0;
-          return;
+          if (errno == ENOENT) return false;
+          esyslog("cToSvFile::load, ERROR: read failed, errno %d, filename %s, file size = %zu, num_read = %zu\n", errno, filename, (size_t)buffer.st_size, num_read);
+          ++num_errors;
+          num_read1 = 0;
+          if (num_errors < 3) sleep(1);
         }
       }
       m_result = cSv(m_s, num_read);
-      m_s[num_read] = 0;  // so data returns a 0 terminated string
+      m_s[num_read] = 0;  // so data() returns a 0 terminated string
       if (num_read != length) {
         esyslog("cToSvFile::load, ERROR: num_read = %zu, length = %zu, filename %s\n", num_read, length, filename);
       }
+      return true;
     }
     bool m_exists = false;
     char *m_s = nullptr;