stremiok 2.1.0 → 2.2.1

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
@@ -99,11 +98,35 @@
     }
 
     // ================= SUBTITLE CONFIG =================
-    var SUB_LANGS = [['off', 'Off'], ['eng', 'English'], ['spa', 'Spanish'], ['fre', 'French'],
-        ['ger', 'German'], ['ita', 'Italian'], ['por', 'Portuguese'], ['dut', 'Dutch'],
-        ['rus', 'Russian'], ['ara', 'Arabic'], ['tur', 'Turkish'], ['pol', 'Polish']];
+    // Every language player-lang recognizes on a track (its LANG_ALIASES), by name.
+    var SUB_LANGS = [['off', 'Off'], ['afr', 'Afrikaans'], ['alb', 'Albanian'], ['ara', 'Arabic'],
+        ['arg', 'Aragonese'], ['arm', 'Armenian'], ['ast', 'Asturian'], ['aze', 'Azerbaijani'],
+        ['baq', 'Basque'], ['bel', 'Belarusian'], ['ben', 'Bengali'], ['bos', 'Bosnian'],
+        ['bre', 'Breton'], ['bul', 'Bulgarian'], ['bur', 'Burmese'], ['cat', 'Catalan'],
+        ['chi', 'Chinese'], ['hrv', 'Croatian'], ['cze', 'Czech'], ['dan', 'Danish'], ['prs', 'Dari'],
+        ['dut', 'Dutch'], ['eng', 'English'], ['epo', 'Esperanto'], ['est', 'Estonian'],
+        ['ext', 'Extremaduran'], ['fil', 'Filipino'], ['fin', 'Finnish'], ['fre', 'French'],
+        ['glg', 'Galician'], ['geo', 'Georgian'], ['ger', 'German'], ['gre', 'Greek'],
+        ['heb', 'Hebrew'], ['hin', 'Hindi'], ['hun', 'Hungarian'], ['ice', 'Icelandic'],
+        ['ibo', 'Igbo'], ['ind', 'Indonesian'], ['ina', 'Interlingua'], ['gle', 'Irish'],
+        ['ita', 'Italian'], ['jpn', 'Japanese'], ['kan', 'Kannada'], ['kaz', 'Kazakh'],
+        ['khm', 'Khmer'], ['kor', 'Korean'], ['kur', 'Kurdish'], ['lav', 'Latvian'],
+        ['lit', 'Lithuanian'], ['ltz', 'Luxembourgish'], ['mac', 'Macedonian'], ['may', 'Malay'],
+        ['mal', 'Malayalam'], ['mni', 'Manipuri'], ['mar', 'Marathi'], ['mon', 'Mongolian'],
+        ['mne', 'Montenegrin'], ['nav', 'Navajo'], ['nep', 'Nepali'], ['sme', 'Northern Sami'],
+        ['nor', 'Norwegian'], ['oci', 'Occitan'], ['ori', 'Odia'], ['pus', 'Pashto'],
+        ['per', 'Persian'], ['pol', 'Polish'], ['por', 'Portuguese'], ['pan', 'Punjabi'],
+        ['rum', 'Romanian'], ['rus', 'Russian'], ['sat', 'Santali'], ['gla', 'Scottish Gaelic'],
+        ['srp', 'Serbian'], ['snd', 'Sindhi'], ['sin', 'Sinhala'], ['slo', 'Slovak'],
+        ['slv', 'Slovenian'], ['som', 'Somali'], ['spa', 'Spanish'], ['swa', 'Swahili'],
+        ['swe', 'Swedish'], ['syr', 'Syriac'], ['tam', 'Tamil'], ['tat', 'Tatar'], ['tel', 'Telugu'],
+        ['tha', 'Thai'], ['tok', 'Toki Pona'], ['tur', 'Turkish'], ['tuk', 'Turkmen'],
+        ['ukr', 'Ukrainian'], ['urd', 'Urdu'], ['uzb', 'Uzbek'], ['vie', 'Vietnamese'],
+        ['wel', 'Welsh']];
     // A second choice, turned on when nothing is in the default language (from any source).
     var SUB_LANGS2 = [['none', 'None']].concat(SUB_LANGS.slice(1));
