stremiok 2.0.0 → 2.2.0

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(); }
     }
@@ -323,7 +324,7 @@
             ['Audio', 'Preferred and second-choice audio language', 'audio'],
             ['Subtitles', 'Default language, size, color, background, position, font', 'subtitles'],
             ['Skipping', 'Intros, recaps and previews, and the next episode at the credits: ask, or on their own after a countdown', 'skipping'],
-            ['Seeking & buffering', 'How far ◀ ▶ jump; a bigger buffer for slow connections', 'seeking'],
+            ['Seeking & buffering', 'How far ◀ ▶ jump; a bigger buffer for slow connections; reconnecting live channels', 'seeking'],
             ['Source ranking', 'How sources are ordered (played before, resolution, release type…), and your addons: their order, on or off', 'ranking'],
             ['Formats', 'Allowed resolutions, and what plays on this TV, learned as you watch', 'formats'],
             ['Private viewing', 'Play without anything recorded: no progress, Continue Watching, watched marks or Trakt', 'private']] },
@@ -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'); }
@@ -470,6 +472,24 @@
         });
         return 'Gives: ' + (bits.length ? bits.join(' · ') : 'nothing StremioK uses') + (types.length ? '   ·   ' + types.slice(0, 8).join(', ') : '');
     }
+    // An addon's logo tile: its initial (the first character, an emoji whole; "?" for one that
+    // didn't load; drawn by the CSS from data-initial, so the row's text is still its name),
+    // and over it the logo from its manifest (Stremio.addonLogo), loaded with the other
+    // artwork; one that can't load is taken away, leaving the initial.
+    function addonTile(m, url) {
+        var name = ('' + ((m && m.name) || '')).replace(/^\s+/, ''), c = name.charCodeAt(0);
+        var tile = U.el('div', 'addon-logo');
+        tile.setAttribute('data-initial', !m ? '?' : name ? name.slice(0, c >= 0xD800 && c <= 0xDBFF ? 2 : 1).toUpperCase() : 'A');
+        var src = Stremio.addonLogo ? Stremio.addonLogo(m, url) : null;
+        if (src) {
+            var img = document.createElement('img');
+            img.onload = function () { tile.className = 'addon-logo loaded'; };
+            img.onerror = function () { if (img.parentNode) { img.parentNode.removeChild(img); } tile.className = 'addon-logo'; };
+            tile.appendChild(img);
+            U.deferImage(img, src);
+        }
+        return tile;
+    }
     function settingsAddons(wrap) {
         wrap.appendChild(U.el('h2', null, 'Addons'));
         // Home-network links from addons on the internet (see Stremio.blocksLocal)
@@ -489,16 +509,14 @@
             var urls = Stremio.getAddonUrls(), want = null;
             if (urls.length > 1) { wrap.appendChild(U.el('div', 'hint', '▲ / ▼ set the order: a title\'s details come from the highest addon that has them (its page says which), and the higher addon comes first where several answer.')); }
             urls.forEach(function (url) {
-                var loaded = addons.find(function (a) { return a.url === url; });
-                var frow = U.el('div', 'feed-row playlist-row');
-                function move(dir, ctl) { return function () { if (Stremio.moveAddon(url, dir)) { _addonFocus = { url: url, ctl: ctl }; refreshAddonRows(); renderSettings(); } }; }
-                var up = U.el('div', 'feed-btn focusable', '▲');
-                up.__onselect = move(-1, 'up');
-                var down = U.el('div', 'feed-btn focusable', '▼');
-                down.__onselect = move(1, 'down');
-                var item = U.el('div', 'addon-item focusable playlist-item');
+                var off = !!(Stremio.isAddonOff && Stremio.isAddonOff(url)), kept = off && Stremio.savedManifest ? Stremio.savedManifest(url) : null;
+                var loaded = addons.find(function (a) { return a.url === url; }) || (kept ? { url: url, manifest: kept } : null);   // (one that's off: its saved manifest)
+                var frow = U.el('div', 'feed-row playlist-row' + (off ? ' feed-off' : ''));
+                var btns = orderButtons(function (dir, ctl) { if (Stremio.moveAddon(url, dir)) { _addonFocus = { url: url, ctl: ctl }; refreshAddonRows(); renderSettings(); } });
+                var item = U.el('div', 'addon-item focusable playlist-item has-logo');
+                item.appendChild(addonTile(loaded && loaded.manifest, url));
                 var why = !loaded && Stremio.manifestProblem ? Stremio.manifestProblem(url) : '';   // "too large (over 2 MB)", "not an addon manifest"…
-                var nm = U.el('div', 'a-name', loaded ? (loaded.manifest.name || 'Addon') : '(failed to load' + (why ? ': ' + why : '') + ')');
+                var nm = U.el('div', 'a-name', (loaded ? (loaded.manifest.name || 'Addon') : off ? 'Addon' : '(failed to load' + (why ? ': ' + why : '') + ')') + (off ? '   (off)' : ''));
                 var origin = Stremio.addonOrigin ? Stremio.addonOrigin(url) : '', ob = originBadge(origin);
                 if (ob) { nm.appendChild(ob); }
                 item.appendChild(nm);
@@ -512,10 +530,10 @@
                 item.__onselect = function () {
                     addonActions(name, url);
                 };
-                if (urls.length > 1) { frow.appendChild(up); frow.appendChild(down); }
+                if (urls.length > 1) { btns.forEach(function (b) { frow.appendChild(b); }); }
                 frow.appendChild(item);
                 wrap.appendChild(frow);
-                if (_addonFocus && _addonFocus.url === url) { want = _addonFocus.ctl === 'up' ? up : down; }
+                if (_addonFocus && _addonFocus.url === url) { want = btns[ctlIndex(_addonFocus.ctl)]; }
             });
 
             var addRow = U.el('div', 'addon-item focusable add-row');
@@ -731,9 +749,12 @@
             var byNorm = {};
             there.forEach(function (x) { byNorm[norm(x.url)] = x; });
             var mine = Stremio.getAddonUrls(), mineNorm = mine.map(norm);
-            var shared = mine.filter(function (u) { var x = byNorm[norm(u)]; return x && x.enabled !== false; });
+            // Only what came from AIOManager is its to refresh or remove (am.synced: the ones a sync
+            // added); an addon you added yourself stays yours, even when AIOManager has it too.
+            function fromIt(u) { return am.synced.indexOf(norm(u)) !== -1; }
+            var shared = mine.filter(function (u) { var x = byNorm[norm(u)]; return fromIt(u) && x && x.enabled !== false; });
             var add = there.filter(function (x) { return x.enabled !== false && mineNorm.indexOf(norm(x.url)) === -1; });
-            var gone = mine.filter(function (u) { var x = byNorm[norm(u)]; return am.synced.indexOf(norm(u)) !== -1 && (!x || x.enabled === false); });
+            var gone = mine.filter(function (u) { var x = byNorm[norm(u)]; return fromIt(u) && (!x || x.enabled === false); });
             var items = [];
             if (shared.length) { items.push({ key: 'refresh', label: '↻ Refresh the ' + shared.length + ' addon' + (shared.length === 1 ? '' : 's') + ' you have from AIOManager' }); }
             add.forEach(function (x, i) { items.push({ key: 'add:' + i, label: '+ Add  ·  ' + U.drawable(x.name || shortHost(x.url)).slice(0, 50) + '  ·  ' + shortHost(x.url) }); });
@@ -741,18 +762,18 @@
                 var x = byNorm[norm(u)];
                 items.push({ key: 'rm:' + i, label: '− Remove  ·  ' + (x && x.name ? U.drawable(x.name).slice(0, 50) + '  ·  ' : '') + shortHost(u), note: x ? 'off in AIOManager' : 'gone from AIOManager' });
             });
