stremiok 2.1.0 → 2.2.0

package/js/view-home.js

@@ -26,49 +26,116 @@
         { key: 'movie', icon: '🎬', label: 'Movies' },
         { key: 'series', icon: '📺', label: 'Series' },
         { key: 'tv', icon: '📡', label: 'IPTV' },
+        { key: 'guide', icon: '☰', label: 'Guide' },   // (the IPTV channels' TV guide as a grid, once one is read: see js/view-guide.js)
         { key: 'radio', icon: '📻', label: 'Radio' },
         { key: 'sport', icon: '⚽', label: 'Sports' },
         { key: 'youtube', icon: '📹', label: 'YouTube' },   // (StremioK's YouTube catalogs, an addon's YouTube / channel ones: see isYouTubeCat)
         { key: 'local', icon: '💾', label: 'Local' }   // (a USB drive plugged in: see LocalMedia)
     ];
     function hasLocal() { return typeof LocalMedia !== 'undefined' && LocalMedia.present(); }
+    function hasGuide() { return typeof EPG !== 'undefined' && !!EPG.hasAny && EPG.hasAny(); }
+
+    // The top menu's order (Settings › Appearance › Menu): Watching first and Settings last, the
+    // rest (the tabs, Discover, Search) in yours. A saved order is kept as far as it goes: an
+    // item it doesn't have (one added since) goes after the one it usually follows, and one
+    // that no longer exists is dropped.
+    var MENU_ITEMS = HOME_TABS.filter(function (t) { return t.key !== 'continue'; }).map(function (t) { return t.key; }).concat(['discover', 'search']);
+    function menuOrder() {
+        var out = [];
+        (Stremio.getPrefs().menuOrder || []).forEach(function (k) { if (MENU_ITEMS.indexOf(k) !== -1 && out.indexOf(k) === -1) { out.push(k); } });
+        MENU_ITEMS.forEach(function (k, i) {
+            if (out.indexOf(k) !== -1) { return; }
+            var at = 0;
+            for (var j = i - 1; j >= 0; j--) { var p = out.indexOf(MENU_ITEMS[j]); if (p !== -1) { at = p + 1; break; } }
+            out.splice(at, 0, k);
+        });
+        return out;
+    }
+    function moveMenuItem(key, dir) {
+        var o = menuOrder();
+        if (!U.moveIn(o, o.indexOf(key), dir)) { return false; }
+        Stremio.setPref('menuOrder', o);
+        return true;
+    }
+    // What the top menu shows, left to right, before Settings: Watching, then in your order the
+    // tabs showing (availableTabs), Discover and Search. [{ key, tab }] (tab: a Home tab's entry).
+    function menuItems() {
+        var tabs = availableTabs(), byKey = {}, out = [];
+        tabs.forEach(function (t) { byKey[t.key] = t; });
+        if (byKey['continue']) { out.push({ key: 'continue', tab: byKey['continue'] }); }
+        menuOrder().forEach(function (k) {
+            if (k === 'discover' || k === 'search') { out.push({ key: k }); }
+            else if (byKey[k]) { out.push({ key: k, tab: byKey[k] }); }
+        });
+        return out;
+    }
 
     // Which tabs to show in the top menu (needs the home catalogs; falls back to the
     // standard set before they've loaded so the menu is consistent everywhere).
-    // Tabs you hid (Settings › Appearance › Home tabs) aren't shown; Watching always is.
+    // Tabs you hid (Settings › Appearance › Menu) aren't shown; Watching always is.
     function availableTabs() {
         var hidden = Stremio.getPrefs().hiddenTabs || [];
-        function shown(t) { return t.key === 'continue' || hidden.indexOf(t.key) === -1; }
+        function shown(t) { return t.key === 'continue' || (hidden.indexOf(t.key) === -1 && (t.key !== 'guide' || hasGuide())); }
         if (_homeCatalogs === null || _homeFirstLoad) {   // first load still running
             return HOME_TABS.filter(function (t) { return shown(t) && (t.key !== 'local' || hasLocal()); });
         }
         return HOME_TABS.filter(function (t) {
-            return shown(t) && (t.key === 'continue' || t.key === 'calendar' || (t.key === 'local' ? hasLocal() : catsForTab(t.key).length > 0));
+            return shown(t) && (t.key === 'continue' || t.key === 'calendar' || t.key === 'guide' || (t.key === 'local' ? hasLocal() : catsForTab(t.key).length > 0));
         });
     }
 
     // YouTube's tab: StremioK's own YouTube catalogs (whatever type you gave one: "Podcasts"),
     // and another addon's YouTube or channel catalogs (YouTubio's "YouTube", Stremio's "channel").
+    // (Home's copies of a catalog, and the ones saved for the next launch, keep only its name,
+    // type and titles: a YouTube one carries yt, as its addon isn't kept with them)
     function isYouTubeCat(c) {
         var m = c.addon && c.addon.manifest;
-        return !!(m && m.id === 'org.stremiok.youtube') || /^(youtube|channel)$/i.test('' + c.type);
+        return !!c.yt || !!(m && m.id === 'org.stremiok.youtube') || /^(youtube|channel)$/i.test('' + c.type);
     }