+    // The subtitle menu with only the three languages above (and tracks of no known language).
+    var SUB_ONLY = [['off', 'Off'], ['on', 'On']];
     var SUB_SIZES = [['small', 'Small'], ['medium', 'Medium'], ['large', 'Large'], ['xlarge', 'Extra Large']];
 
     function labelFor(list, v) {
@@ -207,14 +230,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 +362,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', subtitlelook: 'subtitles', rankfilters: 'ranking', rankplay: 'ranking' };
     Object.keys(SETTINGS_GROUPS).forEach(function (g) {
         SETTINGS_GROUPS[g].rows.forEach(function (row) { SECTION_PARENT[row[2]] = g; });
     });
@@ -364,11 +389,15 @@
         else if (_settingsSection === 'integrations') { settingsIntegrations(wrap); }
         else if (_settingsSection === 'audio') { settingsAudio(wrap); }
         else if (_settingsSection === 'subtitles') { settingsSubtitles(wrap); }
+        else if (_settingsSection === 'subtitlelook') { settingsSubtitleLook(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'); }
+        else if (_settingsSection === 'rankfilters') { settingsRankFilters(wrap); }
+        else if (_settingsSection === 'rankplay') { settingsRankPlay(wrap); }
         else if (SETTINGS_GROUPS[_settingsSection]) { settingsGroup(wrap, _settingsSection); }
         else if (_settingsSection === 'logs') { settingsLogs(wrap); }
         else if (_settingsSection === 'storage') { settingsStorage(wrap); }
@@ -867,6 +896,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 +913,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 +1015,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 +1053,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.'));
@@ -1330,14 +1426,7 @@
         wrap.appendChild(subPickRow('Default language', SUB_LANGS, 'lang'));
         wrap.appendChild(subPickRow('Second choice', SUB_LANGS2, 'lang2'));
         wrap.appendChild(subPickRow('Second subtitle (at the top)', SUB_LANGS, 'second'));
-        wrap.appendChild(subPickRow('Size', SUB_SIZES, 'size'));
-        // [id, label] for the picker (colors with a swatch)
-        function plain(list) { return list.map(function (x) { return [x[0], x[1]]; }); }
-        wrap.appendChild(subPickRow('Color', Player.SUB_COLORS.map(function (x) { return [x[0], x[1], null, x[2]]; }), 'color'));
-        wrap.appendChild(subPickRow('Background', plain(Player.SUB_BGS), 'bg'));
-        wrap.appendChild(subPickRow('Edge', plain(Player.SUB_EDGES), 'edge'));
-        wrap.appendChild(subPickRow('Position', plain(Player.SUB_POSITIONS), 'pos'));
-        wrap.appendChild(subPickRow('Font', Player.SUB_FONTS, 'font'));
+        wrap.appendChild(subPickRow('Only my languages', SUB_ONLY, 'only'));
         // lines to leave out: those with one of your words (a subtitle site's ads, a file's name…)
         var skip = Player.getSubCfg().skip || [];
         var sk = U.el('div', 'addon-item focusable cfg-row');
@@ -1350,6 +1439,21 @@
                 onConfirm: function (v) { var c = Player.getSubCfg(); c.skip = ('' + v).split(','); Player.setSubCfg(c); App.back(); renderSettings(); } });
         };
         wrap.appendChild(sk);
