stremiok 2.2.0 → 2.2.2

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

@@ -7,10 +7,13 @@
    an edge, never back before the current half hour for one still on), ↑ / ↓ the channel above /
    below, at the same time. Home's details strip describes the focused program; OK on what's on
    now plays the channel, on another says what it is. A guide-only channel's (tvg-type="guide":
-   watched elsewhere) any program: the film looked up in your addons (findInAddons). */
+   watched elsewhere) any program: the film looked up in your addons (findInAddons). Hold OK on
+   a program: Watch now, the channel's favorites, Find in your addons (hold). */
 (function (V) {
     'use strict';
     function scr() { return V.scr.apply(null, arguments); }   // core
+    function pickList() { return V.pickList.apply(null, arguments); }   // core
+    function refreshAddonRows() { return V.refreshAddonRows.apply(null, arguments); }   // home
 
     var SPAN = 150 * 60, STEP = 30 * 60, ROWS = 10, AHEAD = 10;
     var _g = null;   // the grid on screen: { el, start, chans, lists: { id: programs }, asked: { id: 1 }, top, nodes: [row: cells], box }
@@ -165,6 +168,7 @@
                 wait.__t = want && want.id === c.id && typeof want.t === 'number' ? want.t : Math.max(now, g.start);
                 wait.__meta = { name: c.name, releaseInfo: 'Reading its TV guide…' };
                 hooks(wait, -1);
+                wait.__onlongpress = function () { hold(g, r, null); };
                 track.appendChild(wait);
                 nodes.push(wait);
                 if (want && want.id === c.id) { found = wait; }
@@ -177,6 +181,7 @@
                     n.__meta = { name: p.title, releaseInfo: c.name + '   ·   ' + EPG.dayTime(p.start) + '–' + EPG.hhmm(p.stop) + (c.guideOnly ? '   ·   OK: find it in your addons' : ''), description: p.desc, picture: p.picture };
                     n.__p = p; n.__i = i;
                     n.__onselect = function () { pick(g, r, p); };
+                    n.__onlongpress = function () { hold(g, r, p); };
                     hooks(n, i);
                     track.appendChild(n);
                     nodes.push(n);
@@ -301,6 +306,23 @@
             (p.stop <= now ? '   (already shown)' : ''), 8000);
     }
 
+    // Hold OK on a program: ▶ Watch now (what's on now, a channel that plays), ★ Add to / Remove
+    // from favorites (its channel), Find in your addons (that program, as a guide-only channel's
+    // OK). p: null for a channel whose guide hasn't come (its favorites only).
+    function hold(g, r, p) {
+        var c = g.chans[r], now = Date.now() / 1000, fav = IPTV.isFavorite(c.id), items = [];
+        if (p && !c.guideOnly && p.start <= now && now < p.stop) { items.push(['play', '▶  Watch now']); }
+        items.push(['fav', fav ? '★  Remove from favorites' : '★  Add to favorites']);
+        if (p && p.title) { items.push(['find', '🔍  Find in your addons']); }
+        pickList(c.name + (p && p.title ? '  ·  ' + p.title : ''), items, items[0][0], function (v) {
+            if (v === 'play') { pick(g, r, p); return; }
+            if (v === 'find') { findInAddons(p); return; }
+            IPTV.setFavorite(c.id, !fav);
+            U.toast(fav ? 'Removed from favorites' : 'Added to favorites: ★ Favorites, first on the IPTV and Guide tabs', 3000);
+            refreshAddonRows('local:iptv');
+        });
+    }
+
     // A guide-only channel's program: a film found by the guide's original title and year (else
     // its title) opens its page with your addons' sources, as Discover does; a show, or a film
     // without one sure match, opens Search with its name.
@@ -328,5 +350,22 @@
         Stremio.findFilm({ title: p.title, orig: p.orig, year: p.year }, cancel).then(done, function () { done(null); });
     }
 
-    V.guideGrid = guideGrid;
+    // Back on the Guide from a channel played from it (BACK, or its stream gave up), after CH+ /
+    // CH−: the hours at the present again, the row of the channel ended on in view (read if it
+    // wasn't), and what's on now on it. Returns that cell; null when the Guide isn't on screen or
+    // the channel isn't on it.
+    function guideBackOn(id) {
+        var g = _g, r = -1;
+        if (!id || !g || !g.box || !document.documentElement.contains(g.box)) { return null; }
+        for (var i = 0; i < g.chans.length; i++) { if (g.chans[i].id === id) { r = i; break; } }
+        if (r < 0) { return null; }
+        var now = Date.now() / 1000;
+        g.start = floorStep(now); g.live = true;
+        if (r < g.top) { g.top = r; } else if (r >= g.top + ROWS) { g.top = r - ROWS + 1; }
+        var n = draw(g, { id: id, t: now });
+        ensure(g).then(function (got) { if (got) { refresh(g); } });   // (its programs, when they weren't read: then onto what's on)
+        return n;
+    }
+
+    V.guideGrid = guideGrid; V.guideBackOn = guideBackOn;
 })(ViewParts);

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.'); }
         });
     }