stremiok 2.2.0 → 2.2.2

package/js/player-lang.js

@@ -34,7 +34,7 @@
         fre: ['fre', 'fra', 'fr', 'french', 'français', 'francais'],
         ger: ['ger', 'deu', 'de', 'german', 'deutsch'],
         ita: ['ita', 'it', 'italian', 'italiano'],
-        por: ['por', 'pob', 'pt', 'portuguese', 'português', 'portugues'],
+        por: ['por', 'pob', 'pom', 'pt', 'portuguese', 'português', 'portugues'],
         dut: ['dut', 'nld', 'nl', 'dutch', 'nederlands'],
         rus: ['rus', 'ru', 'russian'],
         ara: ['ara', 'ar', 'arabic'],
@@ -42,7 +42,7 @@
         pol: ['pol', 'pl', 'polish', 'polski'],
         jpn: ['jpn', 'ja', 'japanese', '日本語'],
         kor: ['kor', 'ko', 'korean', '한국어'],
-        chi: ['chi', 'zho', 'zh', 'cmn', 'chinese', 'mandarin', '中文'],
+        chi: ['chi', 'zho', 'zh', 'cmn', 'zht', 'zhe', 'chinese', 'mandarin', '中文'],   // (zht / zhe: OpenSubtitles' traditional and bilingual)
         hin: ['hin', 'hi', 'hindi'],
         swe: ['swe', 'sv', 'swedish', 'svenska'],
         nor: ['nor', 'nob', 'nno', 'nb', 'nn', 'norwegian', 'norsk'],
@@ -58,7 +58,7 @@
         ukr: ['ukr', 'uk', 'ukrainian'],
         tha: ['tha', 'th', 'thai'],
         vie: ['vie', 'vi', 'vietnamese'],
-        ind: ['ind', 'id', 'indonesian'],
+        ind: ['ind', 'id', 'indonesian', 'indonesia'],   // ("Bahasa Indonesia": its last word)
         may: ['may', 'msa', 'ms', 'malay'],
         fil: ['fil', 'tgl', 'tl', 'filipino', 'tagalog'],
         cat: ['cat', 'ca', 'catalan', 'català'],
@@ -66,7 +66,7 @@
         glg: ['glg', 'gl', 'galician', 'galego'],
         bul: ['bul', 'bg', 'bulgarian'],
         hrv: ['hrv', 'hr', 'croatian', 'hrvatski'],
-        srp: ['srp', 'sr', 'serbian'],
+        srp: ['srp', 'scc', 'sr', 'serbian'],
         per: ['per', 'fas', 'fa', 'persian', 'farsi'],
         est: ['est', 'et', 'estonian'],
         lav: ['lav', 'lv', 'latvian'],
@@ -74,7 +74,57 @@
         ice: ['ice', 'isl', 'is', 'icelandic'],
         tam: ['tam', 'ta', 'tamil'],
         tel: ['tel', 'te', 'telugu'],
