stremiok 2.1.0 → 2.2.1

package/js/stremio.js

@@ -175,7 +175,8 @@ var Stremio = (function () {
             posterRatings: p.posterRatings === true,   // Settings > Appearance: IMDb rating on cards
             homePreview: p.homePreview !== false,      // Settings > Appearance: Continue Watching on the TV's home bar (js/hubpreview.js)
             homePreviewOrder: p.homePreviewOrder === 'watching' ? 'watching' : 'recent',   // ...its tiles: the latest first, or as in Watching
-            hiddenTabs: wordList(p.hiddenTabs, 20, 20),   // Settings > Appearance > Home tabs
+            hiddenTabs: wordList(p.hiddenTabs, 20, 20),   // Settings > Appearance > Menu: tabs hidden
+            menuOrder: wordList(p.menuOrder, 20, 20),     // ...and the menu's order (see ViewParts.menuOrder)
             hideWords: wordList(p.hideWords, 30, 40),     // Settings > Source ranking: sources with these words at the bottom
             watchRegion: /^[A-Z]{2}$/.test(p.watchRegion || '') ? p.watchRegion : '' };   // Settings > Integrations ('' = automatic)
     }
@@ -481,7 +482,18 @@ var Stremio = (function () {
         if (_hasIptv) { IPTV.removePlaylist(id); }
         configChanged();
     }
+    function iptvAddXtream(base, user, pass) {   // (as any playlist added: the addons' list made again)
+        var id = _hasIptv ? IPTV.addXtream(base, user, pass) : false;
+        configChanged();
+        return id;
+    }
+    function iptvSetXtreamFormat(id, fmt) {
+        var changed = _hasIptv ? IPTV.setXtreamFormat(id, fmt) : false;
+        configChanged();
+        return changed;
+    }
     function iptvRenamePlaylist(id, name) { return _hasIptv ? IPTV.renamePlaylist(id, name) : false; }
+    function iptvSetPlaylistGuide(id, url) { return _hasIptv && IPTV.setPlaylistGuide ? IPTV.setPlaylistGuide(id, url) : false; }
     function iptvSetPlaylistOff(id, off) { var ok = _hasIptv ? IPTV.setPlaylistOff(id, off) : false; configChanged(); return ok; }
     function iptvMovePlaylist(id, dir) { var ok = _hasIptv ? IPTV.movePlaylist(id, dir) : false; configChanged(); return ok; }
     function iptvLabel(id) { return _hasIptv ? IPTV.label(id) : ''; }
@@ -685,7 +697,8 @@ var Stremio = (function () {
     // ---- Feed lists: order + show / hide, as the user sets them ----
     // Home feeds (the Home rows: every catalog) and search sources (the Search rows:
     // every catalog that can search) each keep their own { order: [keys], hidden: [keys] }.
-    // Anything new (an addon added later) goes after the ordered ones, in addon order.
+    // Anything new (an addon added later) goes after the ordered ones, in addon order, but for a
+    // catalog that asks to come first (def._first: IPTV's Favorites) until you place it.
     var FEEDS_KEY = 'stremiok.feeds', SEARCH_FEEDS_KEY = 'stremiok.searchfeeds';
     function catalogKey(cat) {
         var aid = (cat.addon.manifest && cat.addon.manifest.id) || cat.addon.url;
@@ -698,8 +711,8 @@ var Stremio = (function () {
             var pos = {};
             cfg().order.forEach(function (k, i) { pos[k] = i; });
             return items.map(function (c, i) { return { c: c, i: i, k: keyOf(c) }; }).sort(function (a, b) {
-                var pa = (pos[a.k] !== undefined) ? pos[a.k] : (100000 + a.i);
-                var pb = (pos[b.k] !== undefined) ? pos[b.k] : (100000 + b.i);
+                var pa = (pos[a.k] !== undefined) ? pos[a.k] : (a.c && a.c.def && a.c.def._first) ? -1 : (100000 + a.i);
+                var pb = (pos[b.k] !== undefined) ? pos[b.k] : (b.c && b.c.def && b.c.def._first) ? -1 : (100000 + b.i);
                 return pa - pb;
             }).map(function (x) { return x.c; });
         }
@@ -1455,6 +1468,57 @@ var Stremio = (function () {
         return tmdbGet('/' + kind + '/' + tmdbId + '/external_ids', '', cancel).then(function (r) { return (r && r.imdb_id) || null; });
     }
 
+    // A film known only by a TV guide's program (the Guide's guide-only channels): { title (as
+    // shown, Spanish say), orig (its original title), year } -> Promise of { type, id (IMDb), name,
+    // poster } when exactly one film has that name (and that year, when known), else null.
+    // TMDB with your key (the original title, else the shown one in Spanish), else Cinemeta
+    // (original titles only).
+    function plainTitle(s) {   // ("El Señor de los Anillos:" -> "elsenordelosanillos")
+        var t = ('' + (s || '')).toLowerCase();
+        if (t.normalize) { try { t = t.normalize('NFD').replace(/[\u0300-\u036f]/g, ''); } catch (e) {} }
+        return t.replace(/[^a-z0-9]+/g, '');
+    }
+    function findFilm(p, cancel) {
+        var year = +p.year || 0;
+        function near(y) { return !year || (y && Math.abs(y - year) <= 1); }
+        function one(list, names) {
+            var want = names.map(plainTitle).filter(Boolean), hits = (list || []).filter(function (r) {
+                return near(r.year) && want.some(function (w) { return w === plainTitle(r.name) || w === plainTitle(r.orig); });
+            });
+            return hits.length === 1 ? hits[0] : null;
+        }
+        function tmdb(query, spanish) {
+            var extra = '&query=' + encodeURIComponent(query) + (year ? '&year=' + year : '') + (spanish ? '&language=es-AR' : '');
+            return tmdbGet('/search/movie', extra, cancel).then(function (r) {
+                return ((r && r.results) || []).map(function (x) {
+                    return { tmdbId: x.id, name: x.title || '', orig: x.original_title || '', year: +('' + (x.release_date || '')).slice(0, 4) || 0, poster: tmdbImg(x.poster_path, 'w342') };
+                });
+            }, function () { return []; });
+        }
+        function viaTmdb() {
+            if (!tmdbKey()) { return Promise.resolve(null); }
+            var first = p.orig ? tmdb(p.orig, false).then(function (l) { return one(l, [p.orig]); }) : Promise.resolve(null);
+            return first.then(function (hit) {
+                return hit || (p.title ? tmdb(p.title, true).then(function (l) { return one(l, [p.title]); }) : null);
+            }).then(function (hit) {
+                if (!hit) { return null; }
+                return tmdbImdbId('movie', hit.tmdbId, cancel).then(function (imdb) {
+                    return imdb ? { type: 'movie', id: imdb, name: hit.name || p.title, poster: hit.poster } : null;
+                }, function () { return null; });
+            });
+        }
+        function viaCinemeta() {
+            if (!p.orig) { return Promise.resolve(null); }
+            return U.getJSON('https://v3-cinemeta.strem.io/catalog/movie/top/search=' + encodeURIComponent(p.orig) + '.json', 10000, null, cancel).then(function (r) {
+                var hit = one(((r && r.metas) || []).map(function (m) {
+                    return { id: m.id, name: m.name || '', year: parseInt(m.releaseInfo || m.year || '', 10) || 0, poster: m.poster || '' };
+                }), [p.orig]);
+                return hit && /^tt\d+$/.test(hit.id) ? { type: 'movie', id: hit.id, name: p.title || hit.name, poster: hit.poster } : null;
+            }, function () { return null; });
+        }
+        return viaTmdb().then(function (hit) { return hit || viaCinemeta(); });
+    }
+
     // ---- MDBList ratings (Settings > Integrations > MDBList) ----
     // -> [{ key, label, text }] in a fixed order, only the ones the title has.
     var MDB_SOURCES = [['imdb', 'IMDb'], ['tomatoes', 'Rotten Tomatoes'], ['popcorn', 'Audience'],
@@ -2012,7 +2076,7 @@ var Stremio = (function () {
         getIntroSegments: getIntroSegments,
         tmdbValidate: tmdbValidate, mdblistValidate: mdblistValidate, omdbValidate: omdbValidate,
         tmdbFindTvId: tmdbFindTvId, tmdbSeasonEpisodes: tmdbSeasonEpisodes, tmdbImg: tmdbImg,
-        tmdbTitleExtras: tmdbTitleExtras, tmdbExtrasById: tmdbExtrasById, tmdbEpisodeCast: tmdbEpisodeCast, tmdbEpisodeTrailer: tmdbEpisodeTrailer, setHideWords: setHideWords, hideWordHit: hideWordHit, normalizeAddonUrl: normalizeManifestUrl, debridOf: debridOf, addonOrigin: addonOrigin, setAddonOrigin: setAddonOrigin, parseSetupList: parseSetupList, applySetupEntries: applySetupEntries, sizeLimitHit: sizeLimitHit, setSizeLimit: setSizeLimit, gbText: gbText, runtimeMinutes: runtimeMinutes, tmdbPeople: tmdbPeople, tmdbPerson: tmdbPerson, tmdbBrowse: tmdbBrowse, tmdbTitleTrailers: tmdbTitleTrailers, tmdbProviders: tmdbProviders, tmdbProvidersKept: tmdbProvidersKept, tmdbGenres: tmdbGenres, tmdbWhereToWatch: tmdbWhereToWatch, watchRegion: watchRegion, autoWatchRegion: autoWatchRegion, tmdbImdbId: tmdbImdbId, hasTmdb: function () { return !!tmdbKey(); },
+        tmdbTitleExtras: tmdbTitleExtras, tmdbExtrasById: tmdbExtrasById, tmdbEpisodeCast: tmdbEpisodeCast, tmdbEpisodeTrailer: tmdbEpisodeTrailer, setHideWords: setHideWords, hideWordHit: hideWordHit, normalizeAddonUrl: normalizeManifestUrl, debridOf: debridOf, addonOrigin: addonOrigin, setAddonOrigin: setAddonOrigin, parseSetupList: parseSetupList, applySetupEntries: applySetupEntries, sizeLimitHit: sizeLimitHit, setSizeLimit: setSizeLimit, gbText: gbText, runtimeMinutes: runtimeMinutes, tmdbPeople: tmdbPeople, tmdbPerson: tmdbPerson, tmdbBrowse: tmdbBrowse, tmdbTitleTrailers: tmdbTitleTrailers, tmdbProviders: tmdbProviders, tmdbProvidersKept: tmdbProvidersKept, tmdbGenres: tmdbGenres, tmdbWhereToWatch: tmdbWhereToWatch, watchRegion: watchRegion, autoWatchRegion: autoWatchRegion, tmdbImdbId: tmdbImdbId, findFilm: findFilm, hasTmdb: function () { return !!tmdbKey(); },
         mdblistRatings: mdblistRatings,
         omdbSeasonRatings: omdbSeasonRatings,
         loadAddons: loadAddons, listCatalogs: listCatalogs, getCatalog: getCatalog,
@@ -2042,7 +2106,7 @@ var Stremio = (function () {
         importSetupList: importSetupList, savedManifest: savedManifest, isAddonOff: isAddonOff, setAddonOff: setAddonOff, onIptvReady: onIptvReady, streamListenerCount: function (type, id) { var e = _streamCache[type + ':' + id]; return e ? e.listeners.length : 0; },
         iptvGetPlaylists: iptvGetPlaylists, iptvAddPlaylist: iptvAddPlaylist,
         iptvUpdatePlaylist: iptvUpdatePlaylist, iptvRemovePlaylist: iptvRemovePlaylist,
-        iptvRenamePlaylist: iptvRenamePlaylist, iptvSetPlaylistOff: iptvSetPlaylistOff, iptvMovePlaylist: iptvMovePlaylist, iptvLabel: iptvLabel,
+        iptvRenamePlaylist: iptvRenamePlaylist, iptvSetPlaylistGuide: iptvSetPlaylistGuide, iptvAddXtream: iptvAddXtream, iptvSetXtreamFormat: iptvSetXtreamFormat, iptvSetPlaylistOff: iptvSetPlaylistOff, iptvMovePlaylist: iptvMovePlaylist, iptvLabel: iptvLabel,
         iptvLoad: iptvLoad, iptvStatus: iptvStatus, iptvReload: iptvReload
     };
 })();

package/js/trakt.js

@@ -375,6 +375,7 @@ var Trakt = (function () {
         function next() {
             return authed('GET', path + (path.indexOf('?') === -1 ? '?' : '&') + 'page=' + page + '&limit=' + perPage, null).then(function (r) {
                 live(g);
+                if (!Array.isArray(r.data)) { var bad = new Error('Trakt sent a page that couldn\'t be read (' + path.split('?')[0] + ', page ' + page + ')'); bad.status = r.status || 0; throw bad; }   // (not the last page: the refresh fails, the copy kept)
                 var items = list(r.data, perPage), first = items.length ? JSON.stringify(items[0]) : '';
                 if (page > 1 && first && first === before) { return out.slice(0, max); }
                 before = first;

package/js/util.js

@@ -430,15 +430,20 @@ var U = (function () {
     /* GET via XHR with a timeout. Returns a Promise of the response text.
        maxBytes: give up as soon as more than that has arrived ("Too large (over …)");
        TEXT_MAX when not given. */
-    // A failed download, in Diagnostics. During a private playback, only its server: its link (a
-    // title's name can be in it) isn't kept, in the log or the copy saved for the next launch.
+    // A failed download, in Diagnostics. One asked during a private playback (when it started:
+    // it may fail after the playback ended) says only that, what kind of failure, and its
+    // server: not its link nor what the server answered (a title's name can be in either), in
+    // the log or the copy saved for the next launch.
     function privateNow() { try { return typeof Player !== 'undefined' && !!Player.privateNow && Player.privateNow(); } catch (e) { return false; } }
-    function logged(err) {
+    function logged(err, priv) {
         var msg = '' + err.message;
-        if (privateNow()) { msg = msg.replace(/(https?:\/\/[^\/\s?#]+)[^\s]*/g, '$1/…'); }
+        if (priv || privateNow()) {
+            var kind = /^(HTTP \d+|Timeout|Network error|Too large|Bad JSON|Redirected into the home network)/.exec(msg), host = /(https?:\/\/[^\/\s?#]+)/.exec(msg);
+            msg = 'Private viewing: a download' + (host ? ' from ' + host[1] : '') + ' failed' + (kind ? ' (' + kind[1] + ')' : '');
+        }
         log('network', msg); err.logged = true; return err;
     }
-    function noteNetwork(err) { return logged(err); }
+    function noteNetwork(err, priv) { return logged(err, priv); }
     // What a server said when it refused (an error answer's own message, e.g. AIOStreams'
     // { error: { message: "Invalid stream expression … Expected :" } }, or short plain text),
     // on one line, links in it masked, a long one kept to its start and end (where the what
@@ -464,8 +469,10 @@ var U = (function () {
     // quiet: a failure isn't noted in Diagnostics (a check that's expected to fail at times, like
     // the YouTube service's while it starts; the caller says so if it matters).
     // headers (optional): { name: value } sent with it.
-    function getText(url, timeoutMs, maxBytes, cancel, quiet, headers) {
-        function logged(err) { return quiet ? err : noteNetwork(err); }
+    // body (optional): sent as a POST (text), else it's a GET.
+    function getText(url, timeoutMs, maxBytes, cancel, quiet, headers, body) {
+        var priv = privateNow();   // (asked during a private playback: logged as one, however late it fails)
+        function logged(err) { return quiet ? err : noteNetwork(err, priv); }
         maxBytes = maxBytes || TEXT_MAX;
         return new Promise(function (resolveP, rejectP) {
             if (cancel && cancel.cancelled) { rejectP(cancelledError(url)); return; }   // (nothing started)
@@ -482,7 +489,7 @@ var U = (function () {
                 });
             }
             try {
-                xhr.open('GET', url, true);
+                xhr.open(body == null ? 'GET' : 'POST', url, true);
                 if (headers) { Object.keys(headers).forEach(function (h) { xhr.setRequestHeader(h, headers[h]); }); }
             } catch (e) { reject(e); return; }
             xhr.timeout = timeoutMs || 15000;
@@ -516,7 +523,7 @@ var U = (function () {
             };
             xhr.ontimeout = function () { if (!done) { done = true; reject(logged(new Error('Timeout: ' + redactUrl(url)))); } };
             xhr.onerror = function () { if (!done) { done = true; reject(logged(new Error('Network error: ' + redactUrl(url)))); } };
-            try { xhr.send(); } catch (e3) { reject(e3); }
+            try { if (body == null) { xhr.send(); } else { xhr.send('' + body); } } catch (e3) { reject(e3); }
         });
     }
 
@@ -557,10 +564,13 @@ var U = (function () {
 
     /* GET JSON via XHR with a timeout. Returns a Promise of the parsed body (JSON_MAX
        unless maxBytes says otherwise). cancel, headers: see getText. */
-    function getJSON(url, timeoutMs, maxBytes, cancel, headers) {
-        return getText(url, timeoutMs, maxBytes || JSON_MAX, cancel, false, headers).then(function (text) {
+    // A POST (body: text), its answer JSON.
+    function postJSON(url, body, timeoutMs, maxBytes, headers) { return getJSON(url, timeoutMs, maxBytes, null, headers, body); }
+    function getJSON(url, timeoutMs, maxBytes, cancel, headers, body) {
+        var priv = privateNow();   // (asked during a private playback: its answer unreadable later is logged as one too)
+        return getText(url, timeoutMs, maxBytes || JSON_MAX, cancel, false, headers, body).then(function (text) {
             try { return JSON.parse(text); }
-            catch (e) { throw logged(new Error('Bad JSON from ' + redactUrl(url))); }
+            catch (e) { throw logged(new Error('Bad JSON from ' + redactUrl(url)), priv); }
         });
     }
 
@@ -1491,7 +1501,8 @@ var U = (function () {
     }
 
     return {
-        byId: byId, el: el, clear: clear, moveIn: moveIn, getJSON: getJSON, getText: getText, redactUrl: redactUrl, problem: problem, problemDetail: problemDetail, listOf: listOf, lru: lru, cachedJSON: cachedJSON,
+        byId: byId, el: el, clear: clear, moveIn: moveIn, getJSON: getJSON, getText: getText,
+        postJSON: postJSON, redactUrl: redactUrl, problem: problem, problemDetail: problemDetail, listOf: listOf, lru: lru, cachedJSON: cachedJSON,
         parseUrl: parseUrl, urlProblem: urlProblem, isPlaylistUrl: isPlaylistUrl, isManifestUrl: isManifestUrl,
         isPrivateHost: isPrivateHost, urlIsPrivate: urlIsPrivate, setLocalPolicy: setLocalPolicy, sanitizeHeaders: sanitizeHeaders, drawable: drawable,
         log: log, logEntries: logEntries, clearLog: clearLog, bigStore: bigStore, diskInfo: diskInfo,

package/js/view-core.js

@@ -8,6 +8,7 @@ var ViewParts = {};
 
     // ----- from the other parts -----
     function availableTabs() { return V.availableTabs.apply(null, arguments); }   // home
+    function menuItems() { return V.menuItems.apply(null, arguments); }   // home
     function clearCatalogCache() { return V.clearCatalogCache.apply(null, arguments); }   // home
     function refreshAddonRows() { return V.refreshAddonRows.apply(null, arguments); }   // home
     function epCode() { return V.epCode.apply(null, arguments); }   // detail
@@ -271,6 +272,16 @@ var ViewParts = {};
         var rename = U.el('div', 'pill focusable modal-btn', 'Rename');
         var onoff = U.el('div', 'pill focusable modal-btn', playlist.off ? 'Turn on' : 'Turn off');
         var edit = U.el('div', 'pill focusable modal-btn', 'Edit link');
+        var guide = U.el('div', 'pill focusable modal-btn', 'Guide link');
+        var fmt = IPTV.xtreamFormat ? IPTV.xtreamFormat(playlist.id) : '';   // (an Xtream account: MPEG-TS or HLS)
+        var format = U.el('div', 'pill focusable modal-btn', 'Format: ' + (fmt === 'hls' ? 'HLS' : 'MPEG-TS'));
+        format.__onselect = function () {
+            closeModal();
+            Stremio.iptvSetXtreamFormat(playlist.id, fmt === 'hls' ? 'ts' : 'hls');
+            refreshAddonRows('local:iptv');
+            U.toast('Its channels now play as ' + (fmt === 'hls' ? 'MPEG-TS' : 'HLS') + ' (reading the account again…)', 4000);
+            renderSettings();
+        };
         var reload = U.el('div', 'pill focusable modal-btn', 'Reload');
         var remove = U.el('div', 'pill focusable modal-btn danger', 'Remove');
 
@@ -312,6 +323,20 @@ var ViewParts = {};
                 }
             });
         };
+        guide.__onselect = function () {   // its TV guide: yours, or the playlist's own (empty)
+            closeModal();
+            App.openEntry({
+                title: 'TV guide link', phone: 'playlist',
+                hint: 'An XMLTV guide (.xml or .xml.gz), then Confirm. Empty uses the playlist’s own (the one it names, or an Xtream playlist’s). RETURN cancels.',
+                value: playlist.guide || '', placeholder: 'https://example.com/guide.xml.gz',
+                validate: function (v) { return ('' + v).trim() ? (U.urlProblem(v) || null) : null; },
+                onConfirm: function (v) {
+                    Stremio.iptvSetPlaylistGuide(playlist.id, v);
+                    U.toast(('' + v).trim() ? 'Guide link set: reading it…' : 'Back to the playlist’s own guide', 3000);
+                    App.back(); renderSettings();
+                }
+            });
+        };
         reload.__onselect = function () {
             closeModal();
             U.toast('Reloading playlist…', 4000);
@@ -334,6 +359,8 @@ var ViewParts = {};
         row.appendChild(rename);
         row.appendChild(onoff);
         row.appendChild(edit);
+        if (!playlist.off && typeof EPG !== 'undefined' && EPG.available && EPG.available()) { row.appendChild(guide); }
+        if (!playlist.off && fmt) { row.appendChild(format); }
         if (!playlist.off) { row.appendChild(reload); }
         row.appendChild(remove);
         box.appendChild(row);
@@ -373,33 +400,6 @@ var ViewParts = {};
         showModal(overlay, pref);
     }
 
-    // Switches in a popup (Settings › Appearance › Home tabs): OK on one turns it on or off and
-    // the list stays open (BACK closes it). items: [[key, label, on]]; words: { on, off } (the
-    // state shown after each label); onToggle(key, on).
-    function toggleList(title, items, words, onToggle) {
-        var existing = document.querySelector('.modal-overlay');
-        if (existing) { existing.parentNode.removeChild(existing); }
-        var overlay = U.el('div', 'modal-overlay');
-        var box = U.el('div', 'modal-box pick-box');
-        box.appendChild(U.el('div', 'modal-msg', title));
-        var listEl = U.el('div', 'pick-list'), first = null;
-        items.forEach(function (opt) {
-            var on = !!opt[2], it = U.el('div', 'pick-item focusable');
-            function draw() {
-                it.textContent = opt[1] + ':  ' + (on ? words.on : words.off);
-                if (on) { it.classList.add('sel'); } else { it.classList.remove('sel'); }
-            }
-            draw();
-            it.__onselect = function () { on = !on; draw(); onToggle(opt[0], on); };
-            if (!first) { first = it; }
-            listEl.appendChild(it);
-        });
-        box.appendChild(listEl);
-        overlay.appendChild(box);
-        document.body.appendChild(overlay);
-        showModal(overlay, first);
-    }
-
     // Ticks in a popup (what to import): nothing ticked at first; OK on one ticks or unticks it,
     // Select all ticks every one that can be (again: none); the button counts what's ticked.
     // items: [{ key, label, have (already yours: shown as such, can't be ticked), note }];
@@ -482,7 +482,8 @@ var ViewParts = {};
     }
 
     // The shared top menu, used on Home / Search / Settings so they look and navigate
-    // the same: tab pills + Search + Settings on the left, StremioK on the right.
+    // the same: Watching, then the tabs, Discover and Search in your order (menuItems), then
+    // Settings, on the left; StremioK on the right.
     // `active` is the key of the current view: a tab key, 'search' or 'settings'.
     function buildTopMenu(active) {
         var head = U.el('div', 'header home-header');
@@ -495,34 +496,23 @@ var ViewParts = {};
         };
         function down() { return focusBelowTop(head); }
         var tabbar = U.el('div', 'tabbar-inline');
-        availableTabs().forEach(function (t) {
-            var pill = U.el('div', 'tab-pill focusable' + (t.key === active ? ' active' : ''));
-            pill.appendChild(document.createTextNode(t.label));
-            pill.appendChild(U.el('span', 'tab-ic', t.icon));
-            pill.__onselect = function () { App.goHome(t.key); };
-            pill.__navDOWN = down;
-            tabbar.appendChild(pill);
+        // a pill: a Home tab, Discover (browse any catalog in full, its own screen), Search;
+        // Settings a chip like them (name, then icon), after them
+        function item(cls, key, label, icon, open, into) {
+            var p = U.el('div', cls + ' focusable' + (key === active ? ' active' : ''));
+            p.appendChild(document.createTextNode(label));
+            p.appendChild(U.el('span', 'tab-ic', icon));
+            p.__onselect = open;
+            p.__navDOWN = down;
+            into.appendChild(p);
+        }
+        menuItems().forEach(function (m) {
+            if (m.tab) { item('tab-pill', m.key, m.tab.label, m.tab.icon, function () { App.goHome(m.key); }, tabbar); }
+            else if (m.key === 'discover') { item('tab-pill', 'discover', 'Discover', '🔭', function () { App.openDiscover(); }, tabbar); }
+            else if (m.key === 'search') { item('hchip', 'search', 'Search', '🔍', function () { App.openSearch(); }, tabbar); }
         });
-        // Discover: browse any catalog in full, by genre / year (its own screen)
-        var disc = U.el('div', 'tab-pill focusable' + (active === 'discover' ? ' active' : ''));
-        disc.appendChild(document.createTextNode('Discover'));
-        disc.appendChild(U.el('span', 'tab-ic', '🔭'));
-        disc.__onselect = function () { App.openDiscover(); };
-        disc.__navDOWN = down;
-        tabbar.appendChild(disc);
         head.appendChild(tabbar);
-
-        // Search and Settings: pills like the tabs (name, then icon), after them
-        function chip(key, label, icon, open) {
-            var c = U.el('div', 'hchip focusable' + (active === key ? ' active' : ''));
-            c.appendChild(document.createTextNode(label));
-            c.appendChild(U.el('span', 'tab-ic', icon));
-            c.__onselect = open;
-            c.__navDOWN = down;
-            head.appendChild(c);
-        }
-        chip('search', 'Search', '🔍', function () { App.openSearch(); });
-        chip('settings', 'Settings', '⚙', function () { App.openSettings(); });
+        item('hchip', 'settings', 'Settings', '⚙', function () { App.openSettings(); }, head);
 
         head.appendChild(U.el('div', 'spacer'));
         var brand = U.el('div', 'brand');
@@ -579,6 +569,10 @@ var ViewParts = {};
         if (rating > 0 && rating <= 10 && Stremio.getPrefs().posterRatings) { c.appendChild(U.el('div', 'card-rating', '★ ' + rating.toFixed(1))); }   // (a series: marked watched whole, see setTitleWatched / the title page)
         if (kind === 'movie' || kind === 'series') { c.__onlongpress = function () { posterActions(meta, kind, c); }; }
         else if (youTubeList(meta.id)) { c.__onlongpress = function () { addYouTubeCatalog(meta); }; }   // (a channel / playlist: to your YouTube)
+        else if (/^iptv:/.test(meta.id || '') && typeof EPG !== 'undefined') {   // an IPTV channel: what's on, and its schedule
+            guideOnCard(c, meta.id);
+            c.__onlongpress = function () { liveSchedule(meta, c); };
+        }
         c.__onselect = function () {
             var t = titleType(meta.type || fallbackType);
             // Live TV catalogs (anything that isn't movies/series) skip the info page and
@@ -597,6 +591,86 @@ var ViewParts = {};
         return c;
     }
 
+    // ---- TV guide (js/epg.js) on IPTV channel cards ----
+    // What's on now, under the channel's name, with how far along it is; drawn again when the
+    // guide brings more (the cards still on a page; the most recent GUIDE_CARDS).
+    var _guideCards = [], GUIDE_CARDS = 3000;
+    function guideOnCard(card, id) {
+        drawGuide(card, id);
+        _guideCards.push(card);
+        if (_guideCards.length > GUIDE_CARDS) { _guideCards = _guideCards.slice(-GUIDE_CARDS); }
+    }
+    function drawGuide(card, id) {
+        guideLogo(card, id);
+        var g = EPG.now(id), old = card.querySelector('.card-epg');
+        if (!g || !g.now) { if (old) { card.removeChild(old); } return; }
+        var t = Date.now() / 1000, pct = Math.max(0, Math.min(100, Math.round((t - g.now.start) / (g.now.stop - g.now.start) * 100)));
+        var box = old || U.el('div', 'card-epg');
+        U.clear(box);
+        box.appendChild(U.el('div', 'card-epg-t', g.now.title));
+        var bar = U.el('div', 'card-epg-bar'), fill = U.el('i', 'card-epg-fill');
+        fill.setAttribute('style', 'width: ' + pct + '%');
+        bar.appendChild(fill);
+        box.appendChild(bar);
+        if (!old) { card.appendChild(box); }
+    }
+    // A channel card without a picture (no tvg-logo): its guide's logo, once it's known; the
+    // name stays until it has loaded.
+    function guideLogo(card, id) {
+        var src = !card.__guideLogo && !card.querySelector('img.poster') && EPG.logo(id);
+        if (!src) { return; }
+        card.__guideLogo = true;
+        var img = U.el('img', 'poster'), fb = card.querySelector('.fallback');
+        img.style.visibility = 'hidden';
+        img.onload = function () { img.style.visibility = ''; if (fb && fb.parentNode) { fb.parentNode.removeChild(fb); } };
+        img.onerror = function () { if (img.parentNode) { img.parentNode.removeChild(img); } };
+        card.insertBefore(img, card.firstChild);
+        U.deferImage(img, U.cardImage(src, 'landscape'));
+    }
+    function redrawGuideCards() {
+        _guideCards = _guideCards.filter(function (c) { return document.documentElement.contains(c); });
+        _guideCards.forEach(function (c) { drawGuide(c, c.getAttribute('data-id')); });
+    }
+    if (typeof EPG !== 'undefined') {
+        EPG.onChange(redrawGuideCards);
+        // every minute: the cards' progress bars (and what's on, once it changed) along with the time
+        setInterval(function () {
+            if (!_guideCards.length || document.hidden || (typeof Player !== 'undefined' && Player.isActive())) { return; }
+            redrawGuideCards();
+        }, 60000);
+    }
+    // Hold OK on a channel card: ▶ Watch now, ★ Add to / Remove from favorites, and its schedule
+    // from 2 hours ago to tomorrow (what's on now marked, and picked); OK on a program says
+    // what it is. A channel without a guide: the first two.
+    var _schedGen = 0;
+    function liveSchedule(meta, card) {
+        var gen = ++_schedGen;
+        U.spinner(true);
+        EPG.schedule(meta.id).then(null, function () { return []; }).then(function (list) {
+            if (gen !== _schedGen) { return; }   // (held on another card since: its own)
+            U.spinner(false);
+            if (!document.documentElement.contains(card) || (typeof Player !== 'undefined' && Player.isActive())) { return; }   // (left meanwhile)
+            var fav = IPTV.isFavorite(meta.id), t = Date.now() / 1000, at = 'play';
+            var items = [['play', '▶  Watch now'], ['fav', fav ? '★  Remove from favorites' : '★  Add to favorites']];
+            list.forEach(function (p, i) {
+                var on = p.start <= t && t < p.stop;
+                if (on) { at = 'p' + i; }
+                items.push(['p' + i, (on ? '●  ' : '') + EPG.dayTime(p.start) + '   ' + p.title]);
+            });
+            pickList((meta.name || '') + (list.length ? '  ·  TV guide' : ''), items, at, function (v) {
+                if (v === 'play') { card.__onselect(); return; }
+                if (v === 'fav') {
+                    IPTV.setFavorite(meta.id, !fav);
+                    U.toast(fav ? 'Removed from favorites' : 'Added to favorites: ★ Favorites, first on the IPTV tab', 3000);
+                    refreshAddonRows('local:iptv');
+                    return;
+                }
+                var p = list[+v.slice(1)];
+                if (p) { U.toast(EPG.dayTime(p.start) + '–' + EPG.hhmm(p.stop) + '   ' + p.title + (p.desc ? ':  ' + p.desc : ''), 8000); }
+            });
+        });
+    }
+
     // The channels of the row a live card sits in, for CH+/CH− while it plays.
     function rowChannels(card) {
         var sib = card.parentNode ? card.parentNode.children : [card], list = [], idx = 0;
@@ -750,7 +824,6 @@ var ViewParts = {};
     V.inNowPlaying = inNowPlaying;
     V.onModalClose = onModalClose;
     V.pickList = pickList;
-    V.toggleList = toggleList;
     V.pickMany = pickMany;
     V.playlistActions = playlistActions;
     V.posterCard = posterCard;

package/js/view-detail.js

@@ -2039,7 +2039,7 @@
         if (_d) { _d.direct = false; _d.directList = false; _d.directFailed = false; }   // (only this once: played again from the list, back to the list)
         var onExit = function (how) {
             // (after CH+/CH−, back on the card of the channel you ended on)
-            if (exitToBack) { App.returnFromLive(_d.channels ? _d.channels.list[_d.channels.idx].card : null); return; }
+            if (exitToBack) { var ch = _d.channels ? _d.channels.list[_d.channels.idx] : null; App.returnFromLive(ch ? ch.card : null, ch ? ch.meta.id : null); return; }
             // played straight away (a single YouTube video): back where it was opened from
             if (direct && !page.directFailed && _d === page) { App.back(); return; }   // (Home redrawn if Continue Watching changed)
             // a channel's video played straight away: back on the channel's videos, on it