+        var look = sectionRow('Appearance  ›', 'Size, color, background, edge, position, font', 'subtitlelook');   // (their own page: settingsSubtitleLook)
+        wrap.appendChild(look);
+        if (_focusChild === 'subtitlelook') { _focusChild = null; Focus.setScope(scr('settings'), look); } else { focusSettings(); }
+    }
+    // Subtitles › Appearance: how subtitles look.
+    function settingsSubtitleLook(wrap) {
+        wrap.appendChild(U.el('h2', null, 'Subtitle appearance'));
+        wrap.appendChild(subPickRow('Size', SUB_SIZES, 'size'));
+        // [id, label] for the picker (colors with a swatch)
+        function plain(list) { return list.map(function (x) { return [x[0], x[1]]; }); }
+        wrap.appendChild(subPickRow('Color', Player.SUB_COLORS.map(function (x) { return [x[0], x[1], null, x[2]]; }), 'color'));
+        wrap.appendChild(subPickRow('Background', plain(Player.SUB_BGS), 'bg'));
+        wrap.appendChild(subPickRow('Edge', plain(Player.SUB_EDGES), 'edge'));
+        wrap.appendChild(subPickRow('Position', plain(Player.SUB_POSITIONS), 'pos'));
+        wrap.appendChild(subPickRow('Font', Player.SUB_FONTS, 'font'));
         focusSettings();
     }
 
@@ -1386,34 +1490,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 +1706,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 +1748,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 +1928,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); },
@@ -1860,7 +1963,7 @@
             list: function () { return Promise.resolve(Stremio.getRanking().criteria); }, keyOf: function (c) { return c.key; },
             move: function (k, d) { Stremio.moveRanking(k, d); return Promise.resolve(); }, toggle: function (k) { Stremio.toggleRanking(k); },
             hidden: function (k) { return !Stremio.getRanking().criteria.some(function (c) { return c.key === k && c.on; }); },
-            before: function (wrap) {   // played before, above the resolution groups
+            before: function (wrap) {   // played before, above the resolution groups; then the two pages
                 var played = Stremio.getRanking().played;
                 var r = U.el('div', 'addon-item focusable cfg-row feed-extra');
                 r.setAttribute('data-fk', 'played'); r.setAttribute('data-ctl', 'extra');
@@ -1869,48 +1972,9 @@
                     : 'Sources you played rank like any other') + '   ·   OK to turn ' + (played ? 'off' : 'on')));
                 r.__onselect = function () { Stremio.setPlayedFirst(!played); refeed('ranking', 'played', 'extra'); };
                 wrap.appendChild(r);
