stremiok 2.0.0 → 2.2.0

package/js/player-subs.js

@@ -113,7 +113,7 @@
                 if (mem.off) { return true; }
                 if (mem.embedded) {
                     if (partial) { return false; }
-                    wantEmbedded({ index: mem.index, lang: mem.lang }); _embDelay = Math.max(0, +mem.delay || 0); return true;
+                    wantEmbedded({ index: mem.index, lang: mem.lang, nth: mem.nth }); _embDelay = Math.max(0, +mem.delay || 0); return true;
                 }
                 var exact =
                     (mem.trackId != null ? _subTracks.find(function (t) { return t.id === mem.trackId; }) : null) ||
@@ -202,6 +202,21 @@
     var WEBVTT_ASIDE = /^(NOTE|STYLE|REGION)([ \t]|$)/;
     // Character codes (& > — …) as the characters they stand for.
     var CHAR_CODES = { amp: '&', lt: '<', gt: '>', quot: '"', apos: "'", nbsp: '\u00a0', lrm: '\u200e', rlm: '\u200f' };
+    // A subtitle's tags taken out, a stray < with them: one pass, in time with the text's length
+    // however it's made (a run of < with no > after it used to hold the remote for seconds).
+    // Its text is only ever shown as text (textContent): this is for how it reads.
+    function noTags(t) {
+        var out = '', i = 0, n = t.length;
+        while (i < n) {
+            var lt = t.indexOf('<', i);
+            if (lt === -1) { out += t.slice(i); break; }
+            out += t.slice(i, lt);
+            var gt = t.indexOf('>', lt + 1);
+            if (gt === -1) { out += t.slice(lt + 1).split('<').join(''); break; }   // (no tag ends after it: the rest, its < gone)
+            i = gt + 1;
+        }
+        return out;
+    }
     function charCodes(t) {
         if (t.indexOf('&') === -1) { return t; }
         return t.replace(/&(#[xX][0-9a-fA-F]{1,6}|#[0-9]{1,7}|[a-zA-Z]+);/g, function (all, c) {
@@ -213,13 +228,16 @@
             return CHAR_CODES.hasOwnProperty(c) ? CHAR_CODES[c] : all;
         });
     }
+    // A file's cues: CUES_MAX at most, CUE_TEXT_MAX characters of text each (a broken or hostile
+    // file can't hold the remote: the whole parse stays in time with the file's length).
+    var CUES_MAX = 20000, CUE_TEXT_MAX = 1000;
     function parseCues(text) {
         text = ('' + text).replace(/\r/g, '');
         var blocks = text.split(/\n\n+/);
         var cues = [], skip = skipper();   // (Skip lines with: your words)
         var re = /(?:(\d{1,3}):)?(\d{2}):(\d{2})[,.](\d{1,3})\s*-->\s*(?:(\d{1,3}):)?(\d{2}):(\d{2})[,.](\d{1,3})/;
         function ms(x) { return +((x + '00').slice(0, 3)) / 1000; }   // (".5" is half a second)
-        for (var i = 0; i < blocks.length; i++) {
+        for (var i = 0; i < blocks.length && cues.length < CUES_MAX; i++) {
             var lines = blocks[i].replace(/^\n+/, '').split('\n');
             if (WEBVTT_ASIDE.test(lines[0])) { continue; }   // (a WebVTT comment, style or region: not shown)
             var ti = -1;
@@ -229,7 +247,9 @@
             if (!m) { continue; }
             var start = (+(m[1] || 0)) * 3600 + (+m[2]) * 60 + (+m[3]) + ms(m[4]);
             var end = (+(m[5] || 0)) * 3600 + (+m[6]) * 60 + (+m[7]) + ms(m[8]);
-            var txt = skip(charCodes(lines.slice(ti + 1).join('\n').replace(/<[^>]+>/g, '').replace(/\{[^}]+\}/g, '')).replace(/\s+$/, ''));
+            // (tags out, a stray < with them, in one pass; then entities read: one written as &lt; is the file's own text,
+            // "<b>" shown as written. Never a tag: subtitles reach the screen as text only, textContent)
+            var txt = skip(charCodes(noTags(lines.slice(ti + 1).join('\n').slice(0, CUE_TEXT_MAX)).replace(/\{[^}]+\}/g, '')).replace(/\s+$/, ''));
             if (txt) { cues.push({ start: start, end: end, text: txt }); }
         }
         cues.sort(function (a, b) { return a.start - b.start; });
@@ -330,8 +350,12 @@
         el.className = '';
         var span = el.firstChild;
         if (!span) { span = document.createElement('span'); el.appendChild(span); }
-        styleSpan(span);
-        el.style.bottom = '';   // (styleSpan places the bottom one: this one stays at the top)
+        var ver = P.subCfgVersion ? P.subCfgVersion() : -1;
+        if (span.__styled !== ver || ver === -1) {   // (styled when made, and when the subtitle settings change: not every tick)
+            styleSpan(span);
+            el.style.bottom = '';   // (styleSpan places the bottom one: this one stays at the top)
+            span.__styled = ver;
+        }
         if (span.textContent !== show) { span.textContent = show; }
     }
     // Green › Second subtitle: Off, or a language the addons have (the same setting as Settings').
@@ -380,6 +404,7 @@
             pick = tracks.find(function (t) { return t.index === w.index && (!key || langKey(textLang(t)) === key); }) || null;
         }
         if (!pick && key) { pick = tracks.find(function (t) { return langMatches(key, textLang(t)); }) || null; }
