DVR: add new schedule states - completedWarning and completedRerecord, fixes #3196

diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index 90c3f60411f88a79dc40ec14af4a3e14db171075..72df56a993334f346f9a40f26850e73450818105 100644 (file)
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -420,6 +420,8 @@ dvr_entry_status(dvr_entry_t *de)
       return N_("Completed OK");
 
   case DVR_MISSED_TIME:
+    if (de->de_last_error == SM_CODE_SVC_NOT_ENABLED)
+      return streaming_code2txt(de->de_last_error);
     return N_("Time missed");
 
   default:
@@ -434,24 +436,32 @@ dvr_entry_status(dvr_entry_t *de)
 const char *
 dvr_entry_schedstatus(dvr_entry_t *de)
 {
+  const char *s;
+  uint32_t rerecord;
+
   switch(de->de_sched_state) {
   case DVR_SCHEDULED:
-    return "scheduled";
+    s = "scheduled";
+    break;
   case DVR_RECORDING:
-    if(de->de_last_error)
-      return "recordingError";
-    else
-      return "recording";
+    s = de->de_last_error ? "recordingError" : "recording";
+    break;
   case DVR_COMPLETED:
+    s = "completed";
     if(de->de_last_error || dvr_get_filesize(de) == -1)
-      return "completedError";
-    else
-      return "completed";
+      s = "completedError";
+    rerecord = dvr_entry_get_rerecord_errors(de);
+    if(rerecord && (de->de_errors || de->de_data_errors > rerecord))
+      s = "completedRerecord";
+    break;
   case DVR_MISSED_TIME:
-    return "completedError";
+    s = de->de_last_error == SM_CODE_SVC_NOT_ENABLED ?
+          "completedWarning" : "completedError";
+    break;
   default:
-    return "unknown";
+    s = "unknown";
   }
+  return s;
 }
 
 /**

diff --git a/src/webui/static/app/ext.css b/src/webui/static/app/ext.css
index 622919b4681dd642a02a7240f6b08858c35483fb..2c452de282ccc762f06c147188d974fcac6df38c 100644 (file)
--- a/src/webui/static/app/ext.css
+++ b/src/webui/static/app/ext.css
@@ -332,6 +332,14 @@
     background-image: url(../icons/accept.png) !important;
 }
 
+.completedRerecord {
+    background-image: url(../icons/add.png) !important;
+}
+
+.completedWarning {
+    background-image: url(../icons/bell.png) !important;
+}
+
 .completedError {
     background-image: url(../icons/exclamation.png) !important;
 }

diff --git a/src/webui/static/icons/bell.png b/src/webui/static/icons/bell.png
new file mode 120000 (symlink)
index 0000000..acc1670
--- /dev/null
+++ b/src/webui/static/icons/bell.png
@@ -0,0 +1 @@
+../../../../vendor/famfamsilk/bell.png
\ No newline at end of file