-            function done(n) {
-                var keptUrls = Stremio.getAddonUrls().filter(function (u) { var x = byNorm[norm(u)]; return x && x.enabled !== false; });
-                keptUrls.forEach(function (u) { if (!Stremio.addonOrigin(u)) { Stremio.setAddonOrigin(u, 'aiomanager'); } });   // (yours that AIOManager has too: from it from now on)
+            function done(n, addedUrls) {   // what came from it: as before, and what this sync added (still in your list)
+                var now = (addedUrls || []).map(norm);
+                var keptUrls = Stremio.getAddonUrls().filter(function (u) { return fromIt(u) || now.indexOf(norm(u)) !== -1; });
                 aiomSave({ synced: keptUrls.map(norm), at: Date.now(), count: there.length });
                 if (n) { clearCatalogCache(); refreshAddonRows(null); }
                 renderSettings();
             }
             if (!items.length) { U.toast('Nothing to sync: AIOManager has no addons StremioK can use', 4000); done(0); return; }
             pickMany('Sync with AIOManager: tick what to do', items, { button: function (n) { return 'Apply ' + n; } }, function (keys) {
-                var added = 0, removed = 0, jobs = [];
+                var added = 0, removed = 0, addedUrls = [];
                 keys.forEach(function (k) {
-                    if (k.indexOf('add:') === 0) { var got = Stremio.addAddon(add[+k.slice(4)].url); if (got) { added++; Stremio.setAddonOrigin(got, 'aiomanager'); } }
+                    if (k.indexOf('add:') === 0) { var got = Stremio.addAddon(add[+k.slice(4)].url); if (got) { added++; addedUrls.push(got); Stremio.setAddonOrigin(got, 'aiomanager'); } }
                     else if (k.indexOf('rm:') === 0) { Stremio.removeAddon(gone[+k.slice(3)]); removed++; }
                 });
                 var refreshing = keys.indexOf('refresh') !== -1 ? shared.filter(function (u) { return Stremio.getAddonUrls().indexOf(u) !== -1; }) : [];
@@ -762,7 +783,7 @@
                     if (removed) { parts.push(removed + ' removed'); }
                     if (refreshing.length) { parts.push(refreshed + ' refreshed' + (refreshed < refreshing.length ? ' (' + (refreshing.length - refreshed) + ' didn’t answer)' : '')); }
                     U.toast('Synced: ' + (parts.join(', ') || 'nothing changed'), 4000);
-                    done(added + removed + refreshed);
+                    done(added + removed + refreshed, addedUrls);
                 });
             });
         }, function (e) {
@@ -848,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 = [];
@@ -856,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() : [];
@@ -888,10 +970,7 @@
                     renderSettings();
                 };
             }
