stremiok 2.2.0 → 2.2.2

package/js/view-settings.js

@@ -98,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) {
@@ -169,9 +193,13 @@
         var bgs = { dark: 1, black: 1, gray: 1, white: 1 };
         return { accent: ACCENT_NAMES[accent] ? accent : 'indigo', bg: bgs[bg] ? bg : 'dark' };
     }
+    // Zoom: everything bigger (see U.setZoom), in percent.
+    var ZOOMS = [['100', '100%'], ['110', '110%'], ['120', '120%'], ['130', '130%'], ['140', '140%']];
+    function zoomPct() { return Stremio.getPrefs().zoom; }
     function applyAppearance() {
         var a = appearance();
         U.applyTheme(a.accent, a.bg);
+        U.setZoom(zoomPct() / 100);
     }
     function settingsAppearance(wrap) {
         var store = { get: appearance, set: function (cfg) {
@@ -183,6 +211,10 @@
         wrap.appendChild(U.el('h2', null, 'Appearance'));
         wrap.appendChild(subPickRow('Background', BACKGROUNDS, 'bg', store));
         wrap.appendChild(subPickRow('Accent color', accents, 'accent', store));
+        wrap.appendChild(subPickRow('Zoom', ZOOMS, 'zoom', {
+            get: function () { return { zoom: '' + zoomPct() }; },
+            set: function (cfg) { Stremio.setPref('zoom', +cfg.zoom); applyAppearance(); }
+        }));
         wrap.appendChild(subPickRow('Poster orientation', POSTER_SHAPES, 'posterShape', {
             get: function () { return { posterShape: Stremio.getPrefs().posterShape }; },
             set: function (cfg) { Stremio.setPref('posterShape', cfg.posterShape); markHomeDirty(); }   // Home redraws on return
@@ -314,6 +346,7 @@
     var SETTINGS_GROUPS = {
         content: { title: 'Content', rows: [
             ['Addons', 'Catalog, stream & subtitle addons', 'addons'],
+            ['Streaming server', 'Stremio’s streaming server or TorrServer on your network: torrents, and videos the TV can’t play', 'server'],
             ['Integrations', 'API keys (OMDb, TMDB, MDBList), where-to-watch country', 'integrations'],
             ['IPTV', 'Manage M3U playlist URLs', 'iptv'],
             ['YouTube', 'Your YouTube channels, playlists and searches; YouTube in Search', 'youtube'],
@@ -338,7 +371,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 = { menuorder: 'appearance', 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; });
     });
@@ -365,12 +398,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); }
@@ -380,6 +416,7 @@
         else if (_settingsSection === 'appshortcuts') { settingsAppShortcuts(wrap); }
         else if (_settingsSection === 'import') { settingsImport(wrap); }
         else if (_settingsSection === 'aiomanager') { settingsAiom(wrap); }
+        else if (_settingsSection === 'server') { settingsServer(wrap); }
         else if (_settingsSection === 'appearance') { settingsAppearance(wrap); }
         else if (_settingsSection === 'formats') { settingsFormats(wrap); }
         else { settingsMenu(wrap); }
@@ -422,7 +459,7 @@
         wrap.appendChild(U.el('h2', null, 'Settings'));
         wrap.appendChild(sectionRow('Content', 'Addons, API keys, IPTV playlists, streaming apps, importing a configuration file', 'content'));
         wrap.appendChild(sectionRow('Playback', 'Audio and subtitles, source ranking, feed sources, formats', 'playback'));
-        wrap.appendChild(sectionRow('Appearance', 'Background, accent color, poster orientation, Home feeds, Search results', 'appearance'));
+        wrap.appendChild(sectionRow('Appearance', 'Background, accent color, zoom, poster orientation, Home feeds, Search results', 'appearance'));
         wrap.appendChild(sectionRow('Diagnostics', 'Logs, storage, installed apps; how StremioK was installed', 'diagnostics'));
         if (typeof YTPlay !== 'undefined' && YTPlay.installMode && YTPlay.installMode() === 'tizenbrew') { wrap.appendChild(U.el('div', 'hint', TIZENBREW_NOTE)); }
         focusBack(wrap);
@@ -945,6 +982,60 @@
             }
         });
     }
