stremiok 2.2.1 → 2.2.2

package/js/view-core.js

@@ -24,8 +24,9 @@ var ViewParts = {};
     var _modalPrevFocus = null;
     var _modalScope = null;
 
-    // opts (optional): { noLabel, onNo, plain } — another label and an action for the other
-    // button; plain: the confirm button not marked as destructive.
+    // opts (optional): { noLabel, onNo, plain, focusYes } — another label and an action for the
+    // other button; plain: the confirm button not marked as destructive; focusYes: focus starts on
+    // it (not on Cancel).
     function confirm(message, confirmLabel, onYes, opts) {
         opts = opts || {};
         // defensive: never stack modals
@@ -45,7 +46,7 @@ var ViewParts = {};
         overlay.appendChild(box);
         document.body.appendChild(overlay);
 
-        showModal(overlay, no);   // default to Cancel (safe)
+        showModal(overlay, opts.focusYes ? yes : no);   // default to Cancel (safe)
     }
 
     // A QR code for the phone (an addon's link or setup page): the code holds the whole link;
@@ -511,10 +512,13 @@ var ViewParts = {};
             else if (m.key === 'discover') { item('tab-pill', 'discover', 'Discover', '🔭', function () { App.openDiscover(); }, tabbar); }
             else if (m.key === 'search') { item('hchip', 'search', 'Search', '🔍', function () { App.openSearch(); }, tabbar); }
         });
-        head.appendChild(tabbar);
-        item('hchip', 'settings', 'Settings', '⚙', function () { App.openSettings(); }, head);
-
-        head.appendChild(U.el('div', 'spacer'));
+        // The items in one strip that scrolls sideways when they don't all fit (Focus keeps the
+        // focused one in view); the StremioK name outside it, at the right.
+        var strip = U.el('div', 'menu-scroll');
+        strip.appendChild(tabbar);
+        item('hchip', 'settings', 'Settings', '⚙', function () { App.openSettings(); }, strip);
+        head.appendChild(strip);
+        setTimeout(function () { showActiveItem(strip); }, 0);   // (once it's on screen)
         var brand = U.el('div', 'brand');
         brand.innerHTML = 'Stremio<span class="dot">K</span>';
         if (Player.isPrivate && Player.isPrivate()) { brand.className += ' private'; }   // (private viewing on: drawn as an outline)
@@ -522,6 +526,15 @@ var ViewParts = {};
         return head;
     }
 
+    // The page's own item scrolled into view (one picked by number, far to the right), with
+    // room for a neighbour on either side; focus may be on the page below.
+    function showActiveItem(strip) {
+        var a = strip.querySelector('.active'), w = strip.clientWidth, mx = 90;
+        if (!a || !w) { return; }
+        if (a.offsetLeft < strip.scrollLeft + mx) { strip.scrollLeft = Math.max(0, a.offsetLeft - mx); }
+        else if (a.offsetLeft + a.offsetWidth > strip.scrollLeft + w - mx) { strip.scrollLeft = a.offsetLeft + a.offsetWidth - w + mx; }
+    }
+
     // DOWN from the top menu returns to where focus was before going UP (if it's still
     // on screen), else the first focusable in the content area below the menu.
     function focusBelowTop(head) {
@@ -534,7 +547,7 @@ var ViewParts = {};
         var all = s.querySelectorAll('.focusable');
         for (var i = 0; i < all.length; i++) {
             var r = all[i].getBoundingClientRect();
-            if (r.height > 0 && r.top > 80) { Focus.setFocus(all[i]); return true; }
+            if (r.height > 0 && r.top > 80 * U.zoom()) { Focus.setFocus(all[i]); return true; }   // (below the menu: on screen, zoomed)
         }
         return false;
     }
@@ -639,17 +652,32 @@ var ViewParts = {};
             redrawGuideCards();
         }, 60000);
     }