-            var up = ctl(U.el('div', 'feed-btn focusable', '▲'), 'up');
-            up.__onselect = move(-1, 'up');
-            var down = ctl(U.el('div', 'feed-btn focusable', '▼'), 'down');
-            down.__onselect = move(1, 'down');
+            var btns = orderButtons(function (dir, name) { move(dir, name)(); }, ctl);
             var item = ctl(U.el('div', 'addon-item focusable playlist-item'), 'item');
             item.appendChild(U.el('div', 'a-name', label + (playlist.off ? '   (off)' : '')));
             item.appendChild(U.el('div', 'a-url', U.redactUrl(playlist.url)));   // (credentials masked)
@@ -903,13 +982,13 @@
                 _iptvFocus = { id: playlist.id, ctl: 'item' };
                 playlistActions(playlist, label);
             };
-            frow.appendChild(up);
-            frow.appendChild(down);
+            btns.forEach(function (b) { frow.appendChild(b); });
             frow.appendChild(item);
             wrap.appendChild(frow);
             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;
@@ -947,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.'));
@@ -1090,15 +1174,12 @@
         list.forEach(function (x) {
             var frow = U.el('div', 'feed-row playlist-row' + (x.off ? ' feed-off' : ''));
             function ctl(node, name) { node.setAttribute('data-pl', x.id); node.setAttribute('data-ctl', name); return node; }
-            var up = ctl(U.el('div', 'feed-btn focusable', '▲'), 'up');
-            up.__onselect = function () { if (YouTube.move(x.id, -1)) { ytChanged({ id: x.id, ctl: 'up' }); } };
-            var down = ctl(U.el('div', 'feed-btn focusable', '▼'), 'down');
-            down.__onselect = function () { if (YouTube.move(x.id, 1)) { ytChanged({ id: x.id, ctl: 'down' }); } };
+            var btns = orderButtons(function (dir, name) { if (YouTube.move(x.id, dir)) { ytChanged({ id: x.id, ctl: name }); } }, ctl);
             var item = ctl(U.el('div', 'addon-item focusable playlist-item yt-catalog'), 'item');
             item.appendChild(U.el('div', 'a-name', x.name + (x.off ? '   (off)' : '')));
             item.appendChild(U.el('div', 'a-url', ytDescribe(x)));
             item.__onselect = function () { ytActions(x); };
-            frow.appendChild(up); frow.appendChild(down); frow.appendChild(item);
+            btns.forEach(function (b) { frow.appendChild(b); }); frow.appendChild(item);
             wrap.appendChild(frow);
         });
 