-    // Which cached catalogs belong to a tab. Sports, radio and YouTube have dedicated tabs;
-    // IPTV is the catch-all for every other live source (tv, …).
-    function catsForTab(key) {
-        return (_homeCatalogs || []).filter(function (c) {
-            if (key === 'youtube') { return isYouTubeCat(c); }
-            if (isYouTubeCat(c)) { return false; }
-            if (key === 'movie') { return c.type === 'movie'; }
-            if (key === 'series') { return c.type === 'series'; }
-            if (key === 'sport') { return c.type === 'sport'; }
-            if (key === 'radio') { return c.type === 'radio'; }
-            if (key === 'tv') {
-                return c.type !== 'movie' && c.type !== 'series' &&
-                    c.type !== 'sport' && c.type !== 'radio';
-            }
-            return false;
+    function copyCat(c, metas, more) {   // (name, type, titles: and yt when it's one)
+        var o = { name: c.name, type: c.type, metas: metas };
+        if (c.yt) { o.yt = true; }
+        if (more) { Object.keys(more).forEach(function (k) { o[k] = more[k]; }); }
+        return o;
+    }
+    // Which cached catalogs belong to a tab (tabOf). Movies, series, sports, radio and YouTube go
+    // to their own tabs, live TV (LIVE_TYPES, IPTV playlists) to IPTV. Another type (a debrid
+    // library's "RealDebrid", "other") goes by what it lists (byItems); anything still unclear
+    // isn't on Home ('': Discover has it). ("anime" never gets here: see Stremio's discoverOnly.)
+    var LIVE_TYPES = { tv: 1, events: 1, event: 1, live: 1, livetv: 1, iptv: 1 };
+    var TITLE_IDS = /^(tt\d+|tmdb:|tvdb:|kitsu:|mal:|anilist:|anidb:)/i;
+    function tabOf(c) {
+        var n = (c.metas || []).length;
+        if (c._tab !== undefined && c._tabN === n) { return c._tab; }   // (worked out again once it has titles)
+        var t = ('' + (c.type || '')).toLowerCase(), tab;
+        if (isYouTubeCat(c)) { tab = 'youtube'; }
+        else if (t === 'movie' || t === 'series' || t === 'radio') { tab = t; }
+        else if (t === 'sport' || t === 'sports') { tab = 'sport'; }
+        else if (LIVE_TYPES[t]) { tab = 'tv'; }
+        else { tab = byItems(c); }
+        c._tab = tab; c._tabN = n;
+        return tab;
+    }
+    // Mostly films or series (60% of its first 50 titles): that tab. Title ids, and "anime",
+    // "series" or "show" in its name or type: Series ("movie" / "film": Movies). Else ''.
+    function byItems(c) {
+        var ms = (c.metas || []).slice(0, 50), mv = 0, sr = 0, ids = 0;
+        if (!ms.length) { return ''; }
+        ms.forEach(function (m) {
+            var mt = ('' + ((m && m.type) || '')).toLowerCase();
+            if (mt === 'movie') { mv++; } else if (mt === 'series') { sr++; }
+            if (TITLE_IDS.test('' + ((m && m.id) || ''))) { ids++; }
         });
+        if (mv + sr >= ms.length * 0.6) { return mv > sr ? 'movie' : 'series'; }
+        if (ids >= ms.length * 0.6) {
+            var hint = (c.type + ' ' + (c.name || '') + ' ' + ((c.def && c.def.name) || '')).toLowerCase();
+            if (/movie|film|pel[ií]cula/.test(hint)) { return 'movie'; }
+            if (/anime|series|show|serie/.test(hint)) { return 'series'; }
+        }
+        return '';
+    }
+    function catsForTab(key) {
+        return (_homeCatalogs || []).filter(function (c) { return tabOf(c) === key; });
     }
     var _homeCatalogs = null;   // [{name,type,metas}] — fetched once per session, filtered per tab
     var _homeTab = null;        // active tab key
@@ -98,8 +165,11 @@
     // url: the addon ('local:iptv' for IPTV); none: nothing to fetch (only the set / order
     // of rows changed). Calls before the reload runs add up.
     var _reloadOnly = null;   // { addon url: 1 } for the next reload, else a full one
+    var _homeAddons = {};     // { addon url: 1 } the addons Home's last load had catalogs from
     function refreshAddonRows(url) {
         if (_homeCatalogs === null) { clearCatalogCache(); return; }   // nothing loaded yet: a full load anyway
+        // an addon Home didn't load rows from (the first playlist added: IPTV): a full load, its tab with it
+        if (url && !_homeAddons[url]) { clearCatalogCache(); return; }
         _reloadOnly = _reloadOnly || {};
         if (url) { _reloadOnly[url] = 1; }
         _homeDirty = true;
@@ -148,17 +218,17 @@
             if (bytes > _homeBytesMax) { return; }
             var metas = c.metas.map(trimMeta);
             metas.forEach(function (m) { bytes += sizeOf(m); });
-            if (bytes <= _homeBytesMax) { cats.push({ name: c.name, type: c.type, metas: metas }); }
+            if (bytes <= _homeBytesMax) { cats.push(copyCat(c, metas)); }
         });
         if (U.bigStore && !_homeSaveFailed) {
             U.bigStore.set(HOME_CACHE_KEY, { sig: sig, cats: cats }).then(function (ok) { if (ok === false) { _homeSaveFailed = true; } });
         }
         U.store.set(HOME_SNAP_KEY, { sig: sig, cats: cats.slice(0, SNAP_ROWS).map(function (c) {
-            return { name: c.name, type: c.type, metas: c.metas.slice(0, SNAP_CARDS).map(function (m) {
+            return copyCat(c, c.metas.slice(0, SNAP_CARDS).map(function (m) {
                 var o = { id: m.id, type: m.type, name: m.name };
                 SNAP_FIELDS.forEach(function (k) { if (m[k] != null) { o[k] = m[k]; } });
                 return o;
-            }) };
+            }));
         }) });
     }
     function useHomeCache() {
@@ -1150,7 +1220,7 @@
         // Rows for the active tab, from the once-per-session catalog cache. Catalog tabs
         // keep their built rows, so switching back doesn't rebuild every card; Continue
         // Watching is small and changes after every playback, so it's always rebuilt.
-        var rows = (_homeTab !== 'continue' && _homeTab !== 'local' && _homeTab !== 'calendar') ? _tabRows[_homeTab] : null;
+        var rows = (_homeTab !== 'continue' && _homeTab !== 'local' && _homeTab !== 'calendar' && _homeTab !== 'guide') ? _tabRows[_homeTab] : null;
         if (_homeTab !== 'calendar' && _calCancel) { _calCancel.cancel(); _calCancel = null; }   // (its titles' details still coming: not wanted)
         if (rows) {
             s.appendChild(rows);
@@ -1162,6 +1232,8 @@
                 localRows(rows);
             } else if (_homeTab === 'calendar') {
                 calendarRows(rows);
+            } else if (_homeTab === 'guide') {
+                V.guideGrid(rows);
             } else if (_homeTab === 'continue') {
                 var entries = continueEntries();
                 if (entries.length) {
@@ -1194,12 +1266,15 @@
         var again = keep ? findCard(s, keep) : null;
         var landed = false;
         var sameItem = (!firstCard && inMenu) ? menuItem(s, cur.textContent) : null;   // the menu item focus was on
-        if (again || sameItem) { Focus.setScope(s, again || sameItem); } else { landed = focusHome(s, !firstCard && inMenu); }
+        var rowsEl = s.querySelector('.rows'), fc = Focus.current();
+        if (_homeTab === 'guide' && fc && rowsEl && rowsEl.contains(fc)) { landed = true; }   // (the Guide drawn from what it had put focus back on its program)
+        else if (again || sameItem) { Focus.setScope(s, again || sameItem); } else { landed = focusHome(s, !firstCard && inMenu); }
         if (_homeCatalogs === null || homeStale() || _reloadOnly) { loadHomeCatalogs(); }
         // No title to focus yet: try again when the rows arrive (Continue Watching and a
         // tab with no catalogs have nothing coming, so focus simply stays on the pill).
-        _focusFirstCard = (firstCard && !landed && _homeLoading && _homeTab !== 'continue' && _homeTab !== 'calendar') ? 'pending' : false;
+        _focusFirstCard = (firstCard && !landed && _homeLoading && _homeTab !== 'continue' && _homeTab !== 'calendar' && _homeTab !== 'guide') ? 'pending' : false;
         _renderedSig = tabSig();
+        _renderedMenu = menuSig();
         if (s.querySelector('.rows .card')) { U.mark('firstCard'); }
         // the strip describes the focused title only (empty while focus is in the menu)
         clearTimeout(_homeInfoTimer); _homeInfoTimer = null;
@@ -1214,6 +1289,7 @@
     function fillInfoBox(box, m) {
         if (!box) { return; }
         m = m || {};
+        if (!m.logo && /^iptv:/.test(m.id || '') && typeof EPG !== 'undefined' && EPG.logo && EPG.logo(m.id)) { m = Object.assign({}, m, { logo: EPG.logo(m.id) }); }   // (a channel: its guide's logo)
         var bits = [];
         if (m.releaseInfo) { bits.push(m.releaseInfo); } else if (m.year) { bits.push('' + m.year); }
         if (m.runtime) { bits.push(m.runtime); }
@@ -1231,8 +1307,34 @@
         } else {
             t.textContent = name;
         }
+        var desc = m.description || '';
+        var g = /^iptv:/.test(m.id || '') && typeof EPG !== 'undefined' ? EPG.now(m.id) : null;   // a channel: what's on, from its TV guide
+        if (g && g.now) {
+            bits = ['Now  ' + EPG.hhmm(g.now.start) + '–' + EPG.hhmm(g.now.stop) + '   ' + g.now.title];
+            desc = (g.now.desc ? g.now.desc + '   ' : '') + (g.next ? 'Next  ' + EPG.hhmm(g.next.start) + '   ' + g.next.title : '');
+        }
         box.children[1].textContent = bits.join('   ·   ');
-        box.children[2].textContent = m.description || '';
+        box.children[2].textContent = desc;
+        // a program's picture from the TV guide (the Guide tab's focused one, a channel's now)
+        var picSrc = m.picture || (g && g.now && g.now.picture) || '', pic = box.querySelector('.home-info-pic');
+        if (!picSrc) { if (pic) { pic.className = 'home-info-pic hidden'; } box.classList.remove('has-pic'); return; }
+        if (!pic) { pic = U.el('img', 'home-info-pic'); pic.onerror = function () { pic.className = 'home-info-pic hidden'; box.classList.remove('has-pic'); }; box.appendChild(pic); }
+        pic.className = 'home-info-pic';
+        box.classList.add('has-pic');
+        if (pic.__src !== picSrc) { pic.__src = picSrc; U.deferImage(pic, U.cardImage(picSrc, 'still'), true); }
+    }
+    if (typeof EPG !== 'undefined') {   // (the focused channel's: drawn again when its guide arrives)
+        var _hadGuide = false;
+        EPG.onChange(function () {
+            var n = Focus.current();
+            if (n && n.__meta && /^iptv:/.test(n.__meta.id || '') && scr('home').contains(n)) { fillHomeInfo(n.__meta); }
+            // a guide read (or gone): the Guide tab comes (or goes) in the menu, at once
+            var has = hasGuide();
+            if (has !== _hadGuide) {
+                _hadGuide = has;
+                if (_current() === scr('home') && !isModalOpen() && !Player.isActive()) { renderHome(); }
+            }
+        });
     }
     Focus.onFocus(function (node) {
         if (!node || !scr('home').contains(node)) { return; }
@@ -1263,12 +1365,18 @@
     // Everything the tab on screen shows from the catalogs (which titles, in which rows),
     // to tell whether a refresh changed it. Continue Watching shows none of it.
     function shownSig() {
-        if (_homeTab === 'continue' || _homeTab === 'calendar') { return _homeTab; }
+        if (_homeTab === 'continue' || _homeTab === 'calendar' || _homeTab === 'guide') { return _homeTab; }
         return _homeTab + '#' + catsForTab(_homeTab).map(function (c) {
             return c.name + ':' + c.metas.map(function (m) { return m.id + '/' + (m.poster || ''); }).join(',');
         }).join('|');
     }
-    var _renderedSig = '';
+    var _renderedSig = '', _renderedMenu = '';
+    // The tabs that aren't drawn from catalogs (Watching, Calendar, Guide, Local): catalogs that
+    // arrive don't change them, only the top menu might (a tab coming). Redrawing one rebuilds it
+    // whole (the Guide asks for its programs again): a flicker, so not unless the menu changed.
+    function ownTab(t) { return t === 'continue' || t === 'calendar' || t === 'guide' || t === 'local'; }
+    function menuSig() { return availableTabs().map(function (t) { return t.key; }).join(','); }
+    function ownTabStill() { return ownTab(_homeTab) && menuSig() === _renderedMenu; }
     function tabSig() {
         return _homeTab + '#' + catsForTab(_homeTab).map(function (c) { return c.name + ':' + c.metas.length; }).join('|');
     }
@@ -1312,7 +1420,9 @@
         }
         function onHome() { return _current() === s && !isModalOpen() && !Player.isActive(); }
         Stremio.catalogsForHome().then(function (cats) {
-            var acc = cats.map(function (cat) { return { name: cat.name, type: cat.type, metas: [] }; });
+            _homeAddons = {};
+            cats.forEach(function (cat) { if (cat.addon && cat.addon.url) { _homeAddons[cat.addon.url] = 1; } });
+            var acc = cats.map(function (cat) { return copyCat({ name: cat.name, type: cat.type, yt: isYouTubeCat(cat) }, []); });
             var arrived = cats.map(function () { return false; }), shown = 0, partialTimer = null;
             // First load: publish each row as soon as it arrives, in its own place (a slower one above
             // it held by a "Loading…" placeholder, so nothing jumps when it comes), and redraw when
@@ -1321,12 +1431,13 @@
                 var n = arrived.filter(Boolean).length, last = arrived.lastIndexOf(true);
                 if (!first || n <= shown) { return; }
                 shown = n;
-                var now = acc.slice(0, last + 1).map(function (c, i) { return arrived[i] ? c : { name: c.name, type: c.type, metas: [], loading: true }; });
+                var now = acc.slice(0, last + 1).map(function (c, i) { return arrived[i] ? c : copyCat(c, [], { loading: true }); });
                 _homeCatalogs = splitOtherCatalogs(now).filter(function (c) { return c.loading || (c.metas && c.metas.length); });
                 if (partialTimer) { return; }
                 partialTimer = setTimeout(function () {
                     partialTimer = null;
                     if (!_homeFirstLoad) { return; }   // everything arrived meanwhile: drawn below
+                    if (ownTabStill()) { _tabRows = {}; return; }   // (Watching, the Guide…: as they are)
                     var keep = {};
                     if (tabSig() === _renderedSig) { keep[_homeTab] = _tabRows[_homeTab]; }
                     _tabRows = keep;   // other tabs rebuild from the new rows when opened
@@ -1351,7 +1462,7 @@
                 // The tab on screen is redrawn only if what it shows changed: redrawing rebuilds
                 // every card (and reloads its artwork), which shows as a flicker. Continue
                 // Watching doesn't come from catalogs at all. Other tabs rebuild when opened.
-                var same = before !== null && shownSig() === before;
+                var same = (before !== null && shownSig() === before) || ownTabStill();
                 var keep = {};
                 if (same && _tabRows[_homeTab]) { keep[_homeTab] = _tabRows[_homeTab]; }
                 _tabRows = keep;
@@ -1375,8 +1486,8 @@
     function splitOtherCatalogs(list) {
         var out = [];
         list.forEach(function (c) {
-            if (c.loading) { if (c.type !== 'other') { out.push({ name: c.name, type: c.type, metas: [], loading: true }); } return; }   // (a placeholder: still loading)
-            if (c.type !== 'other') { out.push({ name: c.name, type: c.type, metas: c.metas.slice(0, ROW_CARDS) }); return; }
+            if (c.loading) { if (c.type !== 'other' || c.yt) { out.push(copyCat(c, [], { loading: true })); } return; }   // (a placeholder: still loading)
+            if (c.type !== 'other' || c.yt) { out.push(copyCat(c, c.metas.slice(0, ROW_CARDS))); return; }   // (a YouTube one as it is, whatever its type)
             var movies = [], series = [];
             c.metas.forEach(function (m) { (SERIES_NAME.test(m.name || '') ? series : movies).push(m); });
             out.push({ name: otherRowName('Movies', c.name), type: 'movie', metas: movies.slice(0, ROW_CARDS) });
@@ -1435,6 +1546,10 @@
     // ----- published for the other parts (and js/views.js) -----
     V.fillInfoBox = fillInfoBox;
     V.availableTabs = availableTabs;
+    V.menuOrder = menuOrder;
+    V.moveMenuItem = moveMenuItem;
+    V.menuItems = menuItems;
+    V.MENU_ITEMS = MENU_ITEMS;
     V.HOME_TABS = HOME_TABS;
     V.buildRow = buildRow;
     V.clearCatalogCache = clearCatalogCache;

package/js/view-settings.js

@@ -17,7 +17,6 @@
     function markHomeDirty() { return V.markHomeDirty.apply(null, arguments); }   // home
     function onModalClose() { return V.onModalClose.apply(null, arguments); }   // core
     function pickList() { return V.pickList.apply(null, arguments); }   // core
-    function toggleList() { return V.toggleList.apply(null, arguments); }   // core
     function playlistActions() { return V.playlistActions.apply(null, arguments); }   // core
     function scr() { return V.scr.apply(null, arguments); }   // core
     function showModal() { return V.showModal.apply(null, arguments); }   // core
@@ -207,14 +206,16 @@
             get: function () { return { spoilers: Stremio.getPrefs().spoilers }; },
             set: function (cfg) { Stremio.setPref('spoilers', cfg.spoilers); }
         }));
-        wrap.appendChild(homeTabsRow());
+        var menu = sectionRow('Menu  ›', 'Order the top menu, and show or hide its tabs', 'menuorder');
+        menu.className += ' cfg-row';
+        wrap.appendChild(menu);
         var feeds = sectionRow('Home feeds  ›', 'Order the Home rows, and show or hide each one', 'feeds');
         feeds.className += ' cfg-row';
         wrap.appendChild(feeds);
         var sfeeds = sectionRow('Search results  ›', 'Order the Search rows (one per catalog that can search), and show or hide each one', 'searchfeeds');
         sfeeds.className += ' cfg-row';
         wrap.appendChild(sfeeds);
-        var back = _focusChild === 'feeds' ? feeds : _focusChild === 'searchfeeds' ? sfeeds : null;
+        var back = _focusChild === 'menuorder' ? menu : _focusChild === 'feeds' ? feeds : _focusChild === 'searchfeeds' ? sfeeds : null;
         _focusChild = null;
         if (back) { Focus.setScope(scr('settings'), back); } else { focusSettings(); }
     }
@@ -337,7 +338,7 @@
     // BACK goes up one level, onto the row it came from: from a section to its group (on
     // that section, not the first one), from Home feeds / Search results to Appearance,
     // from a group to the Settings list (on that group).
-    var SECTION_PARENT = { feeds: 'appearance', searchfeeds: 'appearance', aiomanager: 'addons' };
+    var SECTION_PARENT = { menuorder: 'appearance', feeds: 'appearance', searchfeeds: 'appearance', aiomanager: 'addons' };
     Object.keys(SETTINGS_GROUPS).forEach(function (g) {
         SETTINGS_GROUPS[g].rows.forEach(function (row) { SECTION_PARENT[row[2]] = g; });
     });
@@ -366,6 +367,7 @@
         else if (_settingsSection === 'subtitles') { settingsSubtitles(wrap); }
         else if (_settingsSection === 'skipping') { settingsSkipping(wrap); }
         else if (_settingsSection === 'seeking') { settingsSeeking(wrap); }
+        else if (_settingsSection === 'menuorder') { settingsFeeds(wrap, 'menu'); }
         else if (_settingsSection === 'feeds') { settingsFeeds(wrap, 'home'); }
         else if (_settingsSection === 'searchfeeds') { settingsFeeds(wrap, 'search'); }
         else if (_settingsSection === 'ranking') { settingsFeeds(wrap, 'ranking'); }
@@ -867,6 +869,15 @@
     var _iptvFocus = null;   // { id, ctl } to focus once the page is drawn again
     function two(n) { return (n < 10 ? '0' : '') + n; }
     function thousands(n) { return ('' + n).replace(/\B(?=(\d{3})+(?!\d))/g, ','); }
+    // The playlist rows IPTV Settings drew last: their guide lines kept current by one listener
+    // (one added each time it was drawn used to pile up, each holding its rows).
+    var _guideRows = [];
+    if (typeof EPG !== 'undefined' && EPG.onChange) {
+        EPG.onChange(function () {
+            _guideRows = _guideRows.filter(function (r) { return document.documentElement.contains(r.info); });
+            _guideRows.forEach(function (r) { r.info.textContent = playlistInfo(r.p); });
+        });
+    }
     function playlistInfo(p) {
         if (p.off) { return 'Off — its channels aren’t shown'; }
         var st = Stremio.iptvStatus(p.id), parts = [];
@@ -875,13 +886,65 @@
         if (st.fetchedAt) { var d = new Date(st.fetchedAt); parts.push('downloaded ' + U.dayLabel(st.fetchedAt) + ' ' + two(d.getHours()) + ':' + two(d.getMinutes())); }
         if (st.dropped) { parts.push(thousands(st.dropped) + ' more left out (a playlist keeps its first 30,000)'); }
         if (st.uncached) { parts.push('too large to save on the TV: downloaded each launch'); }
+        var g = guideInfo(p);
+        if (g) { parts.push(g); }
         return parts.join('   ·   ');
     }
+    // Its TV guide (js/epg.js): being read, read (for how many of its channels), or why not.
+    function guideInfo(p) {
+        var g = typeof EPG !== 'undefined' && EPG.status ? EPG.status(p.id) : null;
+        if (!g) { return typeof EPG !== 'undefined' && EPG.available && EPG.available() ? 'no TV guide' : ''; }
+        if (g.state === 'ready') {
+            var d = new Date(g.at);
+            return 'TV guide: ' + thousands(g.channels) + ' channel' + (g.channels === 1 ? '' : 's') + ', ' + thousands(g.programmes) + ' programs' + (g.partial ? ' (part of it: too large)' : '') +
+                (g.at ? ', read ' + U.dayLabel(g.at) + ' ' + two(d.getHours()) + ':' + two(d.getMinutes()) : '') + (g.error ? ' (the last read failed: ' + g.error + ')' : '');
+        }
+        if (g.state === 'failed') { return '⚠ TV guide: ' + (g.error || 'couldn’t be read'); }
+        return 'TV guide: reading…';
+    }
     function playlistProblem(p) {
         var st = Stremio.iptvStatus(p.id);
         if (p.off || !st.error) { return ''; }
         return '⚠ ' + (st.stale ? 'Couldn’t refresh it (showing the saved copy): ' : '') + st.error;
     }
+    // + Add Xtream account: its server, username and password, a page each (a whole Xtream link
+    // in the server's fills the rest); checked with the server, then added (Stremio.iptvAddXtream).
+    function addXtream() {
+        function done(base, user, pass) {
+            U.toast('Checking the account…', 15000);
+            IPTV.xtreamCheck(base, user, pass).then(function (r) {
+                if (r.unreachable) { U.toast('Couldn’t reach the server: check its address (nothing was saved)', 5000); return; }
+                if (r.refused) { U.toast('The server refused that username and password' + (r.status ? ' (' + r.status + ')' : '') + ': nothing was saved', 5000); return; }
+                Stremio.iptvAddXtream(base, user, pass);
+                refreshAddonRows('local:iptv');
+                U.toast('Xtream account added: reading its channels and TV guide…', 4000);
+                renderSettings();
+            });
+        }
+        App.openEntry({
+            title: 'Xtream account: server', phone: 'playlist',
+            hint: 'The server address your provider gave you (http://line.example.com:8080), or a whole Xtream link. RETURN cancels.',
+            value: 'http://', placeholder: 'http://line.example.com:8080',
+            validate: function (v) { return IPTV.xtreamParts(v) ? null : 'That isn’t a server address'; },
+            onConfirm: function (v) {
+                var x = IPTV.xtreamParts(v);
+                App.back();
+                if (x.user && x.pass) { done(x.base, x.user, x.pass); return; }
+                App.openEntry({
+                    title: 'Xtream account: username', hint: 'Your account’s username. RETURN cancels.', value: x.user, placeholder: 'username',
+                    validate: function (u) { return ('' + u).trim() ? null : 'Type the username'; },
+                    onConfirm: function (u) {
+                        App.back();
+                        App.openEntry({
+                            title: 'Xtream account: password', hint: 'Your account’s password (kept on the TV, in the playlist’s link). RETURN cancels.', value: '', placeholder: 'password', secret: true,
+                            validate: function (p) { return ('' + p) ? null : 'Type the password'; },
+                            onConfirm: function (p) { App.back(); done(x.base, ('' + u).trim(), '' + p); }
+                        });
+                    }
+                });
+            }
+        });
+    }
     function settingsIptv(wrap) {
         wrap.appendChild(U.el('h2', null, 'IPTV'));
         var playlists = Stremio.iptvGetPlaylists ? Stremio.iptvGetPlaylists() : [];
@@ -925,6 +988,7 @@
             rows.push({ p: playlist, info: info, problem: problem, idx: idx });
         });
 
+        _guideRows = rows;   // (their guide lines kept current as guides are read: _guideRows)
         if (statusEl) {
             Stremio.iptvLoad().then(function () {
                 var channels = 0, groups = 0, failed = 0, on = 0;
@@ -962,6 +1026,11 @@
             });
         };
         wrap.appendChild(add);
+        var xt = U.el('div', 'addon-item focusable add-row');
+        xt.appendChild(U.el('div', 'a-name', '+  Add Xtream account'));
+        xt.appendChild(U.el('div', 'a-url', 'Its server, username and password: its channels and TV guide added'));
+        xt.__onselect = addXtream;
+        wrap.appendChild(xt);
 
         wrap.appendChild(U.el('div', 'hint',
             'Channels are grouped into IPTV and Radio rows on Home. ▲ / ▼ set the playlists\' order: a channel in two playlists comes from the first.'));
@@ -1386,34 +1455,6 @@
         focusSettings();
     }
 
-    // Home tabs: hide the ones you never use (Watching always stays: it's where Home opens). A
-    // row like the ones above it; OK opens the tabs, OK on one shows or hides it (the list
-    // stays open). A hidden tab's rows are back when it's shown again.
-    function homeTabsRow() {
-        function hiddenNow() { return Stremio.getPrefs().hiddenTabs || []; }
-        var r = U.el('div', 'addon-item focusable cfg-row'), name = U.el('div', 'a-name');
-        var tabs = (V.HOME_TABS || []).filter(function (t) { return t.key !== 'continue'; });
-        function draw() {
-            var hidden = hiddenNow().filter(function (k) { return tabs.some(function (t) { return t.key === k; }); });
-            name.textContent = 'Home tabs:  ' + (hidden.length ? hidden.length + ' hidden' : 'All shown');
-        }
-        draw();
-        r.appendChild(name);
-        r.appendChild(U.el('div', 'a-url', 'Press OK to choose'));
-        r.__onselect = function () {
-            var hidden = hiddenNow();
-            toggleList('Home tabs', tabs.map(function (t) { return [t.key, t.label + (t.key === 'local' ? ' (with a USB drive in)' : ''), hidden.indexOf(t.key) === -1]; }),
-                { on: 'Shown', off: 'Hidden' }, function (key, on) {
-                    var now = hiddenNow().filter(function (k) { return k !== key; });
-                    if (!on) { now.push(key); }
-                    Stremio.setPref('hiddenTabs', now);
-                    markHomeDirty();
-                    draw();
-                });
-        };
-        return r;
-    }
-
     var POSTER_SHAPES = [['portrait', 'Portrait'], ['landscape', 'Landscape']];
     // ----- Diagnostics › Logs: the recent problems U.log kept (in memory, URLs masked), and
     // how long launches took -----
@@ -1630,14 +1671,17 @@
             if (!inf.entries.length) { line(dbOn ? 'Nothing in the TV’s database.' : 'The TV’s database isn’t used (turned off above).'); }
             line('Settings storage: ' + fmtBytes(inf.ls) + ' (progress, watched marks, settings…)' + (inf.lsTop.length ? '; the largest:' : ''));
             inf.lsTop.forEach(function (e) { line('   ' + fmtBytes(e.bytes) + '   ' + e.key); });
+            if (inf.guides && inf.guides.count) { line('Saved TV guides (in StremioK’s folder): ' + fmtBytes(inf.guides.bytes) + ' in ' + inf.guides.count + (inf.guides.count === 1 ? ' file' : ' files')); }
             if (inf.disk) { line('The TV’s own disk: ' + fmtBytes(inf.disk.free) + ' free of ' + fmtBytes(inf.disk.total) + '  (what the TV allows StremioK follows it: freeing space, unused apps for one, raises it)'); }
         }
         r.__onselect = function () {
             if (!U.bigStore || !U.bigStore.info || _storageInfo === 'busy') { return; }
             _storageInfo = 'busy'; renderSettings();
-            Promise.all([U.bigStore.info(), U.diskInfo ? U.diskInfo() : null]).then(function (both) {
+            var guides = (typeof YTPlay !== 'undefined' && YTPlay.epgFiles) ? YTPlay.epgFiles().then(null, function () { return null; }) : null;
+            Promise.all([U.bigStore.info(), U.diskInfo ? U.diskInfo() : null, guides]).then(function (both) {
                 var inf = both[0], ls = 0, lsAll = [];
                 inf.disk = both[1];
+                inf.guides = both[2];   // ({ count, bytes }: the TV guides StremioK's service saved)
                 inf.lsKeys = {};
                 try {
                     for (var i = 0; i < window.localStorage.length; i++) {
@@ -1669,12 +1713,15 @@
         }
         var clr = U.el('div', 'addon-item focusable');
         clr.appendChild(U.el('div', 'a-name', 'Clear saved copies'));
-        clr.appendChild(U.el('div', 'a-url', 'Home’s saved rows, IPTV playlist copies, the USB index: made again when needed (playlists download again)'));
+        clr.appendChild(U.el('div', 'a-url', 'Home’s saved rows, IPTV playlist copies, saved TV guides, the USB index: made again when needed (playlists and guides download again)'));
         clr.__onselect = function () {
-            confirm('Clear the copies StremioK can make again (Home rows, playlist copies, USB index)?', 'Clear', function () {
+            confirm('Clear the copies StremioK can make again (Home rows, playlist copies, TV guides, USB index)?', 'Clear', function () {
                 U.bigStore.keys().then(function (ks) {
                     return Promise.all(ks.filter(function (k) { return /^stremiok\.(homecache|local\.index|iptv\.cache\.)/.test(k); }).map(function (k) { return U.bigStore.remove(k); }));
                 }).then(function () {
+                    return (typeof YTPlay !== 'undefined' && YTPlay.epgClear) ? YTPlay.epgClear().then(null, function () {}) : null;   // (the saved guides: read again as they're needed)
+                }).then(function () {
+                    if (typeof EPG !== 'undefined' && EPG.reset) { EPG.reset(); }
                     if (typeof LocalMedia !== 'undefined') { LocalMedia.clearIndex(); }
                     _storageInfo = null;
                     U.toast('Saved copies cleared');
@@ -1846,7 +1893,28 @@
     // ----- Home feeds and Search results (Settings > Appearance): order, show / hide -----
     // kind 'home': the Home rows (every catalog); 'search': the Search rows (every catalog
     // that can search, IPTV as one per type). ▲/▼ moves one; OK on its name shows / hides it.
+    // 'menu': the top menu between Watching and Settings (the tabs, Discover, Search: ViewParts'
+    // menuOrder); OK on a tab shows / hides it, Discover and Search always show.
+    var MENU_FIXED = { discover: 'Discover', search: 'Search' };
+    function menuHidden(k) { return !MENU_FIXED[k] && (Stremio.getPrefs().hiddenTabs || []).indexOf(k) !== -1; }
     var FEED_KINDS = {
+        menu: { section: 'menuorder', title: 'Appearance  ›  Menu', hint: 'Watching comes first and Settings last: ⇈ ▲ ▼ ⇊ put the rest in your order · OK on a tab shows/hides it.',
+            list: function () {
+                return Promise.resolve(V.menuOrder().map(function (k) {
+                    var t = (V.HOME_TABS || []).filter(function (x) { return x.key === k; })[0];
+                    return { key: k, name: MENU_FIXED[k] || (t ? t.label : k) + (k === 'local' ? ' (with a USB drive in)' : k === 'guide' ? ' (once a TV guide is read)' : '') };
+                }));
+            },
+            keyOf: function (x) { return x.key; },
+            move: function (k, d) { V.moveMenuItem(k, d); markHomeDirty(); return Promise.resolve(); },
+            toggle: function (k) {
+                if (MENU_FIXED[k]) { U.toast(MENU_FIXED[k] + ' is always in the menu'); return; }
+                var now = (Stremio.getPrefs().hiddenTabs || []).filter(function (x) { return x !== k; });
+                if (!menuHidden(k)) { now.push(k); }
+                Stremio.setPref('hiddenTabs', now);
+                markHomeDirty();
+            },
+            hidden: menuHidden },
         home: { section: 'feeds', title: 'Appearance  ›  Home feeds', hint: '▲/▼ reorder a feed · OK on the name shows/hides it on Home.',
             list: function () { return Stremio.listCatalogsOrdered(); }, keyOf: function (c) { return Stremio.catalogKey(c); },
             move: function (k, d) { return Stremio.moveFeed(k, d); }, toggle: function (k) { Stremio.toggleFeed(k); },

package/js/views.js

@@ -12,8 +12,9 @@ var Views = (function (V) {
         // pages, a search's rows) stopped
         leaveScreen: function (name) { var f = { detail: V.leaveDetail, discover: V.leaveDiscover, search: V.leaveSearch }[name]; if (f) { f(); } }, backInLocal: V.backInLocal, setHomeTab: V.setHomeTab,
         renderLive: V.renderLive,
-        renderSearch: V.renderSearch, renderDiscover: V.renderDiscover, renderEntry: V.renderEntry, backInDetail: V.backInDetail,
+        renderSearch: V.renderSearch, searchFor: function (q) { V.searchFor(q); }, renderDiscover: V.renderDiscover, renderEntry: V.renderEntry, backInDetail: V.backInDetail,
         homeDirty: V.homeDirty, refreshHomeIfStale: V.refreshHomeIfStale, alertNewEpisodes: V.alertNewEpisodes, previewTiles: V.previewTiles, withShowInfo: V.withShowInfo,
-        isModalOpen: V.isModalOpen, closeModal: V.closeModal, moveKey: V.moveKey, availableTabs: V.availableTabs
+        isModalOpen: V.isModalOpen, closeModal: V.closeModal, moveKey: V.moveKey, availableTabs: V.availableTabs,
+        menuItems: V.menuItems, menuOrder: V.menuOrder, moveMenuItem: V.moveMenuItem
     };
 })(ViewParts);