+    // Streaming server: Stremio's or TorrServer, on your network (see Stremio.server). Picking one
+    // asks for its address; Test says whether it answers.
+    var SERVERS = [['', 'Off'], ['stremio', 'Stremio server'], ['torrserver', 'TorrServer']];
+    var SERVER_PORT = { stremio: 11470, torrserver: 8090 };
+    var TORRENT_WAITS = [['45', '45 seconds'], ['60', '1 minute'], ['120', '2 minutes'], ['180', '3 minutes'], ['300', '5 minutes']];
+    function askServerAddress(kind, url) {
+        var eg = 'http://192.168.0.10:' + SERVER_PORT[kind];
+        App.openEntry({
+            title: (kind === 'stremio' ? 'Stremio server' : 'TorrServer') + ': address',
+            hint: 'Its address on your network, like ' + eg + '. RETURN cancels.',
+            value: url || 'http://', placeholder: eg, phone: 'server',
+            validate: function (v) { return Stremio.serverAddressProblem(v); },
+            onConfirm: function (v) { Stremio.setServer({ kind: kind, url: v }); App.back(); renderSettings(); }
+        });
+    }
+    function settingsServer(wrap) {
+        wrap.appendChild(U.el('h2', null, 'Streaming server'));
+        wrap.appendChild(U.el('div', 'hint', 'Torrent-only sources play through it; Stremio’s can also convert a video the TV can’t play.'));
+        var sv = Stremio.server();
+        wrap.appendChild(subPickRow('Server', SERVERS, 'kind', {
+            get: function () { return { kind: Stremio.server().kind }; },
+            set: function (cfg) {
+                var cur = Stremio.server();
+                if (!cfg.kind) { Stremio.setServer({ kind: '' }); renderSettings(); return; }
+                askServerAddress(cfg.kind, cur.kind === cfg.kind ? cur.url : '');
+            }
+        }));
+        if (!sv.kind) { return; }
+        var addr = U.el('div', 'addon-item focusable cfg-row');
+        addr.appendChild(U.el('div', 'a-name', 'Address:  ' + sv.url));
+        addr.appendChild(U.el('div', 'a-url', 'Press OK to change'));
+        addr.__onselect = function () { askServerAddress(sv.kind, sv.url); };
+        wrap.appendChild(addr);
+        var test = U.el('div', 'addon-item focusable cfg-row'), said = U.el('div', 'a-url', 'Press OK to see whether it answers');
+        test.appendChild(U.el('div', 'a-name', 'Test'));
+        test.appendChild(said);
+        test.__onselect = function () {
+            said.textContent = 'Asking…';
+            Stremio.testServer().then(function (r) { said.textContent = (r.ok ? '✓ ' : '✗ ') + r.text; });
+        };
+        wrap.appendChild(test);
+        wrap.appendChild(subPickRow('Wait for a torrent to start', TORRENT_WAITS, 'wait', {
+            get: function () { return { wait: '' + Stremio.server().wait }; },
+            set: function (cfg) { Stremio.setServer({ kind: Stremio.server().kind, wait: +cfg.wait }); }
+        }));
+        if (sv.kind === 'stremio') {
+            wrap.appendChild(subPickRow('Convert videos the TV can’t play', [['on', 'On'], ['off', 'Off']], 'convert', {
+                get: function () { return { convert: Stremio.server().convert ? 'on' : 'off' }; },
+                set: function (cfg) { Stremio.setServer({ kind: 'stremio', convert: cfg.convert === 'on' }); }
+            }));
+        }
+    }
+
+    var IPTV_EVERY = [['0', 'Off'], ['1', 'Every hour'], ['3', 'Every 3 hours'], ['6', 'Every 6 hours'], ['12', 'Every 12 hours']];
     function settingsIptv(wrap) {
         wrap.appendChild(U.el('h2', null, 'IPTV'));
         var playlists = Stremio.iptvGetPlaylists ? Stremio.iptvGetPlaylists() : [];
@@ -1031,6 +1122,10 @@
         xt.appendChild(U.el('div', 'a-url', 'Its server, username and password: its channels and TV guide added'));
         xt.__onselect = addXtream;
         wrap.appendChild(xt);
+        if (playlists.length && Stremio.iptvRefreshEvery) {   // (all of them, with their guides, as Reload does)
+            wrap.appendChild(subPickRow('Auto-refresh', IPTV_EVERY, 'every',
+                { get: function () { return { every: String(Stremio.iptvRefreshEvery()) }; }, set: function (c) { Stremio.iptvSetRefreshEvery(+c.every); } }));
+        }
 
         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.'));
@@ -1399,14 +1494,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');
@@ -1419,6 +1507,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();
     }
 