-        ben: ['ben', 'bn', 'bengali']
+        ben: ['ben', 'bn', 'bengali'],
+        // (2.2.0.2) the rest of OpenSubtitles' languages; two-letter codes that are also everyday
+        // words or labels (my, be, or, so, an, se, si, ne, mr, SD, BR…) left out
+        afr: ['afr', 'af', 'afrikaans'],
+        alb: ['alb', 'sqi', 'sq', 'albanian', 'shqip'],
+        arg: ['arg', 'aragonese'],
+        arm: ['arm', 'hye', 'hy', 'armenian'],
+        ast: ['ast', 'asturian'],
+        aze: ['aze', 'az', 'azerbaijani'],
+        bel: ['bel', 'belarusian'],
+        bos: ['bos', 'bs', 'bosnian'],
+        bre: ['bre', 'breton'],
+        bur: ['bur', 'mya', 'burmese'],
+        prs: ['prs', 'dari'],
+        epo: ['epo', 'eo', 'esperanto'],
+        ext: ['ext', 'extremaduran'],
+        gla: ['gla', 'gd', 'gaelic'],
+        geo: ['geo', 'kat', 'ka', 'georgian'],
+        ibo: ['ibo', 'ig', 'igbo'],
+        ina: ['ina', 'interlingua'],
+        gle: ['gle', 'ga', 'irish'],
+        kan: ['kan', 'kn', 'kannada'],
+        kaz: ['kaz', 'kk', 'kazakh'],
+        khm: ['khm', 'km', 'khmer'],
+        kur: ['kur', 'ku', 'kurdish'],
+        ltz: ['ltz', 'lb', 'luxembourgish'],
+        mac: ['mac', 'mkd', 'mk', 'macedonian'],
+        mal: ['mal', 'ml', 'malayalam'],
+        mni: ['mni', 'manipuri'],
+        mar: ['mar', 'marathi'],
+        mon: ['mon', 'mn', 'mongolian'],
+        mne: ['mne', 'montenegrin'],
+        nav: ['nav', 'nv', 'navajo'],
+        nep: ['nep', 'nepali'],
+        sme: ['sme', 'sami'],
+        oci: ['oci', 'oc', 'occitan'],
+        ori: ['ori', 'odia', 'oriya'],
+        pan: ['pan', 'pa', 'punjabi', 'panjabi'],
+        pus: ['pus', 'pashto'],
+        sat: ['sat', 'santali'],
+        snd: ['snd', 'sindhi'],
+        sin: ['sin', 'sinhala', 'sinhalese'],
+        som: ['som', 'somali'],
+        swa: ['swa', 'sw', 'swahili'],
+        syr: ['syr', 'syriac'],
+        tat: ['tat', 'tt', 'tatar'],
+        tok: ['tok', 'toki'],
+        tuk: ['tuk', 'tk', 'turkmen'],
+        urd: ['urd', 'ur', 'urdu'],
+        uzb: ['uzb', 'uz', 'uzbek'],
+        wel: ['wel', 'cym', 'cy', 'welsh']
     };
     function langMatches(pref, lang) {
         var names = LANG_ALIASES[pref] || [pref];
@@ -97,6 +147,14 @@
         per: 'Persian', fas: 'Persian', fa: 'Persian', slo: 'Slovak', slv: 'Slovenian', may: 'Malay', fil: 'Filipino',
         baq: 'Basque', glg: 'Galician', est: 'Estonian', lav: 'Latvian', lit: 'Lithuanian', ice: 'Icelandic',
         tam: 'Tamil', tel: 'Telugu', ben: 'Bengali', mul: 'Multiple languages', zxx: 'No language',
+        afr: 'Afrikaans', alb: 'Albanian', arg: 'Aragonese', arm: 'Armenian', ast: 'Asturian', aze: 'Azerbaijani',
+        bel: 'Belarusian', bos: 'Bosnian', bre: 'Breton', bur: 'Burmese', prs: 'Dari', epo: 'Esperanto', ext:
+        'Extremaduran', gla: 'Scottish Gaelic', geo: 'Georgian', ibo: 'Igbo', ina: 'Interlingua', gle: 'Irish', kan:
+        'Kannada', kaz: 'Kazakh', khm: 'Khmer', kur: 'Kurdish', ltz: 'Luxembourgish', mac: 'Macedonian', mal:
+        'Malayalam', mni: 'Manipuri', mar: 'Marathi', mon: 'Mongolian', mne: 'Montenegrin', nav: 'Navajo', nep:
+        'Nepali', sme: 'Northern Sami', oci: 'Occitan', ori: 'Odia', pan: 'Punjabi', pus: 'Pashto', sat: 'Santali',
+        snd: 'Sindhi', sin: 'Sinhala', som: 'Somali', swa: 'Swahili', syr: 'Syriac', tat: 'Tatar', tok: 'Toki Pona',
+        tuk: 'Turkmen', urd: 'Urdu', uzb: 'Uzbek', wel: 'Welsh',
         und: 'Unknown language', '': 'Unknown language' };
     function langName(lang) {
         var k = langKey(lang);
@@ -122,6 +180,9 @@
     // ----- for the other parts (and js/player.js) -----
     P.trackInfo = trackInfo; P.infoLang = infoLang; P.trackLang = trackLang; P.langMatches = langMatches;
     P.langName = langName; P.langRank = langRank; P.langKey = langKey;
+    // A track that doesn't say its language (by its key): none, "und", "unknown"…, or no letters.
+    // (A language StremioK has no name for is still a language.)
+    P.langUnstated = function (k) { k = ('' + (k || '')).trim(); return !/[a-zà-ÿ]/i.test(k) || /^(und|unk|unknown|unknown language|mul|zxx|n\/a|none)$/i.test(k); };
     // A language code's two-letter form (ISO 639-1: "spa" -> "es"), or '' (TMDB asks by it).
     P.lang2 = function (key) { var a = LANG_ALIASES[key] || []; for (var i = 0; i < a.length; i++) { if (/^[a-z]{2}$/.test(a[i])) { return a[i]; } } return ''; };
 })(PlayerParts);

