Add "Now" view mode in EPG (#3411)

diff --git a/src/api/api_epg.c b/src/api/api_epg.c
index ce789797279a5b8e2d383a3a6630afb9cbb30168..c6950b7c3b2452c4aee7506c1eae0df81e1f900a 100644 (file)
--- a/src/api/api_epg.c
+++ b/src/api/api_epg.c
@@ -313,12 +313,14 @@ api_epg_grid
   int64_t duration_min, duration_max;
   htsmsg_field_t *f, *f2;
   htsmsg_t *l = NULL, *e, *filter;
+  const char* mode;
 
   memset(&eq, 0, sizeof(eq));
 
   lang = access_get_lang(perm, htsmsg_get_str(args, "lang"));
   if (lang)
     eq.lang = strdup(lang);
+  mode = htsmsg_get_str(args, "mode");
   str = htsmsg_get_str(args, "title");
   if (str)
     eq.stitle = strdup(str);
@@ -330,6 +332,14 @@ api_epg_grid
   if (str)
     eq.channel_tag = strdup(str);
 
+  if (mode != NULL) {
+      if (!strcmp(mode, "now")) {
+        eq.start.comp = EC_LT;
+        eq.stop.comp = EC_GT;
+        eq.start.val1 = eq.stop.val1 = gclk();
+      }
+  }
+
   duration_min = -1;
   duration_max = -1;
   htsmsg_get_s64(args, "durationMin", &duration_min);

diff --git a/src/webui/static/app/epg.js b/src/webui/static/app/epg.js
index a9389eba47b8efb3d6f3dfd06bcda317bee09507..a7809fb7393bf99a6c24e0a8746d27cc85b62f0a 100644 (file)
--- a/src/webui/static/app/epg.js
+++ b/src/webui/static/app/epg.js
@@ -649,6 +649,27 @@ tvheadend.epg = function() {
         ]
     });
 
+    // Mode filter
+    var epgMode = new Ext.form.ComboBox({
+        width: 60,
+        displayField: 'val',
+        valueField: 'key',
+        store: new Ext.data.ArrayStore({
+            id: 0,
+            fields: [ 'key', 'val' ],
+            data: [
+                [ 'all', _("All") ],
+                [ 'now', _("Now") ]
+            ]
+        }),
+        mode: 'local',
+        editable: false,
+        forceSelection: true,
+        triggerAction: 'all',
+        typeAhead: true,
+        value: 'all'
+    });
+
     // Title search box
 
     var epgFilterTitle = new Ext.form.TextField({
@@ -787,7 +808,13 @@ tvheadend.epg = function() {
         epgFilterDuration.setValue("");
     };
 
+    clearModeFilter = function() {
+        delete epgStore.baseParams.mode;
+        epgMode.setValue("all");
+    };
+
     function epgQueryClear() {
+        clearModeFilter();
         clearTitleFilter();
         clearFulltextFilter();
         clearChannelFilter();
@@ -799,6 +826,11 @@ tvheadend.epg = function() {
         epgView.reset();
     };
 
+    function clearModeFilterAndReload() {
+        clearModeFilter();
+        epgView.reset();
+    }
+
 /*
  * Filter selection event handlers
  */
@@ -845,6 +877,15 @@ tvheadend.epg = function() {
         epgView.reset();
     });
 
+    epgMode.on('select', function(c, r) {
+        epgStore.baseParams.mode = r.data.key;
+        if (epgStore.baseParams.mode == "next" || epgStore.baseParams.mode == "now") {
+            // Change ordering to ordering by number asc, because that's what users would expect to see
+            epgStore.sortInfo = { field: 'channelNumber', direction: 'ASC' };
+        }
+        epgView.reset();
+    });
+
     epgFilterTitle.on('valid', function(c) {
         var value = c.getValue();
 
@@ -887,6 +928,7 @@ tvheadend.epg = function() {
     });
 
     var tbar = [
+        epgMode, '-',
         epgFilterTitle, { text: _('Fulltext') }, epgFilterFulltext, '-',
         epgFilterChannels, '-',
         epgFilterChannelTags, '-',
@@ -1008,6 +1050,7 @@ tvheadend.epg = function() {
             value = tvheadend.regexEscape(value);
             if (value && epgStore.baseParams.title !== value) {
                 epgFilterTitle.setValue(value);
+                clearModeFilterAndReload();
                 return false;
             }
         } else if (column.dataIndex === 'channelName') {
@@ -1016,6 +1059,7 @@ tvheadend.epg = function() {
             if (value && epgStore.baseParams.channel !== value) {
                 epgFilterChannels.setValue(rec['channelName']);
                 epgFilterChannelSet(value);
+                clearModeFilterAndReload();
                 return false;
             }
         } else if (column.dataIndex === 'genre') {
@@ -1026,6 +1070,7 @@ tvheadend.epg = function() {
                     var l = tvheadend.contentGroupLookupName(value);
                     epgFilterContentGroup.setValue(l);
                     epgFilterContentGroupSet(value);
+                    clearModeFilterAndReload();
                     return false;
                 }
             }