@@ -1928,7 +2031,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');
@@ -1937,48 +2040,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) {
@@ -1997,7 +2061,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,14 +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, 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, confirm: V.confirm, moveKey: V.moveKey, availableTabs: V.availableTabs,
         menuItems: V.menuItems, menuOrder: V.menuOrder, moveMenuItem: V.moveMenuItem
     };
 })(ViewParts);

package/js/ytplay.js

@@ -65,14 +65,15 @@ var YTPlay = (function () {
     // { 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) {
+    // channels to add as subtitle tracks }. cancel (a U.cancelToken): the look stopped, the
+    // service's downloads with it (another channel, the player closed).
+    function liveOpen(url, h, force, opts, cancel) {
         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' : '') +
                 (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);
+            return U.getJSON(PROXY + q + a.q, force ? 5000 : 30000, 65536, cancel || null, a.h);
         });
     }
     // An HLS stream's quality list, read by the service with the stream's own User-Agent /

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stremiok",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "StremioK streaming client for Tizen 3.0+ Samsung TVs (TizenBrew app module).",
   "packageType": "app",
   "appName": "StremioK",
@@ -28,6 +28,7 @@
     "MediaTrackNext",
     "ChannelUp",
     "ChannelDown",
+    "Guide",
     "ColorF0Red",
     "ColorF1Green",
     "ColorF2Yellow",

package/service/index.js

@@ -1589,6 +1589,29 @@ function openPart(fs, part, append, cb) {
         });
     });
 }