@@ -1347,14 +1428,17 @@
     // unused fails the first time while it wakes up).
     var ADDON_WAITS = [['0', 'Normal (12 s; sources 15, search 25)'], ['20', '20 seconds'], ['30', '30 seconds'], ['45', '45 seconds'], ['60', '60 seconds']];
     var NEXT_CHOICES = [['0', 'Ask'], ['5', 'After 5 seconds'], ['10', 'After 10 seconds'], ['15', 'After 15 seconds'], ['30', 'After 30 seconds']];
-    // Seeking & buffering: how far LEFT / RIGHT jump; a bigger buffer for slow connections.
+    // Seeking & buffering: how far LEFT / RIGHT jump; a bigger buffer for slow connections; how
+    // often a live channel that drops is opened again.
+    var RECONNECTS = [['off', 'Off'], ['few', 'A few times (3 in 5 minutes)'], ['always', 'Keep trying']];
     function settingsSeeking(wrap) {
         wrap.appendChild(U.el('h2', null, 'Seeking & buffering'));
-        var store = { get: function () { var c = Player.playerCfg(); return { seek: '' + c.seek, buffer: c.buffer }; },
-            set: function (cfg) { Player.setPlayerCfg({ seek: +cfg.seek || 10, buffer: cfg.buffer }); } };
+        var store = { get: function () { var c = Player.playerCfg(); return { seek: '' + c.seek, buffer: c.buffer, reconnect: c.reconnect }; },
+            set: function (cfg) { Player.setPlayerCfg({ seek: +cfg.seek || 10, buffer: cfg.buffer, reconnect: cfg.reconnect }); } };
         wrap.appendChild(subPickRow('Seek step', [['5', '5 s'], ['10', '10 s'], ['15', '15 s'], ['30', '30 s']], 'seek', store));
         wrap.appendChild(subPickRow('Buffer', [['normal', 'Normal (the TV’s own)'], ['more', 'More'], ['most', 'Most']], 'buffer', store));
-        wrap.appendChild(U.el('div', 'hint', 'Seek step: how far LEFT / RIGHT jump (FF / REW jump three steps). Buffer: More or Most starts a little slower but stops less on a slow connection, from the next video you play.'));
+        wrap.appendChild(subPickRow('Reconnect live channels', RECONNECTS, 'reconnect', store));
+        wrap.appendChild(U.el('div', 'hint', 'Seek step: how far LEFT / RIGHT jump (FF / REW jump three steps). Buffer: More or Most starts a little slower but stops less on a slow connection, from the next video you play. Reconnect: a live channel that drops opens again; Keep trying waits a little longer each time (BACK stops it).'));
         focusSettings();
     }
     function settingsSkipping(wrap) {
@@ -1371,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 -----
@@ -1615,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++) {
@@ -1654,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');
@@ -1831,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); },
@@ -1962,7 +2045,20 @@
     var SOURCE_ROWS = { prefix: 'src:', off: 'off', keyOf: function (x) { return x.key; },
         move: function (k, d) { return Stremio.moveFeedSource(k, d); }, toggle: function (k) { Stremio.toggleFeedSource(k); },
         hidden: function (k) { return Stremio.isFeedSourceOff(k); } };