package/js/player-store.js

@@ -85,7 +85,8 @@
             edge: pick3(SUB_EDGES, d.edge)[0], pos: pick3(SUB_POSITIONS, d.pos || 'bottom')[0],   // (Bottom unless chosen: Lower comes first in the list)
             font: subFontFamily(d.font) ? d.font : 'default',   // an unknown font -> TV default
             skip: skipWords(d.skip),   // lines with one of these aren't shown (none by default: see player-subs' skipLines)
-            second: typeof d.second === 'string' && /^[a-z]{2,3}$/.test(d.second) ? d.second : 'off' };   // a second subtitle at the top (player-subs; Off by default)
+            second: typeof d.second === 'string' && /^[a-z]{2,3}$/.test(d.second) ? d.second : 'off',   // a second subtitle at the top (player-subs; Off by default)
+            only: d.only === 'on' ? 'on' : 'off' };   // the subtitle menu: only your languages (player-subs' langMenu; Off by default)
     }
     // Settings › Subtitles › Skip lines with: words (or bits, ".srt"), capitals or not; at most 20.
     function skipWords(x) {
@@ -129,14 +130,14 @@
     var SIZE_PX = { small: 28, medium: 36, large: 46, xlarge: 58 };
     function styleSpan(span) {
         var cfg = getSubCfg();
-        span.style.fontSize = (SIZE_PX[cfg.size] || 36) + 'px';
+        span.style.fontSize = (SIZE_PX[cfg.size] || 36) / U.zoom() + 'px';   // (their own size, whatever the zoom)
         span.style.fontFamily = subFontFamily(cfg.font);
         span.style.color = pick3(SUB_COLORS, cfg.color)[2];
         span.style.background = pick3(SUB_BGS, cfg.bg)[2];
         span.style.textShadow = pick3(SUB_EDGES, cfg.edge)[2];
         if (span.parentNode) { span.parentNode.style.bottom = Math.max(subsPosPx(), (P.S && P.S.subsLift) || 0) + 'px'; }   // (raised over the progress bar: core's liftSubs)
     }
-    function subsPosPx() { return pick3(SUB_POSITIONS, getSubCfg().pos)[2]; }
+    function subsPosPx() { return pick3(SUB_POSITIONS, getSubCfg().pos)[2] / U.zoom(); }
 
     // ---------- progress (Continue Watching) ----------
     function progressAll() { return U.store.get(PROGRESS_KEY, {}); }

package/js/player-subs.js

@@ -48,7 +48,7 @@
 
     // A new playback: no subtitles yet.
     function resetSubs() {
-        _subGen++;
+        _subGen++; stopSubLoad();
         _subTracks = []; _cues = null; _subOn = false; _subLabel = ''; _subTrackUrl = '';
         _subDelay = 0; _subTrackId = null; _embSub = null; _embLang = ''; _embWant = null;
         _embDelay = 0; _embQueue = []; _embNudge = null;
@@ -285,12 +285,52 @@
     // Each choice (a track, Off, a built-in one) is a new one: a download still on its way
     // for an earlier choice is dropped when it comes, without a word (_subGen).
     var _subGen = 0;
+    // A subtitle file's time to arrive: some servers build it when asked (12 s, seen from an
+    // OpenSubtitles proxy); the video plays on meanwhile.
+    var SUB_FILE_MS = 20000;
+    // The download under way (_subLoad: { url, ctx, cancel, timer, done }): the same track picked
+    // again while it comes waits for it (it used to be asked for again, what was on its way
+    // dropped: slow servers took several picks); another choice stops it, its connection freed.
+    // The files downloaded (the last SUB_FILES_MAX, while StremioK runs) come back at once.
+    var _subLoad = null, SUB_FILES_MAX = 8, _subFiles = [];   // ([{ url, text }], newest last)
+    function subFile(url) { for (var i = 0; i < _subFiles.length; i++) { if (_subFiles[i].url === url) { return _subFiles[i].text; } } return null; }
+    function keepSubFile(url, text) {
+        _subFiles = _subFiles.filter(function (f) { return f.url !== url; });
+        _subFiles.push({ url: url, text: text });
+        if (_subFiles.length > SUB_FILES_MAX) { _subFiles.shift(); }
+    }
+    function stopSubLoad() {
+        var l = _subLoad;
+        _subLoad = null;
+        if (l) { clearInterval(l.timer); l.cancel.cancel(); }
+    }
+    // A subtitle file: from those kept, else downloaded (the same one shared by whoever asks).
+    function subText(track, cancel) {
+        var kept = subFile(track.url);
+        if (kept !== null) { return Promise.resolve(kept); }
+        return U.getText(track.url, SUB_FILE_MS, undefined, cancel || null, false, track.headers || null).then(function (text) { keepSubFile(track.url, text); return text; });   // (a USB file's: the service's header where there's no token)
+    }
     function loadTrack(track, onDone) {
         if (!U.parseUrl(track.url)) { U.toast('That subtitle track has no usable link'); return; }   // (http(s) only)
-        U.toast('Loading subtitles…', 1500);
+        var l = _subLoad;
+        if (l && l.url === track.url && l.ctx === S.ctx) {   // (still coming: waited for, not asked for again)
+            if (onDone) { l.done.push(onDone); }
+            U.toast('Still loading subtitles… ' + l.secs + ' s', 1500);
+            return;
+        }
+        stopSubLoad();
         var forCtx = S.ctx, gen = ++_subGen;
         function stale() { return !S.active || S.ctx !== forCtx || gen !== _subGen; }   // (another playback, or another choice, meanwhile)
-        U.getText(track.url, 15000, undefined, null, false, track.headers || null).then(function (text) {   // (a USB file's: the service's header where there's no token)
+        var cancel = U.cancelToken(), mine = { url: track.url, ctx: forCtx, cancel: cancel, secs: 0, done: onDone ? [onDone] : [], timer: null };
+        if (subFile(track.url) === null) {   // (a download: how long it's been, every second, till it's in)
+            _subLoad = mine;
+            U.toast('Loading subtitles…', 1500);
+            mine.timer = setInterval(function () { mine.secs++; if (_subLoad === mine) { U.toast('Loading subtitles… ' + mine.secs + ' s', 1500); } }, 1000);
+        }
+        function finished() { clearInterval(mine.timer); if (_subLoad === mine) { _subLoad = null; } }
+        onDone = function () { mine.done.forEach(function (f) { try { f(); } catch (e) {} }); };
+        subText(track, cancel).then(function (text) {
+            finished();
             if (stale()) { return; }
             var cues = parseCues(text);
             if (!cues.length) { U.toast('Could not parse subtitles'); return; }
@@ -299,8 +339,8 @@
             _subTrackId = (track.id != null) ? track.id : null; _subDelay = 0;
             renderSubs();
             U.toast('Subtitles: ' + (track.lang || 'on'));
-            if (onDone) { onDone(); }
-        }, function () { if (!stale()) { U.toast('Failed to download subtitles'); } });
+            onDone();
+        }, function () { finished(); if (!stale()) { U.toast('Failed to download subtitles'); } });
     }
 
     // ---------- the second subtitle ----------
@@ -323,7 +363,7 @@
         var track = _subTracks.filter(function (t) { return t.url && langMatches(want, t.lang); })[0];
         if (!track || (_cues2 && _sub2Label === track.url)) { if (!track) { secondOff(); } return; }
         var forCtx = S.ctx, gen = ++_sub2Gen;
-        U.getText(track.url, 15000, undefined, null, false, track.headers || null).then(function (text) {
+        subText(track).then(function (text) {
             if (!S.active || S.ctx !== forCtx || gen !== _sub2Gen) { return; }
             var cues = parseCues(text);
             if (!cues.length) { return; }
@@ -374,7 +414,7 @@
     }
 
     function subsOff() {
-        _subGen++;
+        _subGen++; stopSubLoad();   // (a download under way for a track: stopped)
         _subOn = false; _cues = null; _subLabel = ''; _subTrackUrl = ''; _subTrackId = null; _subDelay = 0;
         embOff();
         S.subsEl.className = 'hidden'; U.clear(S.subsEl);
@@ -583,19 +623,32 @@
     // Level 1: one entry per language, spellings merged ("en", "eng" and "English" are one
     // 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() {
+    // Only my languages (Settings, Off by default): just your default, second-choice and
+    // second-subtitle languages, the one showing, and tracks that don't say their language;
+    // Other languages, after them, lists the rest (all: that list).
+    function langMenu(all) {
         var groups = Object.create(null), order = [];   // (no inherited names: a language an addon calls "__proto__" is just a key)
+        function key(l) { var k = langKey(l); return P.langUnstated(k) ? '' : k; }   // (no language, "und"…: one Unknown language)
         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 }); });
+        getTextTracks().forEach(function (tr, i) { add(key(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);
+        (offer || []).forEach(function (c, i) { add(key(c.lang || ''), { cc: c, n: i, emb: true }); });
+        _subTracks.forEach(function (tr) { add(key(tr.lang), { track: tr }); });
+        var curKey = _subOn ? key(_subLabel) : (_embSub != null ? key(_embLang) : null);
         var pref = getSubCfg().lang;
         var prefs = [curKey, pref].filter(function (x) { return x && x !== 'off'; });
+        var cfg = getSubCfg(), hidden = 0;
+        var mine = [cfg.lang, cfg.lang2, cfg.second].filter(function (l) { return l && l !== 'off' && l !== 'none'; });
+        if (cfg.only === 'on' && !all && mine.length) {
+            order = order.filter(function (k) {
+                var keep = k === curKey || k === '' || mine.some(function (l) { return langKey(l) === k || langMatches(l, k); });
+                if (!keep) { hidden++; }
+                return keep;
+            });
+        }
         order.sort(function (a, b) {
             var ra = langRank(a, prefs), rb = langRank(b, prefs);
             if (ra !== rb) { return ra - rb; }
@@ -610,11 +663,12 @@
                 sel: (k === curKey),
                 run: function () { pushMenu(langTracksMenu(k, list)); } });
         });
+        if (hidden) { items.push({ label: 'Other languages', detail: hidden + ' more', run: function () { pushMenu(langMenu(true)); } }); }
         var sec = getSubCfg().second;
         if (_subTracks.length) { items.push({ label: 'Second subtitle: ' + (sec === 'off' ? 'Off' : langName(sec)), detail: 'At the top, at the same time', run: function () { pushMenu(secondMenu()); } }); }
         var idx = 0;
         for (var i = 0; i < items.length; i++) { if (items[i].sel) { idx = i; break; } }
-        return { title: 'Subtitle language', items: items, idx: idx, rebuild: langMenu };
+        return { title: all ? 'All subtitle languages' : 'Subtitle language', items: items, idx: idx, rebuild: function () { return langMenu(all); } };
     }
 
     function inFile() { return S.ctx && (S.ctx._relayCc || S.ctx._ccOffer) ? 'closed captions' : 'in the file'; }