DVR WEBUI: add and update filesize in upcoming/current recordings

diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index 59a8332522bfc3d3690c6af71af3f85a75102c2a..a5d6c6849b4d02962f67ac78e3b546b5e117b5d5 100644 (file)
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -1555,7 +1555,8 @@ dvr_entry_class_url_get(void *o)
   static const char *s;
   static char buf[100];
   s = "";
-  if (de->de_sched_state == DVR_COMPLETED) {
+  if (de->de_sched_state == DVR_COMPLETED ||
+      de->de_sched_state == DVR_RECORDING) {
     snprintf(buf, sizeof(buf), "dvrfile/%s", idnode_uuid_as_str(&de->de_id));
     s = buf;
   }
@@ -1567,9 +1568,12 @@ dvr_entry_class_filesize_get(void *o)
 {
   static int64_t size;
   dvr_entry_t *de = (dvr_entry_t *)o;
-  if (de->de_sched_state == DVR_COMPLETED)
+  if (de->de_sched_state == DVR_COMPLETED ||
+      de->de_sched_state == DVR_RECORDING) {
     size = dvr_get_filesize(de);
-  else
+    if (size < 0)
+      size = 0;
+  } else
     size = 0;
   return &size;
 }

diff --git a/src/webui/static/app/dvr.js b/src/webui/static/app/dvr.js
index de071e37eb4489c7edcd74f9e77b0903d7779a30..88631df3285e72f0751654884aef725a682165f2 100644 (file)
--- a/src/webui/static/app/dvr.js
+++ b/src/webui/static/app/dvr.js
@@ -215,8 +215,13 @@ tvheadend.dvr_upcoming = function(panel, index) {
         },
         del: true,
         list: 'disp_title,episode,pri,start_real,stop_real,' +
-              'duration,channel,owner,creator,config_name,' +
+              'duration,filesize,channel,owner,creator,config_name,' +
               'sched_status,errors,data_errors,comment',
+        columns: {
+            filesize: {
+                renderer: tvheadend.filesizeRenderer()
+            }
+        },
         sort: {
           field: 'start_real',
           direction: 'ASC'