+        if (!pick && w.nth != null && S.ctx && S.ctx._relayCc) { pick = tracks[w.nth] || null; }   // (a live channel's closed captions: in the order asked for)
         if (!pick && w.lang2) {   // nothing in the default language anywhere: the second choice, a track to download first
             var key2 = langKey(w.lang2);
             var dl = _subTracks.find(function (t) { return langMatches(key2, t.lang); });
@@ -394,7 +419,7 @@
         try { avplay.setSelectTrack('TEXT', tr.index); }
         catch (e2) { try { avplay.setSelectTrack('TEXT', '' + tr.index); } catch (e3) {} }
         _embSub = tr.index; _embLang = textLang(tr);
-        U.toast('Subtitles: ' + (_embLang || 'on') + ' (built-in)', 1800);
+        U.toast('Subtitles: ' + (_embLang || 'on') + (S.ctx && S.ctx._relayCc ? ' (closed captions)' : ' (built-in)'), 1800);
     }
     function embOff() {
         if (_embSub != null) { try { avplay.setSilentSubtitle(true); } catch (e) {} }
@@ -442,7 +467,7 @@
     function drawEmbedded(text, duration) {
         if (_embSub == null || _subOn) { return; }
         if (_embTimer) { clearTimeout(_embTimer); _embTimer = null; }
-        var t = ('' + (text || '')).replace(/<br\s*\/?>/gi, '\n').replace(/<[^>]+>/g, '').replace(/\{[^}]+\}/g, '').trim();
+        var t = noTags(('' + (text || '')).replace(/<br\s*\/?>/gi, '\n')).replace(/\{[^}]+\}/g, '').trim();
         if (!t) { S.subsEl.className = 'hidden'; return; }
         S.subsEl.className = '';
         var span = S.subsEl.firstChild;
@@ -511,7 +536,7 @@
         replaceTop(timingMenu(topMenu().idx));
         U.toast('Subtitles: ' + fmtDelay(_subDelay) + (_subDelay > 0 ? ' (later)' : _subDelay < 0 ? ' (earlier)' : ' (as in the file)'), 1800);
     }