+    // A hold-OK menu that waits for something first (a channel's schedule, a title's details):
+    // shown only if, when it comes, you're still where you held it: the card in the page, its
+    // screen not hidden (Settings or a title opened meanwhile; Home stays in the page, hidden),
+    // no player, no other menu up, and no hold since (that one's). -> { still(), latest() }
+    var _holdGen = 0;
+    function holdNow(card) {
+        var gen = ++_holdGen, screen = null;
+        for (var n = card; n && !screen; n = n.parentNode) { if (/\bscreen\b/.test(n.className || '')) { screen = n; } }
+        return {
+            latest: function () { return gen === _holdGen; },
+            still: function () {
+                return gen === _holdGen && !!card && document.documentElement.contains(card) && (!screen || !/\bhidden\b/.test(screen.className)) &&
+                    !(typeof Player !== 'undefined' && Player.isActive()) && !isModalOpen();
+            }
+        };
+    }
     // Hold OK on a channel card: ▶ Watch now, ★ Add to / Remove from favorites, and its schedule
     // from 2 hours ago to tomorrow (what's on now marked, and picked); OK on a program says
     // what it is. A channel without a guide: the first two.
-    var _schedGen = 0;
     function liveSchedule(meta, card) {
-        var gen = ++_schedGen;
+        var hold = holdNow(card);
         U.spinner(true);
         EPG.schedule(meta.id).then(null, function () { return []; }).then(function (list) {
-            if (gen !== _schedGen) { return; }   // (held on another card since: its own)
+            if (!hold.latest()) { return; }   // (held on another card since: its own)
             U.spinner(false);
-            if (!document.documentElement.contains(card) || (typeof Player !== 'undefined' && Player.isActive())) { return; }   // (left meanwhile)
+            if (!hold.still()) { return; }   // (left meanwhile)
             var fav = IPTV.isFavorite(meta.id), t = Date.now() / 1000, at = 'play';
             var items = [['play', '▶  Watch now'], ['fav', fav ? '★  Remove from favorites' : '★  Add to favorites']];
             list.forEach(function (p, i) {
@@ -686,10 +714,12 @@ var ViewParts = {};
     // Playing, or mark it watched / unwatched (a series as a whole). The title's details
     // are fetched first (usually cached) so the choices match its current state.
     function posterActions(meta, type, card) {
+        var hold = holdNow(card);
         U.spinner(true);
         titleActions(meta, type).then(function (a) {
+            if (!hold.latest()) { return; }   // (held on another card since: its own)
             U.spinner(false);
-            pickList(a.name, a.items, null, a.run);
+            if (hold.still()) { pickList(a.name, a.items, null, a.run); }   // (not over a screen opened meanwhile)
         });
     }
     // What a title's hold-OK menu offers, wherever it's held (a poster; the player's Cast & more,

package/js/view-detail.js

@@ -203,6 +203,10 @@
         if (local) { resumeSources(startPlayback(local, p.id, p.name, how), p.id); return; }
         var st = { url: p.url, name: p.name, _headers: U.sanitizeHeaders(p.headers) || undefined,
             behaviorHints: (p.fileHints && typeof p.fileHints === 'object') ? p.fileHints : undefined };   // (its file: for subtitles made for it)
+        if (p.torrent && typeof p.torrent.infoHash === 'string') {   // (a torrent: its link from the streaming server set now)
+            st = Stremio.torrentSource({ infoHash: p.torrent.infoHash, fileIdx: p.torrent.fileIdx, sources: p.torrent.sources, name: p.name, behaviorHints: st.behaviorHints });
+            if (!st.url) { U.toast('This one plays through a streaming server: Settings › Content › Streaming server', 6000); return; }
+        }
         if (/^https:\/\/www\.youtube\.com\/watch\?v=[A-Za-z0-9_-]{11}$/.test(p.url || '')) { st._yt = true; st.ytPage = p.url; }   // (a YouTube video: through the service again)
         resumeSources(startPlayback(st, p.id, p.name, how), p.id);
     }
@@ -321,7 +325,7 @@
         if (!panel || (' ' + body.className + ' ').indexOf(' series-body ') === -1) { return; }
         var sr = s.getBoundingClientRect(), br = body.getBoundingClientRect();
         if (!(br.height > 0)) { return; }
-        var top = Math.round(br.bottom - sr.top) + PANEL_GAP;
+        var top = Math.round((br.bottom - sr.top) / U.zoom()) + PANEL_GAP;   // (measured on screen, zoomed)
         panel.style.top = Math.max(PANEL_MIN, Math.min(PANEL_MAX, top)) + 'px';
     }
 
@@ -724,7 +728,7 @@
     function fileStreams(v) {
         return v.streams.map(function (st) {
             var s = Object.assign({ name: fileLabel(v) }, st);
-            return Stremio.youTubeSource ? Stremio.youTubeSource(s) : s;
+            return Stremio.torrentSource(Stremio.youTubeSource(s));
         });
     }
 
@@ -1395,6 +1399,8 @@
         uncached: function (a, b) { return (a.info.cache === -1 ? 1 : 0) - (b.info.cache === -1 ? 1 : 0); },
         kind: function (a, b) { return (KIND_SCORE[b.info.kind] || 0) - (KIND_SCORE[a.info.kind] || 0); },
         hdr: function (a, b) { return (b.info.hdr ? 1 : 0) - (a.info.hdr ? 1 : 0); },
+        // (only two sources that both state theirs: the others keep their order)
+        seeds: function (a, b) { return (a.info.seeds >= 0 && b.info.seeds >= 0) ? b.info.seeds - a.info.seeds : 0; },
         addon: function (a, b) { return (a.st._addonRank || 0) - (b.st._addonRank || 0); },
         // each source's place in its addon's own list (an addon's first ties with another's
         // first): a plain key, so it orders consistently wherever it sits among the criteria
@@ -1464,7 +1470,13 @@
     // again), as the player takes a source, or null. total: how many it could try in all.
     // avoid: [{ addon, tag }] — an addon's links through a debrid service that sent an account's
     // notice (access refused, a limit: the player's noticeOf): they'd say the same.
+    // Torrent sources' links from the streaming server set now (Settings may have changed it since
+    // they came: none when it's off).
+    function serverNow(list) {
+        (list || []).forEach(function (st) { if (st && st.infoHash) { Stremio.torrentSource(st); } });
+    }
     function nextSourceFor(tried, avoid) {
+        serverNow(_d && _d.streams);
         var rows = (_d && _d.streams) ? filterRows(rankRowsFor(_d.streams)) : [], seen = {}, all = [];   // (within the filter: Addon ▾ / Resolution ▾)
         rows.forEach(function (r) {
             var st = r.st, id = Stremio.sourceId(st), dt = Stremio.debridOf ? Stremio.debridOf(st) : null;
@@ -1847,6 +1859,7 @@
         // before, 4K, 1080p, …) starts with its heading.
         var heading = streamsHeading();
         if (heading) { listScroll.appendChild(U.el('div', 'stream-for', heading)); }
+        serverNow(_d.streams);   // (a page kept from before: its torrents follow the streaming server set now)
         var list = _d.streams, keepAt = -1, rows = rankRowsFor(list), lastGroup = null;
         // Direct links only (Settings › Source ranking): the sources the TV can't play left out
         // (torrents, links it can't open); where-to-watch apps stay (they open)
@@ -1915,10 +1928,11 @@
             if (row && row.sized) { lines.push('📏 Outside your size limits: ' + row.sized + '  (Settings › Playback › Source ranking)'); }
             if (row && row.blocked) { lines.push('⚠ ' + row.blocked + ' isn’t allowed  (Settings › Playback › Formats)'); }
             if (row && row.bad.length) { lines.push('⚠ Marked “Not working” on this TV: ' + row.bad.join(', ') + '  (Settings › Playback › Formats)'); }
+            if (stream._torrent) { lines.push('🧲 A torrent, through your streaming server (Settings › Content › Streaming server)'); }
             if (opens) {
                 lines.push('▶ OK opens ' + (opens.data ? 'it in ' : '') + opens.app.name);
             } else if (!playable) {
-                if (stream.infoHash) { lines.push('— torrent, needs a debrid/torrent client'); }
+                if (stream.infoHash) { lines.push('— torrent: plays through a streaming server (Settings › Content › Streaming server)'); }
                 else if (stream.externalUrl) {
                     lines.push('— another app' + ((typeof TVApps !== 'undefined' && TVApps.available())
                         ? ': add it in Settings › Content › Streaming apps to open it from here' : ' (not playable here)'));
@@ -1936,7 +1950,7 @@
             }
             node.__onselect = function () {
                 if (opens) { openWhere(opens); return; }
-                if (!playable) { U.toast('This source can’t play directly on the TV.'); return; }
+                if (!playable) { U.toast(stream.infoHash ? 'Torrents play through a streaming server: Settings › Content › Streaming server' : 'This source can’t play directly on the TV.', stream.infoHash ? 6000 : undefined); return; }
                 startPlayback(stream, _d.streamId, _d.streamLabel || _d.meta.name, howHere());
             };
             return node;
@@ -1985,6 +1999,7 @@
     // The player's "Select source" list: each source with the request headers it needs
     // (IPTV), so switching to it sends its own (or none).
     function playableSources(list) {
+        serverNow(list || _d.streams);
         return (list || _d.streams || []).filter(Stremio.isPlayable).map(function (st) {
             var sz = Stremio.streamSize(st);
             var desc = Stremio.streamDescription(st).replace(/\n/g, '   ');
@@ -2001,6 +2016,10 @@
 
     // how (optional): { fromStart } — Play from start (Continue Watching): from 0:00.
     function startPlayback(stream, videoId, label, how) {
+        if (stream && stream.infoHash) {   // (a torrent: its link from the streaming server set now)
+            Stremio.torrentSource(stream);
+            if (!stream.url) { U.toast('Torrents play through a streaming server: Settings › Content › Streaming server', 6000); return null; }
+        }
         // VOD changes progress/watched state. Live playback does not, and keeping Home
         // untouched lets us restore the exact originating card and scroll position.
         if (!(_d && _d.exitToBack)) { markHomeDirty(); }
@@ -2015,8 +2034,10 @@
         var titleId = _d && _d.id, series = _d && _d.type === 'series', vtype = _d && _d.type;
         var remembers = !!(_d && !_d.live);
         // (also for another source picked in the player: what's learned is that one's)
-        function learnFor(st) {
-            var info = Stremio.streamInfo(st), fkeys = Stremio.formatKeys(info);
+        // how.converted: played converted by the streaming server, so its formats aren't learned
+        // (they didn't play on the TV); Played before and the kept source still are.
+        function learnFor(st, how) {
+            var info = Stremio.streamInfo(st), fkeys = (how && how.converted) ? [] : Stremio.formatKeys(info);
             return {
                 // (private viewing: nothing about this playback remembered or forgotten — its own
                 // flag, set when it started, see player-store; what plays on this TV is still learned)
@@ -2199,13 +2220,20 @@
     }
 
     // Load a specific episode's sources and auto-play the first playable one.
+    // The next / previous episode (from the player): its sources asked for, the best like the
+    // last one played. An answer once you've left the page, or asked for another episode since
+    // (_epGen), does nothing: no playback, no page drawn, no spinner change, no note.
+    var _epGen = 0;
     function playEpisode(v) {
+        var still = pageNow(), gen = ++_epGen;
+        function current() { return still() && gen === _epGen; }
         _d.mode = 'streams';
         _d.streamId = v.id;
         _d.season = (v.season === undefined ? 1 : v.season);
         _d.streamLabel = epName(v);
         U.spinner(true);
         Stremio.getStreams(addonType(), v.id).then(function (list) {
+            if (!current()) { return; }
             _d.streams = sortStreams(Stremio.dedupeStreams(list));
             U.spinner(false);
             var pick = pickLikeLast(_d.id, _d.streams);
@@ -2215,7 +2243,7 @@
                 return;
             }
             startPlayback(pick, v.id, _d.streamLabel);
-        }, function () { U.spinner(false); U.toast('Failed to load that episode'); });
+        }, function () { if (!current()) { return; } U.spinner(false); U.toast('Failed to load that episode'); });
     }
 
     // ----- binge: the next episode plays a source like the one you've been watching -----

package/js/view-discover.js

@@ -334,7 +334,7 @@
     }
     function rowHeight() {
         var els = _dv.cardEls, c = cols();
-        return (els.length > c) ? (els[c].getBoundingClientRect().top - els[0].getBoundingClientRect().top) : 0;
+        return (els.length > c) ? (els[c].getBoundingClientRect().top - els[0].getBoundingClientRect().top) / U.zoom() : 0;   // (in the grid's own pixels)
     }
     function drawGrid() {
         var grid = gridEl();

package/js/view-home.js

@@ -164,18 +164,32 @@
     // reordered): reload just its rows; every other row keeps what it has, with no request.
     // url: the addon ('local:iptv' for IPTV); none: nothing to fetch (only the set / order
     // of rows changed). Calls before the reload runs add up.
+    // An addon Home had no rows from (IPTV read after your addons, a first playlist) is one too:
+    // its rows asked for, its tabs added to the menu when they come.
     var _reloadOnly = null;   // { addon url: 1 } for the next reload, else a full one
-    var _homeAddons = {};     // { addon url: 1 } the addons Home's last load had catalogs from
     function refreshAddonRows(url) {
         if (_homeCatalogs === null) { clearCatalogCache(); return; }   // nothing loaded yet: a full load anyway
-        // an addon Home didn't load rows from (the first playlist added: IPTV): a full load, its tab with it
-        if (url && !_homeAddons[url]) { clearCatalogCache(); return; }
         _reloadOnly = _reloadOnly || {};
         if (url) { _reloadOnly[url] = 1; }
         _homeDirty = true;
         if (_current() === scr('home') && !isModalOpen() && !Player.isActive()) { loadHomeCatalogs(); }
     }
 
+    // Auto-refresh (Settings › Content › IPTV): every minute, whether the playlists are due —
+    // their oldest download (a saved copy's own date) and the last try both that long ago — then
+    // all of them and their guides read again, as Reload does, and their rows with them. Not
+    // while something plays or StremioK is in the background: at the next minute after.
+    var _iptvTriedAt = 0, _iptvReading = false;
+    function iptvRefreshTick() {
+        var h = Stremio.iptvRefreshEvery ? Stremio.iptvRefreshEvery() : 0;
+        if (!h || _iptvReading || document.hidden || Player.isActive()) { return; }
+        var due = h * 3600000, now = Date.now(), at = Stremio.iptvReadAt();
+        if (at === Infinity || now - at < due || now - _iptvTriedAt < due) { return; }
+        _iptvTriedAt = now; _iptvReading = true;
+        Stremio.iptvReload().then(function () { _iptvReading = false; refreshAddonRows('local:iptv'); }, function () { _iptvReading = false; });
+    }
+    setInterval(iptvRefreshTick, 60000);
+
     // The Home rows are also saved on the TV, trimmed to what a card and the details strip
     // use, so a launch shows the last rows at once and refreshes them in the background
     // (as the 15-minute refresh does). Saved rows are only used with the same addons.
@@ -1179,7 +1193,10 @@
     }
 
     // Switch the active home tab (from the shared top menu) and show it.
-    function setHomeTab(key) { _homeTab = key || _homeTab; _focusFirstCard = 'new'; }
+    function setHomeTab(key) { _homeTab = key || _homeTab; _focusFirstCard = 'new'; _wantTab = null; }
+    // A tab asked for whose rows are still coming (a first playlist's IPTV tab): shown when they
+    // come, if Home is still on the tab it showed instead. { key, instead }
+    var _wantTab = null;
 
     // prevFocus: a Home card to put focus back on after the rebuild (the card a title
     // was opened from). Otherwise the card currently focused on Home is kept, so rows
@@ -1206,7 +1223,9 @@
         // Keep the active tab valid for what's actually available.
         var avail = availableTabs();
         if (!_homeTab || !avail.some(function (t) { return t.key === _homeTab; })) {
+            var asked = _homeTab;
             _homeTab = avail.length ? avail[0].key : 'movie';
+            if (asked && (_homeLoading || _reloadOnly)) { _wantTab = { key: asked, instead: _homeTab }; }
         }
 
         s.appendChild(buildTopMenu(_homeTab));
@@ -1416,12 +1435,12 @@
             _homeLoading = false;
             _homeFirstLoad = false;
             if (first) { U.spinner(false); }
-            if (_reloadOnly && onHome()) { setTimeout(loadHomeCatalogs, 0); }   // (rows asked for meanwhile: the IPTV ones, read after the addons)
+            // (rows asked for meanwhile: the IPTV ones, read after the addons; unless the redraw
+            // that follows has asked for them already)
+            if (_reloadOnly && onHome()) { setTimeout(function () { if (_reloadOnly) { loadHomeCatalogs(); } }, 0); }
         }
         function onHome() { return _current() === s && !isModalOpen() && !Player.isActive(); }
         Stremio.catalogsForHome().then(function (cats) {
-            _homeAddons = {};
-            cats.forEach(function (cat) { if (cat.addon && cat.addon.url) { _homeAddons[cat.addon.url] = 1; } });
             var acc = cats.map(function (cat) { return copyCat({ name: cat.name, type: cat.type, yt: isYouTubeCat(cat) }, []); });
             var arrived = cats.map(function () { return false; }), shown = 0, partialTimer = null;
             // First load: publish each row as soon as it arrives, in its own place (a slower one above
@@ -1458,11 +1477,16 @@
             U.settleAll(tasks, 3).then(function () {
                 _homeCatalogs = splitOtherCatalogs(acc).filter(function (c) { return c.metas && c.metas.length; });
                 done();
+                var want = _wantTab;
+                _wantTab = null;
+                if (want && _homeTab === want.instead && onHome() && availableTabs().some(function (t) { return t.key === want.key; })) {
+                    setHomeTab(want.key);
+                }
                 saveHomeCache();
                 // The tab on screen is redrawn only if what it shows changed: redrawing rebuilds
                 // every card (and reloads its artwork), which shows as a flicker. Continue
                 // Watching doesn't come from catalogs at all. Other tabs rebuild when opened.
-                var same = (before !== null && shownSig() === before) || ownTabStill();
+                var same = (before !== null && shownSig() === before && menuSig() === _renderedMenu) || ownTabStill();
                 var keep = {};
                 if (same && _tabRows[_homeTab]) { keep[_homeTab] = _tabRows[_homeTab]; }
                 _tabRows = keep;
@@ -1473,6 +1497,7 @@
             });
         }, function () {
             done();
+            _wantTab = null;
             if (first) { U.toast('Failed to load addons. Check network / Settings.'); }
         });
     }

package/js/view-settings.js

@@ -193,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) {
@@ -207,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
@@ -338,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'],
@@ -407,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); }
@@ -449,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);
@@ -972,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() : [];
@@ -1058,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.'));

package/js/views.js

@@ -14,7 +14,7 @@ var Views = (function (V) {
         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.1",
+  "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() {