-    // ▲ / ▼ / name rows for an ordered list (L: keyOf, hidden, move, toggle, off, prefix).
+    // ⇈ ▲ ▼ ⇊ for a row of a list you put in order: to the top, one place up, one down, to the
+    // bottom. move(dir, ctl) moves it (dir -Infinity / -1 / 1 / Infinity: see U.moveIn); mark(node,
+    // ctl) tags each button, so the page can focus the one used once it's drawn again.
+    var ORDER_BTNS = [['top', '⇈', -Infinity], ['up', '▲', -1], ['down', '▼', 1], ['bottom', '⇊', Infinity]];
+    function orderButtons(move, mark) {
+        return ORDER_BTNS.map(function (b) {
+            var n = U.el('div', 'feed-btn focusable', b[1]);
+            if (mark) { mark(n, b[0]); }
+            n.__onselect = function () { move(b[2], b[0]); };
+            return n;
+        });
+    }
+    function ctlIndex(ctl) { for (var i = 0; i < ORDER_BTNS.length; i++) { if (ORDER_BTNS[i][0] === ctl) { return i; } } return 1; }
+    // ⇈ ▲ ▼ ⇊ / name rows for an ordered list (L: keyOf, hidden, move, toggle, off, prefix).
     // After a change the page is drawn again, focused on the control used (refeed).
     function feedRows(wrap, kind, items, L) {
         items.forEach(function (item) {
@@ -1970,20 +2066,14 @@
             var hidden = L.hidden(key);
             var frow = U.el('div', 'feed-row' + (hidden ? ' feed-off' : ''));
 
-            var up = U.el('div', 'feed-btn focusable', '▲');
-            up.setAttribute('data-fk', fk); up.setAttribute('data-ctl', 'up');
-            up.__onselect = function () { L.move(key, -1).then(function () { refeed(kind, fk, 'up'); }); };
-
-            var down = U.el('div', 'feed-btn focusable', '▼');
-            down.setAttribute('data-fk', fk); down.setAttribute('data-ctl', 'down');
-            down.__onselect = function () { L.move(key, 1).then(function () { refeed(kind, fk, 'down'); }); };
+            var btns = orderButtons(function (dir, ctl) { L.move(key, dir).then(function () { refeed(kind, fk, ctl); }); },
+                function (n, ctl) { n.setAttribute('data-fk', fk); n.setAttribute('data-ctl', ctl); });
 
             var name = U.el('div', 'feed-name focusable', item.name + (hidden ? '   (' + (L.off || 'hidden') + ')' : ''));
             name.setAttribute('data-fk', fk); name.setAttribute('data-ctl', 'name');
             name.__onselect = function () { L.toggle(key); refeed(kind, fk, 'name'); };
 
-            frow.appendChild(up);
-            frow.appendChild(down);
+            btns.forEach(function (b) { frow.appendChild(b); });
             frow.appendChild(name);
             wrap.appendChild(frow);
         });

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);

package/js/youtube.js