-                // direct links only: the sources the TV can't play left out of the list
-                var hideUn = Stremio.getPrefs().hideUnplayable;
-                var un = U.el('div', 'addon-item focusable cfg-row feed-extra');
-                un.setAttribute('data-fk', 'unplayable'); un.setAttribute('data-ctl', 'extra');
-                un.appendChild(U.el('div', 'a-name', 'Sources the TV can’t play:  ' + (hideUn ? 'Hidden' : 'Shown')));
-                un.appendChild(U.el('div', 'a-url', (hideUn ? 'Left out (torrents, links it can’t open): direct links only; where-to-watch apps stay'
-                    : 'Listed, dimmed, at the bottom (torrents, links it can’t open)') + '   ·   OK to ' + (hideUn ? 'show them' : 'hide them')));
-                un.__onselect = function () { Stremio.setPref('hideUnplayable', !hideUn); refeed('ranking', 'unplayable', 'extra'); };
-                wrap.appendChild(un);
-                // skip the source list: Play plays the top source at once
-                var skipList = Stremio.getPrefs().skipSourceList;
-                var sl = U.el('div', 'addon-item focusable cfg-row feed-extra');
-                sl.setAttribute('data-fk', 'skiplist'); sl.setAttribute('data-ctl', 'extra');
-                sl.appendChild(U.el('div', 'a-name', 'Skip the source list:  ' + (skipList ? 'On' : 'Off')));
-                sl.appendChild(U.el('div', 'a-url', (skipList ? '▶ Play, OK on an episode and ▶ Play SxEx play the top source at once (hold OK on an episode › Details for the list)'
-                    : '▶ Play and OK on an episode show the sources to pick from') + '   ·   OK to turn ' + (skipList ? 'off' : 'on')));
-                sl.__onselect = function () { Stremio.setPref('skipSourceList', !skipList); refeed('ranking', 'skiplist', 'extra'); };
-                wrap.appendChild(sl);
-                // a source that doesn't start: the next one
-                var nextOn = Stremio.getPrefs().nextOnFail;
-                var nx = U.el('div', 'addon-item focusable cfg-row feed-extra');
-                nx.setAttribute('data-fk', 'nextonfail'); nx.setAttribute('data-ctl', 'extra');
-                nx.appendChild(U.el('div', 'a-name', 'The next source if one doesn’t start:  ' + (nextOn ? 'On' : 'Off')));
-                nx.appendChild(U.el('div', 'a-url', (nextOn ? 'A source the TV refuses, or that hasn’t started after 45 s, gives way to the next best one (up to 3 more)'
-                    : 'A source that doesn’t start takes you back to the list') + '   ·   OK to turn ' + (nextOn ? 'off' : 'on')));
-                nx.__onselect = function () { Stremio.setPref('nextOnFail', !nextOn); refeed('ranking', 'nextonfail', 'extra'); };
-                wrap.appendChild(nx);
-                // size limits: movies and series apart
-                [['movie', 'Movies’ sizes'], ['series', 'Series’ sizes (an episode)']].forEach(function (k) { wrap.appendChild(sizeRow(k[0], k[1])); });
-                // your words: sources with one of them at the bottom, for every title
-                var words = Stremio.getPrefs().hideWords;
-                var w = U.el('div', 'addon-item focusable cfg-row feed-extra');
-                w.setAttribute('data-fk', 'words'); w.setAttribute('data-ctl', 'extra');
-                w.appendChild(U.el('div', 'a-name', 'Hide sources with these words:  ' + (words.length ? words.join(', ') : 'None')));
-                w.appendChild(U.el('div', 'a-url', 'A source with one of them in its name, description or file name (a whole word: “CAM” isn’t in “CAMERA”) goes to the bottom, for every title   ·   OK to change'));
-                w.__onselect = function () {
-                    App.openEntry({ title: 'Hide sources with these words', value: words.join(', '), placeholder: 'CAM, HDTS, TELESYNC',
-                        hint: 'Words separated by commas, capitals or not. Sources with one go to the bottom and are never picked on their own. Leave it empty for none.',
-                        validate: function () { return null; },
-                        onConfirm: function (v) { App.back(); Stremio.setHideWords(v); refeed('ranking', 'words', 'extra'); } });
-                };
-                wrap.appendChild(w);
+                wrap.appendChild(rankPageRow('Filters  ›', filtersSummary(), 'rankfilters'));
+                wrap.appendChild(rankPageRow('When you press Play  ›', onPlaySummary(), 'rankplay'));
+                if (_focusChild === 'rankfilters' || _focusChild === 'rankplay') { _feedFocus = { key: _focusChild, ctl: 'extra' }; _focusChild = null; }   // (BACK from one: on its row)
                 wrap.appendChild(U.el('div', 'formats-group', 'Then, in this order'));
             },
             after: function (wrap) {
@@ -1929,7 +1993,94 @@
                 }, function () { wrap.appendChild(U.el('div', 'hint', 'Your addons couldn\'t be read just now.')); });
             } }
     };