-    function lineText(c) { return '“' + ('' + c.text).replace(/<[^>]+>/g, '').replace(/\s+/g, ' ').trim().slice(0, 70) + '”'; }
+    function lineText(c) { return '“' + noTags('' + c.text).replace(/\s+/g, ' ').trim().slice(0, 70) + '”'; }
     // The next line coming up (as timed now): OK the moment it's said.
     function earMenu() {
         var t = S.cur - _subDelay, next = null;
@@ -559,12 +584,14 @@
     // group), named in full, with the file's own tracks in the same groups as the addons'.
     // Order: the language showing now, the preferred language, then by name.
     function langMenu() {
-        var groups = {}, order = [];
+        var groups = Object.create(null), order = [];   // (no inherited names: a language an addon calls "__proto__" is just a key)
         function add(k, item) {
             if (!groups[k]) { groups[k] = []; order.push(k); }
             groups[k].push(item);
         }
         getTextTracks().forEach(function (tr, i) { add(langKey(textLang(tr)), { emb: tr, n: i }); });
+        var offer = S.ctx && !S.ctx._relayCc ? S.ctx._ccOffer : null;   // (a live channel's closed captions, not on yet)
+        (offer || []).forEach(function (c, i) { add(langKey(c.lang || ''), { cc: c, n: i, emb: true }); });
         _subTracks.forEach(function (tr) { add(langKey(tr.lang), { track: tr }); });
         var curKey = _subOn ? langKey(_subLabel) : (_embSub != null ? langKey(_embLang) : null);
         var pref = getSubCfg().lang;
@@ -579,7 +606,7 @@
         order.forEach(function (k) {
             var list = groups[k], n = list.length, emb = list.filter(function (x) { return x.emb; }).length;
             items.push({ label: langName(k),
-                detail: n + ' option' + (n > 1 ? 's' : '') + (emb ? (emb === n ? ', in the file' : ', ' + emb + ' in the file') : ''),
+                detail: n + ' option' + (n > 1 ? 's' : '') + (emb ? (emb === n ? ', ' + inFile() : ', ' + emb + ' ' + inFile()) : ''),
                 sel: (k === curKey),
                 run: function () { pushMenu(langTracksMenu(k, list)); } });
         });
@@ -590,6 +617,7 @@
         return { title: 'Subtitle language', items: items, idx: idx, rebuild: langMenu };
     }
 
+    function inFile() { return S.ctx && (S.ctx._relayCc || S.ctx._ccOffer) ? 'closed captions' : 'in the file'; }
     // Level 2: the tracks in one language: the file's own first, then each addon's.
     // Picking a track keeps the menu open, the checkmark on it (an addon's once it loads), so
     // several can be tried in a row: the file's own the same as an addon's.
@@ -597,10 +625,15 @@
         var idx = 0, nAddon = 0;
         list = list.filter(function (x) { return x.emb; }).concat(list.filter(function (x) { return !x.emb; }));
         var items = list.map(function (x, i) {
+            if (x.cc) {   // (turning a live channel's closed captions on: it restarts with them)
+                var c = x.cc;
+                return { label: 'Closed captions (' + c.ch + ')', detail: 'The channel restarts with them',
+                    run: function () { closeMenu(); rememberSub(S.ctx.id, { embedded: true, nth: x.n, lang: c.lang }); P.ccOn(c); } };
+            }
             if (x.emb) {
                 var tr = x.emb, l = textLang(tr);
                 if (_embSub === tr.index) { idx = i; }
-                return { label: 'Built into the file' + (l ? '  (' + l + ')' : '  ·  track ' + (x.n + 1)), sel: _embSub === tr.index,
+                return { label: (S.ctx && S.ctx._relayCc ? 'Closed captions' : 'Built into the file') + (l ? '  (' + l + ')' : '  ·  track ' + (x.n + 1)), sel: _embSub === tr.index,
                     run: function () {
                         _embDelay = 0; _embQueue = []; _embNudge = null; selectEmbeddedSub(tr); rememberSub(S.ctx.id, { embedded: true, index: tr.index, lang: l });
                         if (menuOpen()) { replaceTop(langTracksMenu(key, list)); }
@@ -686,5 +719,6 @@
     P.fileHints = fileHints; P.parseCues = parseCues; P.loadTrack = loadTrack; P.subsOff = subsOff;
     P.resetSubs = resetSubs; P.closeSubs = closeSubs; P.startSubtitles = startSubtitles;
     P.subsBeforeOpen = subsBeforeOpen; P.subsOnTick = subsOnTick; P.subtitleSummary = subtitleSummary;
+    P.wantEmbedded = wantEmbedded;
     P.renderSubs = renderSubs; P.showEmbeddedText = showEmbeddedText; P.subConfigMenu = subConfigMenu; P.langMenu = langMenu;
 })(PlayerParts);

package/js/player.js

@@ -11,7 +11,7 @@ var Player = (function (P) {
         getSubCfg: P.getSubCfg, setSubCfg: P.setSubCfg, getAudioCfg: P.getAudioCfg, setAudioCfg: P.setAudioCfg,
         isWatched: P.isWatched, watchedState: P.watchedState, watchedAt: P.watchedAt, watchedSince: P.watchedSince, progressFor: P.progressFor,
         addToContinue: P.addToContinue, setWatched: P.setWatched, setWatchedMany: P.setWatchedMany, clearUnwatched: P.clearUnwatched,
-        isPrivate: P.isPrivate, setPrivate: P.setPrivate, playerCfg: P.playerCfg, setPlayerCfg: P.setPlayerCfg, langName: P.langName, lang2: P.lang2, langKey: P.langKey,
+        isPrivate: P.isPrivate, setPrivate: P.setPrivate, privateNow: P.privateNow, playerCfg: P.playerCfg, setPlayerCfg: P.setPlayerCfg, langName: P.langName, lang2: P.lang2, langKey: P.langKey,
         SUB_FONTS: P.SUB_FONTS, SUB_COLORS: P.SUB_COLORS, SUB_BGS: P.SUB_BGS, SUB_EDGES: P.SUB_EDGES, SUB_POSITIONS: P.SUB_POSITIONS
     };
 })(PlayerParts);

package/js/stremio-account.js

@@ -42,6 +42,9 @@ var StremioAccount = (function () {
             try { xhr.open('POST', API + method, true); } catch (e) { reject(new Error('couldn’t reach Stremio')); return; }
             xhr.timeout = 20000;
             xhr.setRequestHeader('Content-Type', 'application/json');
+            xhr.onprogress = function (ev) {   // (an answer over MAX_BYTES: stopped as it arrives, as every other request is)
+                if (!done && ev && ev.loaded > MAX_BYTES) { done = true; try { xhr.abort(); } catch (e) {} reject(new Error('too large an answer')); }
+            };
             xhr.onreadystatechange = function () {
                 if (xhr.readyState !== 4 || done) { return; }
                 done = true;

package/js/stremio.js

@@ -77,18 +77,31 @@ var Stremio = (function () {
 
     // Your order (Settings › Addons ▲▼): the higher addon is asked first wherever one answer
     // is used (a title's details: the first that has them) and listed first where several are.
+    // dir: -1 / 1 one place, -Infinity / Infinity to the top / bottom (U.moveIn)
     function moveAddon(url, dir) {
-        var list = getAddonUrls(), i = list.indexOf(url), j = i + dir;
-        if (i < 0 || j < 0 || j >= list.length) { return false; }
-        list.splice(i, 1); list.splice(j, 0, url);
+        var list = getAddonUrls();
+        if (!U.moveIn(list, list.indexOf(url), dir)) { return false; }
         saveAddonUrls(list);
         configChanged();   // (rebuilt from the saved manifests: nothing fetched)
         return true;
     }
 
+    // Addons you turned off (Settings › Content › Addons, OK on one): kept in your list, in
+    // their place, but not loaded, so nothing is asked of them (rows, details, sources,
+    // subtitles, search) until they're turned on again. A backup can wait there.
+    var OFF_KEY = 'stremiok.addonsoff';
+    function offUrls() { var l = U.store.get(OFF_KEY, []); return Array.isArray(l) ? l.filter(function (u) { return typeof u === 'string'; }) : []; }
+    function isAddonOff(url) { return offUrls().indexOf(url) !== -1; }
+    function setAddonOff(url, off) {
+        var l = offUrls().filter(function (u) { return u !== url; });
+        if (off) { l.push(url); }
+        U.store.set(OFF_KEY, l);
+        configChanged();   // (loaded again without it, or with it: from the saved manifests)
+    }
     function removeAddon(url) {
         var list = getAddonUrls().filter(function (u) { return u !== url; });
         saveAddonUrls(list);
+        if (isAddonOff(url)) { U.store.set(OFF_KEY, offUrls().filter(function (u) { return u !== url; })); }   // (added again: on)
         var o = originsAll();
         if (o[url]) { delete o[url]; U.store.set(ORIGIN_KEY, o); }   // (added again by hand: none)
         configChanged();
@@ -162,7 +175,8 @@ var Stremio = (function () {
             posterRatings: p.posterRatings === true,   // Settings > Appearance: IMDb rating on cards
             homePreview: p.homePreview !== false,      // Settings > Appearance: Continue Watching on the TV's home bar (js/hubpreview.js)
             homePreviewOrder: p.homePreviewOrder === 'watching' ? 'watching' : 'recent',   // ...its tiles: the latest first, or as in Watching
-            hiddenTabs: wordList(p.hiddenTabs, 20, 20),   // Settings > Appearance > Home tabs
+            hiddenTabs: wordList(p.hiddenTabs, 20, 20),   // Settings > Appearance > Menu: tabs hidden
+            menuOrder: wordList(p.menuOrder, 20, 20),     // ...and the menu's order (see ViewParts.menuOrder)
             hideWords: wordList(p.hideWords, 30, 40),     // Settings > Source ranking: sources with these words at the bottom
             watchRegion: /^[A-Z]{2}$/.test(p.watchRegion || '') ? p.watchRegion : '' };   // Settings > Integrations ('' = automatic)
     }
@@ -329,6 +343,21 @@ var Stremio = (function () {
     var MAX_METAS = 1000, MAX_STREAMS = 500, MAX_SUBTITLES = 300, MAX_EPISODES = 5000, MAX_CATALOGS = 200;
     var _manifestProblem = {};   // url -> why it didn't load ("too large (over 2 MB)", "not an addon manifest"…)
     var _manifestDetail = {};    // url -> what the addon itself said about it, if anything (its error message)
+    // An addon's logo (its manifest's "logo", else "icon"), for Settings › Content › Addons: an
+    // http(s) link by the artwork rules (U.cardImage), or a small base64 picture written into
+    // the manifest, whole (one as long as STR_MAX was cut short). From an internet addon (url:
+    // its link; none given, taken as one), never a link into your home network (blocksLocal).
+    // Else null: its initial shows instead.
+    var LOGO_DATA = /^data:image\/(?:png|jpeg|gif|webp|svg\+xml);base64,[A-Za-z0-9+\/]+=*$/i;
+    function addonLogo(m, url) {
+        if (!m || typeof m !== 'object') { return null; }
+        var u = typeof m.logo === 'string' && m.logo.trim() ? m.logo : typeof m.icon === 'string' ? m.icon : '';
+        u = u.trim();
+        if (!u) { return null; }
+        if (/^data:/i.test(u)) { return u.length < STR_MAX && LOGO_DATA.test(u) ? u : null; }
+        u = U.cardImage(u, 'logo');
+        return u && (url ? blocksLocal({ url: url }) : true) && U.urlIsPrivate(u) ? null : u;
+    }
     // A manifest as the app can use it, or null: an id, and lists that are lists.
     // Its lists too: resources (a name, or { name, types, idPrefixes }), types and id prefixes
     // (text), catalogs (a type and id; extras each a name, their options text).
@@ -385,13 +414,14 @@ var Stremio = (function () {
     function loadAddons() {
         if (_loaded) { return Promise.resolve(_loaded); }
         if (_loading) { return _loading; }
-        var urls = getAddonUrls();
+        var off = offUrls(), urls = getAddonUrls().filter(function (u) { return off.indexOf(u) === -1; });   // (the ones turned off: not loaded)
         var saved = U.store.get(MANIFESTS_KEY, {}) || {};
         var force = _forceNet; _forceNet = false;
         var need = urls.filter(function (u) { return force || !saved[u]; }), rev = _rev, p;
-        // IPTV playlists load alongside the manifests (the synthetic addon is built from them).
-        var pre = (_hasIptv && IPTV.isEnabled()) ? IPTV.load() : Promise.resolve(null);
-        p = Promise.all([pre, need.length ? fetchManifests(need) : Promise.resolve({})]).then(function (res) {
+        // The IPTV playlists aren't waited for (a big one takes a while to read): the synthetic
+        // addon joins once they're read (iptvJoin), and onIptvReady's listeners redraw its rows.
+        var iptvOn = _hasIptv && IPTV.isEnabled(), iptvNow = iptvOn && (!IPTV.isReady || IPTV.isReady());
+        p = Promise.all([null, need.length ? fetchManifests(need) : Promise.resolve({})]).then(function (res) {
             if (_loading === p) { _loading = null; }
             if (rev !== _rev) { return loadAddons(); }   // (your addons changed meanwhile: loaded as they are now)
             var got = res[1], addons = [];
@@ -401,7 +431,8 @@ var Stremio = (function () {
             });
             // Prepend so the IPTV rows sort first on Home (reorder them in Settings >
             // Appearance > Home feeds; there's no cap on how many rows or feeds).
-            if (_hasIptv && IPTV.isEnabled()) { addons.unshift(IPTV.synthAddon()); }
+            if (iptvNow) { addons.unshift(IPTV.synthAddon()); }
+            else if (iptvOn) { iptvJoin(addons, rev); }
             if (hasYouTube()) { addons.push(YouTube.synthAddon()); }   // (after your addons: its rows last on Home)
             if (typeof Trakt !== 'undefined' && Trakt.isConnected()) { addons.push(Trakt.synthAddon()); }   // (your Watchlist and Up next)
             _loaded = addons;
@@ -414,6 +445,17 @@ var Stremio = (function () {
         return p;
     }
 
+    // The IPTV playlists, read after the addons loaded: their synthetic addon put first among them
+    // (its rows sort first on Home), as if it had been there, and onIptvReady's listeners told.
+    var _iptvReadyFns = [];
+    function onIptvReady(fn) { _iptvReadyFns.push(fn); }
+    function iptvJoin(addons, rev) {
+        IPTV.load().then(function () {
+            if (rev !== _rev || _loaded !== addons) { return; }   // (your addons changed meanwhile: loaded afresh, with it)
+            if (!addons.some(function (a) { return a.url === 'local:iptv'; })) { addons.unshift(IPTV.synthAddon()); }
+            _iptvReadyFns.forEach(function (fn) { try { fn(); } catch (e) {} });
+        }, function () {});
+    }
     // Background refresh of manifests that came from the TV's saved copies. Updates the
     // loaded addons in place, so anything holding them sees the new manifest.
     function refreshSavedManifests(urls) {
@@ -440,7 +482,18 @@ var Stremio = (function () {
         if (_hasIptv) { IPTV.removePlaylist(id); }
         configChanged();
     }
+    function iptvAddXtream(base, user, pass) {   // (as any playlist added: the addons' list made again)
+        var id = _hasIptv ? IPTV.addXtream(base, user, pass) : false;
+        configChanged();
+        return id;
+    }
+    function iptvSetXtreamFormat(id, fmt) {
+        var changed = _hasIptv ? IPTV.setXtreamFormat(id, fmt) : false;
+        configChanged();
+        return changed;
+    }
     function iptvRenamePlaylist(id, name) { return _hasIptv ? IPTV.renamePlaylist(id, name) : false; }
+    function iptvSetPlaylistGuide(id, url) { return _hasIptv && IPTV.setPlaylistGuide ? IPTV.setPlaylistGuide(id, url) : false; }
     function iptvSetPlaylistOff(id, off) { var ok = _hasIptv ? IPTV.setPlaylistOff(id, off) : false; configChanged(); return ok; }
     function iptvMovePlaylist(id, dir) { var ok = _hasIptv ? IPTV.movePlaylist(id, dir) : false; configChanged(); return ok; }
     function iptvLabel(id) { return _hasIptv ? IPTV.label(id) : ''; }
@@ -644,7 +697,8 @@ var Stremio = (function () {
     // ---- Feed lists: order + show / hide, as the user sets them ----
     // Home feeds (the Home rows: every catalog) and search sources (the Search rows:
     // every catalog that can search) each keep their own { order: [keys], hidden: [keys] }.
-    // Anything new (an addon added later) goes after the ordered ones, in addon order.
+    // Anything new (an addon added later) goes after the ordered ones, in addon order, but for a
+    // catalog that asks to come first (def._first: IPTV's Favorites) until you place it.
     var FEEDS_KEY = 'stremiok.feeds', SEARCH_FEEDS_KEY = 'stremiok.searchfeeds';
     function catalogKey(cat) {
         var aid = (cat.addon.manifest && cat.addon.manifest.id) || cat.addon.url;
@@ -657,8 +711,8 @@ var Stremio = (function () {
             var pos = {};
             cfg().order.forEach(function (k, i) { pos[k] = i; });
             return items.map(function (c, i) { return { c: c, i: i, k: keyOf(c) }; }).sort(function (a, b) {
-                var pa = (pos[a.k] !== undefined) ? pos[a.k] : (100000 + a.i);
-                var pb = (pos[b.k] !== undefined) ? pos[b.k] : (100000 + b.i);
+                var pa = (pos[a.k] !== undefined) ? pos[a.k] : (a.c && a.c.def && a.c.def._first) ? -1 : (100000 + a.i);
+                var pb = (pos[b.k] !== undefined) ? pos[b.k] : (b.c && b.c.def && b.c.def._first) ? -1 : (100000 + b.i);
                 return pa - pb;
             }).map(function (x) { return x.c; });
         }
@@ -668,9 +722,8 @@ var Stremio = (function () {
             visible: function () { return list().then(function (items) { return sort(items).filter(function (c) { return !isHidden(keyOf(c)); }); }); },
             move: function (key, dir) {
                 return list().then(function (items) {
-                    var ordered = sort(items).map(keyOf), i = ordered.indexOf(key), j = i + dir;
-                    if (i < 0 || j < 0 || j >= ordered.length) { return; }
-                    var t = ordered[i]; ordered[i] = ordered[j]; ordered[j] = t;
+                    var ordered = sort(items).map(keyOf);
+                    if (!U.moveIn(ordered, ordered.indexOf(key), dir)) { return; }
                     var c = cfg(); c.order = ordered; U.store.set(storeKey, c);
                 });
             },
@@ -747,9 +800,7 @@ var Stremio = (function () {
     function moveRanking(key, dir) {
         var g = getRanking(), i = -1;
         g.criteria.forEach(function (c, n) { if (c.key === key) { i = n; } });
-        var j = i + dir;
-        if (i < 0 || j < 0 || j >= g.criteria.length) { return; }
-        var t = g.criteria[i]; g.criteria[i] = g.criteria[j]; g.criteria[j] = t;
+        if (!U.moveIn(g.criteria, i, dir)) { return; }
         saveRanking(g);
     }
     function toggleRanking(key) {
@@ -802,6 +853,10 @@ var Stremio = (function () {
         return out.filter(Boolean);
     }
 
+    // An addon's error sent as a title's details (AIOStreams: "aiostreamserror.…", its name
+    // "[❌] <the addon that failed>", the error as its description; AIOMetadata: "aiom.error.…"):
+    // not the title, so the next addon is asked.
+    function isErrorMeta(m) { return /^(aiostreamserror\.|aiom\.error\.)/.test('' + (m && m.id)); }
     function getMeta(type, id, cancel) {
         if (/^ytk:/.test(id) && typeof YouTube !== 'undefined') {
             return YouTube.meta(id).then(function (m) { if (!m) { throw new Error('Not found on YouTube'); } return m; });
@@ -832,6 +887,11 @@ var Stremio = (function () {
                 var url = a.base + '/meta/' + encodeURIComponent(asType[a.url] || type) + '/' + encodeURIComponent(id) + '.json';
                 return U.getJSON(url, addonMs(12000), META_MAX, cancel).then(function (res) {
                     var meta = fromAddon(a, res, 'title details').meta;
+                    if (meta && typeof meta === 'object' && isErrorMeta(meta)) {
+                        U.log('addon', ((a.manifest && a.manifest.name) || 'An addon') + ' sent an error instead of details for ' + id + ': ' +
+                            String(meta.name || '').slice(0, 80) + (meta.description ? ' (' + String(meta.description).slice(0, 120) + ')' : ''));
+                        return tryNext();
+                    }
                     if (meta && typeof meta === 'object') {
                         if (meta.videos !== undefined) { meta.videos = oneEach(U.listOf(meta.videos, MAX_EPISODES), meta.id || id); }
                         meta._from = (a.manifest && a.manifest.name) || '';   // (the title page says which addon described it)
@@ -872,8 +932,8 @@ var Stremio = (function () {
         if (e && !force && (e.pending > 0 || Date.now() - e.at < STREAM_TTL)) {
             syncLocal(e, type, id);   // (the addons' answers kept; the USB drive's matches as they are now)
             if (onUpdate) {
-                e.listeners.push(onUpdate);
-                if (e.started) { onUpdate(e.list, e.pending); }
+                if (!e.done) { e.listeners.push(onUpdate); }   // (still loading: told as each addon answers)
+                if (e.started) { onUpdate(e.list, e.pending); }   // (done: told once, now, and not kept)
             }
             return e.promise.then(function () { syncLocal(e, type, id); return e.list; });
         }
@@ -902,7 +962,7 @@ var Stremio = (function () {
                     return function () {
                         var url = a.base + '/stream/' + encodeURIComponent(type) + '/' + encodeURIComponent(id) + '.json';
                         return U.getJSON(url, addonMs(15000)).then(function (res) {
-                            var arr = U.listOf(fromAddon(a, res, 'sources').streams, MAX_STREAMS).map(youTubeSource);
+                            var arr = U.listOf(fromAddon(a, res, 'sources').streams, MAX_STREAMS).map(youTubeSource), said = notes.length;
                             arr = arr.filter(function (s) {   // (an addon's notices: what it removed and why, its errors; not sources)
                                 if (!isNotice(s)) { return true; }
                                 notes.push({ addon: a.manifest.name || 'Addon', title: ('' + (s.name || '')).replace(/\s+/g, ' ').trim().slice(0, 120),
@@ -916,18 +976,23 @@ var Stremio = (function () {
                                 if (h) { s._headers = h; }
                             });
                             slots[i] = arr; okCount++;
+                            if (!arr.length && notes.length === said) { note(a, i, 'no sources for this'); }   // (its notices say why, when it sent any)
                         }).then(function () { done(); }, function (err) {
                             // (no answer in time: what you played from it before, marked so — see keptSources)
                             if (isTimeout(err) && !slots[i].length) { slots[i] = keptSources(type, id, a, i); }
+                            note(a, i, whyNone(err));
                             done(); throw err;
                         });
                     };
                 }), 4);
             }
+            // Why an addon gave nothing ("No sources found" shows it), in your addon order
+            function note(a, i, why) { notes.push({ addon: a.manifest.name || 'Addon', title: why, text: '', rank: i }); }
             function done() {
                 e.pending--;
                 e.list = local.concat([].concat.apply([], slots));
-                _streamNotes.set(key, notes.slice(0, 6));
+                notes.sort(function (x, y) { return (x.rank === undefined ? -1 : x.rank) - (y.rank === undefined ? -1 : y.rank); });
+                _streamNotes.set(key, notes.slice(0, 10));
                 notify();
             }
             // Addons that gather from others (AIOStreams…) can answer nothing while those are
@@ -942,6 +1007,7 @@ var Stremio = (function () {
                 return new Promise(function (r) { setTimeout(r, RETRY_EMPTY_STREAMS_MS); }).then(ask);
             }).then(function () {
                 e.at = Date.now();
+                e.done = true; e.listeners = [];   // (nothing more to tell: none kept)
                 // Nothing (no answer, or no sources): not kept, so opening it again asks again.
                 if (providers.length && (!okCount || fresh() <= local.length) && _streamCache[key] === e) { delete _streamCache[key]; }
                 return e.list;
@@ -954,6 +1020,16 @@ var Stremio = (function () {
     }
 
     function isTimeout(err) { return /^Timeout/.test((err && err.message) || ''); }
+    // Why an addon's sources didn't come, in a few words (its link, and any token in it, left out):
+    // "refused (HTTP 429 · rate_limited)", "didn't answer in time", "couldn't be reached"…
+    function whyNone(err) {
+        var m = String((err && err.message) || ''), h = /^HTTP (\d{3}) for \S+(?::\s+(.+))?$/.exec(m);   // (its message after ": ", not the link's "://")
+        if (h) { return 'refused (HTTP ' + h[1] + (h[2] ? ' · ' + h[2].replace(/https?:\/\/\S+/g, '…').slice(0, 80) : '') + ')'; }
+        if (isTimeout(err)) { return 'didn’t answer in time'; }
+        if (/^Network error/.test(m)) { return 'couldn’t be reached'; }
+        if (/^Too large/.test(m)) { return 'sent too much (' + (/\(([^)]+)\)/.exec(m) || ['', 'too large'])[1] + ')'; }
+        return 'failed (' + m.replace(/https?:\/\/\S+/g, '…').slice(0, 80) + ')';
+    }
 
     // The debrid service a source comes through, from its tag ("[TB⚡]", "[RD+]"): { tag, name } or null.
     var DEBRIDS = { TB: 'TorBox', RD: 'Real-Debrid', AD: 'AllDebrid', PM: 'Premiumize', DL: 'Debrid-Link', ED: 'EasyDebrid', OC: 'Offcloud', PP: 'PikPak' };
@@ -1392,6 +1468,57 @@ var Stremio = (function () {
         return tmdbGet('/' + kind + '/' + tmdbId + '/external_ids', '', cancel).then(function (r) { return (r && r.imdb_id) || null; });
     }
 
+    // A film known only by a TV guide's program (the Guide's guide-only channels): { title (as
+    // shown, Spanish say), orig (its original title), year } -> Promise of { type, id (IMDb), name,
+    // poster } when exactly one film has that name (and that year, when known), else null.
+    // TMDB with your key (the original title, else the shown one in Spanish), else Cinemeta
+    // (original titles only).
+    function plainTitle(s) {   // ("El Señor de los Anillos:" -> "elsenordelosanillos")
+        var t = ('' + (s || '')).toLowerCase();
+        if (t.normalize) { try { t = t.normalize('NFD').replace(/[\u0300-\u036f]/g, ''); } catch (e) {} }
+        return t.replace(/[^a-z0-9]+/g, '');
+    }
+    function findFilm(p, cancel) {
+        var year = +p.year || 0;
+        function near(y) { return !year || (y && Math.abs(y - year) <= 1); }
+        function one(list, names) {
+            var want = names.map(plainTitle).filter(Boolean), hits = (list || []).filter(function (r) {
+                return near(r.year) && want.some(function (w) { return w === plainTitle(r.name) || w === plainTitle(r.orig); });
+            });
+            return hits.length === 1 ? hits[0] : null;
+        }
+        function tmdb(query, spanish) {
+            var extra = '&query=' + encodeURIComponent(query) + (year ? '&year=' + year : '') + (spanish ? '&language=es-AR' : '');
+            return tmdbGet('/search/movie', extra, cancel).then(function (r) {
+                return ((r && r.results) || []).map(function (x) {
+                    return { tmdbId: x.id, name: x.title || '', orig: x.original_title || '', year: +('' + (x.release_date || '')).slice(0, 4) || 0, poster: tmdbImg(x.poster_path, 'w342') };
+                });
+            }, function () { return []; });
+        }
+        function viaTmdb() {
+            if (!tmdbKey()) { return Promise.resolve(null); }
+            var first = p.orig ? tmdb(p.orig, false).then(function (l) { return one(l, [p.orig]); }) : Promise.resolve(null);
+            return first.then(function (hit) {
+                return hit || (p.title ? tmdb(p.title, true).then(function (l) { return one(l, [p.title]); }) : null);
+            }).then(function (hit) {
+                if (!hit) { return null; }
+                return tmdbImdbId('movie', hit.tmdbId, cancel).then(function (imdb) {
+                    return imdb ? { type: 'movie', id: imdb, name: hit.name || p.title, poster: hit.poster } : null;
+                }, function () { return null; });
+            });
+        }
+        function viaCinemeta() {
+            if (!p.orig) { return Promise.resolve(null); }
+            return U.getJSON('https://v3-cinemeta.strem.io/catalog/movie/top/search=' + encodeURIComponent(p.orig) + '.json', 10000, null, cancel).then(function (r) {
+                var hit = one(((r && r.metas) || []).map(function (m) {
+                    return { id: m.id, name: m.name || '', year: parseInt(m.releaseInfo || m.year || '', 10) || 0, poster: m.poster || '' };
+                }), [p.orig]);
+                return hit && /^tt\d+$/.test(hit.id) ? { type: 'movie', id: hit.id, name: p.title || hit.name, poster: hit.poster } : null;
+            }, function () { return null; });
+        }
+        return viaTmdb().then(function (hit) { return hit || viaCinemeta(); });
+    }
+
     // ---- MDBList ratings (Settings > Integrations > MDBList) ----
     // -> [{ key, label, text }] in a fixed order, only the ones the title has.
     var MDB_SOURCES = [['imdb', 'IMDb'], ['tomatoes', 'Rotten Tomatoes'], ['popcorn', 'Audience'],
@@ -1488,9 +1615,11 @@ var Stremio = (function () {
         var ep = parts.length >= 3 ? { season: parts[1], episode: parts[2] } : null;
         return { imdb: parts[0], ep: ep };
     }
-    // GET https://api.theintrodb.org/v3/media?imdb_id=tt..[&season=&episode=][&duration_ms=]
+    // GET https://api.theintrodb.org/v4/media?imdb_id=tt..[&season=&episode=][&duration_ms=]
+    // (v4: answers keyed by the show's TheTVDB id, episodes in TheTVDB's default order; the
+    // segments as v3 gave them. v2 and v3 stop on 18 Jan 2027.)
     function theIntroDb(q, durationMs) {
-        var url = 'https://api.theintrodb.org/v3/media?imdb_id=' + encodeURIComponent(q.imdb);
+        var url = 'https://api.theintrodb.org/v4/media?imdb_id=' + encodeURIComponent(q.imdb);
         if (q.ep) { url += '&season=' + encodeURIComponent(q.ep.season) + '&episode=' + encodeURIComponent(q.ep.episode); }
         if (durationMs && durationMs > 0) { url += '&duration_ms=' + Math.floor(durationMs); }
         return U.getJSON(url, 10000).then(function (r) {
@@ -1943,11 +2072,11 @@ var Stremio = (function () {
         DEFAULT_ADDONS: DEFAULT_ADDONS, prettyType: prettyType,
         addonUrlProblem: function (v) { return U.urlProblem(v); },
         getAddonUrls: getAddonUrls, manifestProblem: function (url) { return _manifestProblem[url] || ''; }, manifestDetail: function (url) { return _manifestDetail[url] || ''; }, addAddon: addAddon, removeAddon: removeAddon, moveAddon: moveAddon, streamNotes: streamNotes, keepSource: keepSource, forgetSource: forgetSource, sourceId: sourceId, hasStreamAddons: hasStreamAddons, thirdPartyNote: thirdPartyNote, refreshAddons: refreshAddons, refreshAddon: refreshAddon,
-        getIntegrations: getIntegrations, setIntegration: setIntegration, getPrefs: getPrefs, setPref: setPref,
+        getIntegrations: getIntegrations, setIntegration: setIntegration, getPrefs: getPrefs, setPref: setPref, addonLogo: addonLogo,
         getIntroSegments: getIntroSegments,
         tmdbValidate: tmdbValidate, mdblistValidate: mdblistValidate, omdbValidate: omdbValidate,
         tmdbFindTvId: tmdbFindTvId, tmdbSeasonEpisodes: tmdbSeasonEpisodes, tmdbImg: tmdbImg,
-        tmdbTitleExtras: tmdbTitleExtras, tmdbExtrasById: tmdbExtrasById, tmdbEpisodeCast: tmdbEpisodeCast, tmdbEpisodeTrailer: tmdbEpisodeTrailer, setHideWords: setHideWords, hideWordHit: hideWordHit, normalizeAddonUrl: normalizeManifestUrl, debridOf: debridOf, addonOrigin: addonOrigin, setAddonOrigin: setAddonOrigin, parseSetupList: parseSetupList, applySetupEntries: applySetupEntries, sizeLimitHit: sizeLimitHit, setSizeLimit: setSizeLimit, gbText: gbText, runtimeMinutes: runtimeMinutes, tmdbPeople: tmdbPeople, tmdbPerson: tmdbPerson, tmdbBrowse: tmdbBrowse, tmdbTitleTrailers: tmdbTitleTrailers, tmdbProviders: tmdbProviders, tmdbProvidersKept: tmdbProvidersKept, tmdbGenres: tmdbGenres, tmdbWhereToWatch: tmdbWhereToWatch, watchRegion: watchRegion, autoWatchRegion: autoWatchRegion, tmdbImdbId: tmdbImdbId, hasTmdb: function () { return !!tmdbKey(); },
+        tmdbTitleExtras: tmdbTitleExtras, tmdbExtrasById: tmdbExtrasById, tmdbEpisodeCast: tmdbEpisodeCast, tmdbEpisodeTrailer: tmdbEpisodeTrailer, setHideWords: setHideWords, hideWordHit: hideWordHit, normalizeAddonUrl: normalizeManifestUrl, debridOf: debridOf, addonOrigin: addonOrigin, setAddonOrigin: setAddonOrigin, parseSetupList: parseSetupList, applySetupEntries: applySetupEntries, sizeLimitHit: sizeLimitHit, setSizeLimit: setSizeLimit, gbText: gbText, runtimeMinutes: runtimeMinutes, tmdbPeople: tmdbPeople, tmdbPerson: tmdbPerson, tmdbBrowse: tmdbBrowse, tmdbTitleTrailers: tmdbTitleTrailers, tmdbProviders: tmdbProviders, tmdbProvidersKept: tmdbProvidersKept, tmdbGenres: tmdbGenres, tmdbWhereToWatch: tmdbWhereToWatch, watchRegion: watchRegion, autoWatchRegion: autoWatchRegion, tmdbImdbId: tmdbImdbId, findFilm: findFilm, hasTmdb: function () { return !!tmdbKey(); },
         mdblistRatings: mdblistRatings,
         omdbSeasonRatings: omdbSeasonRatings,
         loadAddons: loadAddons, listCatalogs: listCatalogs, getCatalog: getCatalog,
@@ -1974,10 +2103,10 @@ var Stremio = (function () {
         streamInfo: streamInfo, formatTags: formatTags, formatKeys: formatKeys, recordFormats: recordFormats, setFormat: setFormat,
         resetFormats: resetFormats, badFormats: badFormats, formatList: formatList,
         resList: resList, setResAllowed: setResAllowed, blockedRes: blockedRes,
-        importSetupList: importSetupList, savedManifest: savedManifest,
+        importSetupList: importSetupList, savedManifest: savedManifest, isAddonOff: isAddonOff, setAddonOff: setAddonOff, onIptvReady: onIptvReady, streamListenerCount: function (type, id) { var e = _streamCache[type + ':' + id]; return e ? e.listeners.length : 0; },
         iptvGetPlaylists: iptvGetPlaylists, iptvAddPlaylist: iptvAddPlaylist,
         iptvUpdatePlaylist: iptvUpdatePlaylist, iptvRemovePlaylist: iptvRemovePlaylist,
-        iptvRenamePlaylist: iptvRenamePlaylist, iptvSetPlaylistOff: iptvSetPlaylistOff, iptvMovePlaylist: iptvMovePlaylist, iptvLabel: iptvLabel,
+        iptvRenamePlaylist: iptvRenamePlaylist, iptvSetPlaylistGuide: iptvSetPlaylistGuide, iptvAddXtream: iptvAddXtream, iptvSetXtreamFormat: iptvSetXtreamFormat, iptvSetPlaylistOff: iptvSetPlaylistOff, iptvMovePlaylist: iptvMovePlaylist, iptvLabel: iptvLabel,
         iptvLoad: iptvLoad, iptvStatus: iptvStatus, iptvReload: iptvReload
     };
 })();