+// A partial download's version tag (ETag / Last-Modified), for resuming it after a restart: kept
+// in StremioK's own folder by the partial file's path (DL_VALIDATORS at most, the oldest dropped),
+// never on the drive, where a prepared file could be a link elsewhere (read: its contents sent
+// as If-Range; written: overwritten). None to keep it in (TizenBrew): downloads are closed there.
+var DL_VALIDATORS = 64;
+function dlValFile() { var d = tokenDir(); return d ? d + '/dl-validators.json' : null; }
+function dlValAll() {
+    var f = dlValFile(), o = null;
+    if (!f) { return {}; }
+    try { o = JSON.parse(require('fs').readFileSync(f, 'utf8')); } catch (e) { o = null; }
+    return o && typeof o === 'object' && !Array.isArray(o) ? o : {};
+}
+function dlValGet(part) { var v = dlValAll()[part]; return typeof v === 'string' ? v.slice(0, 300) : ''; }
+function dlValSet(part, v) {
+    var f = dlValFile();
+    if (!f) { return; }
+    var all = dlValAll();
+    delete all[part];
+    if (v) { all[part] = String(v).slice(0, 300); }
+    var keys = Object.keys(all);
+    while (keys.length > DL_VALIDATORS) { delete all[keys.shift()]; }
+    try { require('fs').writeFileSync(f, JSON.stringify(all), { mode: 384 }); } catch (e) { log('download version not kept: ' + (e && (e.code || e.message))); }
+}
 function dlRun(e) {
     var fs = require('fs'), part = e.dir + '/' + e.name + '.part';
     e.state = 'downloading'; e.err = '';
@@ -1601,17 +1624,17 @@ function dlRun(e) {
     fs.mkdir(e.dir, function () {
         fsRealOk(e.dir, function (bad) {
             if (bad) { dlEnd(e, 'failed', 'the folder: ' + bad.message); return; }
-            fs.stat(part, function (se, st) {
+            fs.lstat(part, function (se, st) {   // (not through a link: a partial file is a regular one, see openPart)
+                if (!se && !st.isFile()) { dlEnd(e, 'failed', 'the partial file isn\'t a regular file'); return; }
                 var have = se ? 0 : st.size;
                 if (!have || e.answered) { get(e.url, 0, have); return; }   // (this one's own, from this run: picked up as it was)
-                fs.readFile(part + '.v', 'utf8', function (ve, v) {   // (a partial file from before a restart: resumed only with its validator)
-                    e.validator = ve ? '' : String(v).trim().slice(0, 300);
-                    if (e.validator) { get(e.url, 0, have); } else { dropPart(function () { get(e.url, 0, 0); }); }
-                });
+                e.validator = dlValGet(part);   // (a partial file from before a restart: resumed only with its version kept)
+                if (e.validator) { get(e.url, 0, have); } else { dropPart(function () { get(e.url, 0, 0); }); }
             });
         });
     });
-    function dropPart(then) { fs.unlink(part + '.v', function () { fs.unlink(part, function () { then(); }); }); }
+    // (….part.v: where 2.1.17–2.2.1 kept the version, removed; a link removed, not what it points to)
+    function dropPart(then) { dlValSet(part, ''); fs.unlink(part + '.v', function () { fs.unlink(part, function () { then(); }); }); }
     function get(u, hops, have) {
         if (e.state !== 'downloading') { return; }
         var pu = urllib.parse(u), mod = pu.protocol === 'https:' ? https : http;
@@ -1647,7 +1670,7 @@ function dlRun(e) {
             if (!resumed) {   // (asked again on a resume: If-Range; kept beside the partial file, for one after a restart)
                 var et = resp.headers.etag;
                 e.validator = et && !/^W\//.test(et) ? et : (resp.headers['last-modified'] || '');
-                fs.writeFile(part + '.v', e.validator, { mode: 384 }, function () {});
+                dlValSet(part, e.validator);
             }
             if (isPlaylistAnswer(resp.headers['content-type'], '')) { resp.resume(); closed = true; dlEnd(e, 'failed', 'a streamed playlist (HLS or DASH), not a file: it can\'t be downloaded'); return; }
             var total = 0, cr = /\/(\d+)\s*$/.exec(resp.headers['content-range'] || '');
@@ -1715,7 +1738,7 @@ function dlRun(e) {
                     fs.rename(part, final, function (re) {
                         if (re) { dlEnd(e, 'failed', 'couldn\'t finish the file: ' + (re.code || re.message)); return; }
                         e.name = final.split('/').pop(); e.tries = 0;
-                        fs.unlink(part + '.v', function () {});
+                        dlValSet(part, ''); fs.unlink(part + '.v', function () {});
                         dlEnd(e, 'done');
                     });
                 });
@@ -3057,7 +3080,8 @@ function epgControl(req, res, path, query) {
 var ENTRY_PORT = PORT + 10, ENTRY_MS = 5 * 60 * 1000, ENTRY_IDLE_MS = 30000, ENTRY_MAX = 8192;
 var ENTRY_OPEN_MAX = 2, ENTRY_OPENS = 12, ENTRY_CONNECTIONS = 8, ENTRY_VISIT_MS = 20000, ENTRY_QUIET_MS = 10000;
 var ENTRY_TITLES = { link: 'Play a link on StremioK', addon: 'Add an addon to StremioK', playlist: 'Add an IPTV playlist to StremioK', config: 'Import a configuration file into StremioK',
-    search: 'Search on StremioK', youtube: 'Add a YouTube catalog to StremioK', aiom: 'Your AIOManager address for StremioK', aiomkey: 'Your AIOManager API key for StremioK' };
+    search: 'Search on StremioK', youtube: 'Add a YouTube catalog to StremioK', aiom: 'Your AIOManager address for StremioK', aiomkey: 'Your AIOManager API key for StremioK',
+    server: 'Your streaming server’s address for StremioK' };
 var ENTRY_TEXT = { search: 'Words to search for', youtube: 'A channel, a playlist link, or words to search YouTube for', aiomkey: 'Your account API key' };   // (plain text, not a link)
 var _entries = Object.create(null), _entryServer = null, _entrySockets = [], _entryOpened = [];
 function lanAddress() {