-    // Size limits (Settings › Source ranking): smallest, largest and most per hour, for movies or
+    // Source ranking's two pages (rankfilters, rankplay): a row on it that opens one, saying
+    // what's set there.
+    function rankPageRow(title, summary, section) {
+        var r = U.el('div', 'addon-item focusable cfg-row feed-extra');
+        r.setAttribute('data-fk', section); r.setAttribute('data-ctl', 'extra');
+        r.appendChild(U.el('div', 'a-name', title));
+        r.appendChild(U.el('div', 'a-url', summary));
+        r.__onselect = function () { _settingsSection = section; renderSettings(); };
+        return r;
+    }
+    function filtersSummary() {
+        var P = Stremio.getPrefs(), bits = ['Sources the TV can’t play: ' + (P.hideUnplayable ? 'Hidden' : 'Shown')], sizes = [];
+        [['movie', 'Movies'], ['series', 'Series']].forEach(function (k) { var L = P.sizeLimits[k[0]]; if (L.min || L.max || L.perHour) { sizes.push(k[1] + ' ' + sizeSummary(L)); } });
+        bits.push(sizes.length ? sizes.join(', ') : 'No size limits');
+        bits.push(P.hideWords.length ? 'Words: ' + P.hideWords.join(', ') : 'No words');
+        return bits.join('   ·   ');
+    }
+    function onPlaySummary() {
+        var P = Stremio.getPrefs();
+        return 'Source list: ' + (P.skipSourceList ? 'skipped' : 'shown') + '   ·   The next source if one doesn’t start: ' + (P.nextOnFail ? 'On' : 'Off');
+    }
+    // A page of its own: its title, a hint, its rows; focus back on the one just changed.
+    function rankPage(wrap, title, hint, rows) {
+        wrap.appendChild(U.el('h2', null, 'Playback  ›  Source ranking  ›  ' + title));
+        wrap.appendChild(U.el('div', 'hint feeds-hint', hint));
+        rows.forEach(function (r) { wrap.appendChild(r); });
+        var pref = null;
+        if (_feedFocus) { pref = rows.filter(function (r) { return r.getAttribute('data-fk') === _feedFocus.key; })[0] || null; _feedFocus = null; }
+        Focus.setScope(scr('settings'), pref || rows[0]);
+    }
+    // Filters: what's left out, or sent to the bottom.
+    function settingsRankFilters(wrap) {
+        rankPage(wrap, 'Filters', 'Sources these leave out, or send to the bottom of the list: never picked on their own.',
+            [unplayableRow(), sizeRow('movie', 'Movies’ sizes'), sizeRow('series', 'Series’ sizes (an episode)'), wordsRow()]);
+    }
+    // When you press Play: whether the list shows, and a source that doesn't start.
+    function settingsRankPlay(wrap) {
+        rankPage(wrap, 'When you press Play', 'What ▶ Play does with the ranked list.', [skipListRow(), nextOnFailRow()]);
+    }
+    // direct links only: the sources the TV can't play left out of the list
+    function unplayableRow() {
+        var hideUn = Stremio.getPrefs().hideUnplayable;
+        var un = U.el('div', 'addon-item focusable cfg-row feed-extra');
+        un.setAttribute('data-fk', 'unplayable'); un.setAttribute('data-ctl', 'extra');
+        un.appendChild(U.el('div', 'a-name', 'Sources the TV can’t play:  ' + (hideUn ? 'Hidden' : 'Shown')));
+        un.appendChild(U.el('div', 'a-url', (hideUn ? 'Left out (torrents, links it can’t open): direct links only; where-to-watch apps stay'
+            : 'Listed, dimmed, at the bottom (torrents, links it can’t open)') + '   ·   OK to ' + (hideUn ? 'show them' : 'hide them')));
+        un.__onselect = function () { Stremio.setPref('hideUnplayable', !hideUn); refeed('ranking', 'unplayable', 'extra'); };
+        return un;
+    }
+    // skip the source list: Play plays the top source at once
+    function skipListRow() {
+        var skipList = Stremio.getPrefs().skipSourceList;
+        var sl = U.el('div', 'addon-item focusable cfg-row feed-extra');
+        sl.setAttribute('data-fk', 'skiplist'); sl.setAttribute('data-ctl', 'extra');
+        sl.appendChild(U.el('div', 'a-name', 'Skip the source list:  ' + (skipList ? 'On' : 'Off')));
+        sl.appendChild(U.el('div', 'a-url', (skipList ? '▶ Play, OK on an episode and ▶ Play SxEx play the top source at once (hold OK on an episode › Details for the list)'
+            : '▶ Play and OK on an episode show the sources to pick from') + '   ·   OK to turn ' + (skipList ? 'off' : 'on')));
+        sl.__onselect = function () { Stremio.setPref('skipSourceList', !skipList); refeed('ranking', 'skiplist', 'extra'); };
+        return sl;
+    }
+    // a source that doesn't start: the next one
+    function nextOnFailRow() {
+        var nextOn = Stremio.getPrefs().nextOnFail;
+        var nx = U.el('div', 'addon-item focusable cfg-row feed-extra');
+        nx.setAttribute('data-fk', 'nextonfail'); nx.setAttribute('data-ctl', 'extra');
+        nx.appendChild(U.el('div', 'a-name', 'The next source if one doesn’t start:  ' + (nextOn ? 'On' : 'Off')));
+        nx.appendChild(U.el('div', 'a-url', (nextOn ? 'A source the TV refuses, or that hasn’t started after 45 s, gives way to the next best one (up to 3 more)'
+            : 'A source that doesn’t start takes you back to the list') + '   ·   OK to turn ' + (nextOn ? 'off' : 'on')));
+        nx.__onselect = function () { Stremio.setPref('nextOnFail', !nextOn); refeed('ranking', 'nextonfail', 'extra'); };
+        return nx;
+    }
+    // your words: sources with one of them at the bottom, for every title
+    function wordsRow() {
+        var words = Stremio.getPrefs().hideWords;
+        var w = U.el('div', 'addon-item focusable cfg-row feed-extra');
+        w.setAttribute('data-fk', 'words'); w.setAttribute('data-ctl', 'extra');
+        w.appendChild(U.el('div', 'a-name', 'Hide sources with these words:  ' + (words.length ? words.join(', ') : 'None')));
+        w.appendChild(U.el('div', 'a-url', 'A source with one of them in its name, description or file name (a whole word: “CAM” isn’t in “CAMERA”) goes to the bottom, for every title   ·   OK to change'));
+        w.__onselect = function () {
+            App.openEntry({ title: 'Hide sources with these words', value: words.join(', '), placeholder: 'CAM, HDTS, TELESYNC',
+                hint: 'Words separated by commas, capitals or not. Sources with one go to the bottom and are never picked on their own. Leave it empty for none.',
+                validate: function () { return null; },
+                onConfirm: function (v) { App.back(); Stremio.setHideWords(v); refeed('ranking', 'words', 'extra'); } });
+        };
+        return w;
+    }
+    // Size limits (Settings › Source ranking › Filters): smallest, largest and most per hour, for movies or
     // series; OK on the row: which one, then its value.
     var SIZE_CHOICES = {
         min: { label: 'Smallest', none: 'None', values: [0.1, 0.3, 0.5, 1, 2] },

package/js/views.js

@@ -7,13 +7,14 @@ var Views = (function (V) {
     return {
         renderHome: V.renderHome, renderDetail: V.renderDetail, applyAppearance: V.applyAppearance,
         renderPerson: V.renderPerson, detailSnapshot: V.detailSnapshot, restoreDetail: V.restoreDetail, lightSnapshot: V.lightSnapshot, renderSettings: V.renderSettings,
-        settingsRoot: V.settingsRoot, backInSettings: V.backInSettings,
+        settingsRoot: V.settingsRoot, backInSettings: V.backInSettings, guideBackOn: V.guideBackOn,
         // a screen left: its downloads still running (a title page's details, Discover's
         // 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/ytplay.js

@@ -62,12 +62,16 @@ 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);
         });
     }
@@ -91,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.
@@ -181,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, hlsMaster: hlsMaster, 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.1.0",
+  "version": "2.2.1",
   "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": [