@@ -130,9 +130,7 @@ var YouTube = (function () {
     function move(id, dir) {
         var c = cfg(), i = -1;
         c.catalogs.forEach(function (x, n) { if (x.id === id) { i = n; } });
-        var j = i + dir;
-        if (i < 0 || j < 0 || j >= c.catalogs.length) { return false; }
-        var t = c.catalogs[i]; c.catalogs[i] = c.catalogs[j]; c.catalogs[j] = t;
+        if (!U.moveIn(c.catalogs, i, dir)) { return false; }   // (one place, or to the top / bottom)
         save(c);
         return true;
     }

package/js/ytplay.js

@@ -62,15 +62,28 @@ var YTPlay = (function () {
     }
     // A live HLS channel whose sound the TV's player stutters on (its server cuts the AAC sound
     // mid-frame): the service looks at it and, if so, gives a relay that repacks the sound:
-    // { fix, sure, why, url }. force: the relay at once (the channel's already known to need it).
-    // h: the channel's own User-Agent / Referer ({ ua, ref }).
-    function liveOpen(url, h, force) {
+    // { fix, sure, why, url, cc: [{ ch, lang }] (its closed captions), ccSure }. force: the relay
+    // at once (the channel's already known to need it). h: the channel's own User-Agent /
+    // Referer ({ ua, ref }). opts (with force): { fix: false (the sound as it is), cc: the caption
+    // channels to add as subtitle tracks }.
+    function liveOpen(url, h, force, opts) {
         if (MODE === 'browser') { return Promise.reject(new Error('no service')); }
+        var cc = opts && opts.cc ? opts.cc.map(function (c) { return c.ch + (c.lang ? '-' + c.lang : ''); }).join(',') : '';
         return ensureService().then(entryAuth).then(function (a) {
-            var q = '/live/open?u=' + encodeURIComponent(url) + (h && h.ua ? '&ua=' + encodeURIComponent(h.ua) : '') + (h && h.ref ? '&ref=' + encodeURIComponent(h.ref) : '') + (force ? '&force=1' : '');
+            var q = '/live/open?u=' + encodeURIComponent(url) + (h && h.ua ? '&ua=' + encodeURIComponent(h.ua) : '') + (h && h.ref ? '&ref=' + encodeURIComponent(h.ref) : '') + (force ? '&force=1' : '') +
+                (force && opts && opts.fix === false ? '&fix=0' : '') + (force && cc ? '&cc=' + encodeURIComponent(cc) : '');
             return U.getJSON(PROXY + q + a.q, force ? 5000 : 30000, 65536, null, a.h);
         });
     }
+    // An HLS stream's quality list, read by the service with the stream's own User-Agent /
+    // Referer (h: { ua, ref }), which a web page can't send: its text.
+    function hlsMaster(url, h) {
+        if (MODE === 'browser') { return Promise.reject(new Error('no service')); }
+        return ensureService().then(entryAuth).then(function (a) {
+            var q = '/live/master?u=' + encodeURIComponent(url) + (h && h.ua ? '&ua=' + encodeURIComponent(h.ua) : '') + (h && h.ref ? '&ref=' + encodeURIComponent(h.ref) : '');
+            return U.getText(PROXY + q + a.q, 12000, 524288, null, false, a.h);
+        });
+    }
     // An AIOManager account's addons (its Hydra API, through the service: an instance only
     // answers the web origins it's set to): { addons: [{ url, name, enabled }] }. base: its
     // address; key: the account's API key (a header, never in the link).
@@ -82,6 +95,50 @@ var YTPlay = (function () {
             return U.getJSON(PROXY + '/aiom/addons?base=' + encodeURIComponent(base) + a.q, 40000, 1048576, null, h);
         });
     }
+    // A playlist's TV guide, read and kept by the service (see service/index.js, epgControl):
+    // epgLoad asks it to read it for these channels (k: their keys as a bitset, EPG.bitsFor) ->
+    // { state, at, channels, programmes, partial, error }; epgGet: their programs -> { <key>:
+    // [[start, stop, title, desc]] }. Both POSTs, what's asked in the body: a newer TV's service
+    // reads 8 KB of a request's address and headers, less than thousands of channels' keys.
+    // (a POST refused, a service from before it took them or one without the token: asked
+    // again as a GET, when it fits in the address)
+    // An app that can't read the service's token (its header instead): the guide ticket, asked
+    // for once, given with the POSTs (the TV adds an Origin to them, which the header alone doesn't pass).
+    var _ticket = null;
+    function epgTicket(a) {
+        if (a.q || MODE === 'tizenbrew') { return Promise.resolve(a.q); }   // (the token; TizenBrew's origin passes as it is)
+        if (!_ticket) {
+            _ticket = U.getJSON(PROXY + '/epg/ticket', 8000, 4096, null, a.h).then(function (r) {
+                return r && /^[0-9a-f]{48}$/.test(r.ticket || '') ? '&ticket=' + r.ticket : '';
+            }, function () { _ticket = null; return ''; });
+        }
+        return _ticket;
+    }
+    function epgAsk(path, body, maxBytes) {
+        if (MODE === 'browser') { return Promise.reject(new Error('no service')); }
+        return ensureService().then(entryAuth).then(function (a) {
+            return epgTicket(a).then(function (cred) { return { a: a, cred: cred }; });
+        }).then(function (x) {
+            var a = x.a, q = x.cred ? '?' + x.cred.replace(/^&/, '') : '';
+            return U.postJSON(PROXY + path + q, body, 15000, maxBytes, a.h).then(null, function (err) {
+                if (err && /^HTTP 403\b/.test(err.message || '') && /ticket=/.test(q)) { _ticket = null; }   // (the service started again since: a new ticket next time)
+                if (!(err && /^HTTP (403|405)\b/.test(err.message || '') && body.length < 6000)) { throw err; }
+                return U.getJSON(PROXY + path + (q ? q + '&' : '?') + body, 15000, maxBytes, null, a.h);
+            });
+        });
+    }
+    // Settings › Storage: the saved guides ({ count, bytes }), and deleting them all.
+    function epgFiles() {
+        if (MODE === 'browser') { return Promise.resolve(null); }
+        return ensureService().then(entryAuth).then(function (a) { return U.getJSON(PROXY + '/epg/files' + (a.q ? '?' + a.q.replace(/^&/, '') : ''), 8000, 4096, null, a.h); });
+    }
+    function epgClear() { return epgAsk('/epg/clear', '', 4096); }
+    function epgLoad(u, k, force) {
+        return epgAsk('/epg/load', 'u=' + encodeURIComponent(u) + '&k=' + k + (force ? '&force=1' : ''), 65536);
+    }
+    function epgGet(u, keys, from, to, max) {
+        return epgAsk('/epg/get', 'u=' + encodeURIComponent(u) + '&ids=' + encodeURIComponent(keys.join('|')) + '&from=' + from + '&to=' + to + (max ? '&max=' + max : ''), 4194304);
+    }
     // Whether YouTube gives the video out to the service (it refuses some uploads to the player
     // the service asks as): false when it says no; true when it does, or no answer came (the
     // player tries). The service keeps what it found, so playing it next asks YouTube nothing new.
@@ -172,6 +229,6 @@ var YTPlay = (function () {
         return MODE === 'tizenbrew' ? 'TizenBrew module' : MODE === 'wgt' ? 'Sideloaded app (.wgt)' : 'Browser (development)';
     }
 
-    return { ensureService: ensureService, resolverUrl: resolverUrl, infoUrl: infoUrl, canPlay: canPlay, liveOpen: liveOpen, aiomAddons: aiomAddons, entryOpen: entryOpen, entryPoll: entryPoll, entryClose: entryClose, subsUrl: subsUrl, audioLang: audioLang, setAudioLang: setAudioLang, installMode: function () { return MODE; },
+    return { ensureService: ensureService, resolverUrl: resolverUrl, infoUrl: infoUrl, canPlay: canPlay, liveOpen: liveOpen, hlsMaster: hlsMaster, aiomAddons: aiomAddons, epgLoad: epgLoad, epgGet: epgGet, epgFiles: epgFiles, epgClear: epgClear, entryOpen: entryOpen, entryPoll: entryPoll, entryClose: entryClose, subsUrl: subsUrl, audioLang: audioLang, setAudioLang: setAudioLang, installMode: function () { return MODE; },
         installLabel: installLabel, unavailableMessage: unavailableMessage, isRunning: isRunning, port: PORT };
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stremiok",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "description": "StremioK streaming client for Tizen 3.0+ Samsung TVs (TizenBrew app module).",
   "packageType": "app",
   "appName": "StremioK",
@@ -14,6 +14,7 @@
     "icon.png",
     "config.xml",
     "README.md",
+    "CHANGELOG.md",
     "LICENSE"
   ],
   "keys": [