stremiok 2.3.5 → 2.3.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +27 -0
- package/README.md +18 -15
- package/config.xml +2 -1
- package/css/style.css +1 -0
- package/index.html +43 -42
- package/js/lang/ar.js +94 -5
- package/js/lang/de.js +102 -13
- package/js/lang/es.js +92 -3
- package/js/lang/fi.js +98 -9
- package/js/lang/fr.js +102 -13
- package/js/lang/he.js +94 -5
- package/js/lang/hi.js +94 -5
- package/js/lang/it.js +94 -5
- package/js/lang/ja.js +94 -5
- package/js/lang/ko.js +92 -3
- package/js/lang/pl.js +118 -29
- package/js/lang/pt-BR.js +92 -3
- package/js/lang/ru.js +94 -5
- package/js/lang/tr.js +94 -5
- package/js/lang/zh-CN.js +96 -7
- package/js/local.js +63 -18
- package/js/netfolders.js +76 -8
- package/js/player-audio.js +16 -8
- package/js/player-controls.js +68 -0
- package/js/player-core.js +129 -9
- package/js/player-lang.js +16 -0
- package/js/player-store.js +7 -2
- package/js/player-subs.js +267 -17
- package/js/plugins.js +306 -0
- package/js/stremio.js +57 -8
- package/js/util.js +10 -1
- package/js/vendor/quickjs/LICENSES.md +412 -0
- package/js/vendor/quickjs/crypto-js.js +6659 -0
- package/js/vendor/quickjs/plugin-worker-legacy.js +1364 -0
- package/js/vendor/quickjs/plugin-worker.js +8774 -0
- package/js/vendor/quickjs/quickjs.wasm +0 -0
- package/js/view-core.js +2 -2
- package/js/view-detail.js +18 -7
- package/js/view-settings.js +251 -15
- package/js/ytplay.js +60 -7
- package/package.json +1 -1
- package/service/index.js +1884 -67
- package/tizenbrew.html +1 -1
package/js/local.js
CHANGED
|
@@ -16,7 +16,12 @@ var LocalMedia = (function () {
|
|
|
16
16
|
'use strict';
|
|
17
17
|
|
|
18
18
|
var VIDEO_RE = /\.(mkv|mp4|m4v|avi|ts|m2ts|mts|mov|webm|wmv|mpe?g|flv|3gp|ogv|vob)$/i;
|
|
19
|
-
var SUB_RE = /\.(srt|vtt|ass|ssa)$/i;
|
|
19
|
+
var SUB_RE = /\.(srt|vtt|ass|ssa|smi|sub|txt)$/i;
|
|
20
|
+
// .sub and .txt: subtitles only when named like a video beside them (a readme.txt isn't one; a
|
|
21
|
+
// .sub may be a picture one, VobSub): never matched on their own.
|
|
22
|
+
var WEAK_SUB_RE = /\.(sub|txt)$/i;
|
|
23
|
+
// A folder of a video's subtitles beside it: Subs/, Subtitles/ (Subs/<video's name>/ too).
|
|
24
|
+
var SUBS_DIR_RE = /^(subs|subtitles)$/i;
|
|
20
25
|
// Hidden: names starting with "." (a Mac leaves ._… copies, .DS_Store, .Spotlight-V100,
|
|
21
26
|
// .fseventsd, .Trashes on a drive) and Windows' recycle bin and system folder.
|
|
22
27
|
var HIDDEN_RE = /^(\.|\$RECYCLE\.BIN$|System Volume Information$)/i;
|
|
@@ -46,6 +51,16 @@ var LocalMedia = (function () {
|
|
|
46
51
|
function nameOf(p) { return ('' + p).split('/').pop(); }
|
|
47
52
|
function dirOf(p) { var i = ('' + p).lastIndexOf('/'); return i === -1 ? '' : p.slice(0, i); }
|
|
48
53
|
function stem(n) { return ('' + n).replace(/\.[^.]+$/, ''); }
|
|
54
|
+
// A name's episode, as one key ("s1e2" for S01E02 or 1x02), or '' (none).
|
|
55
|
+
var EPISODE_RE = /s(\d{1,2})\s?e(\d{1,3})|\b(\d{1,2})x(\d{2,3})\b/i;
|
|
56
|
+
function episodeKey(n) { var m = EPISODE_RE.exec(n || ''); return m ? 's' + (+(m[1] || m[3])) + 'e' + (+(m[2] || m[4])) : ''; }
|
|
57
|
+
// A subtitle file's video folder: its own, or the one its Subs folder is in.
|
|
58
|
+
function subOwnerDir(rel) {
|
|
59
|
+
var d = dirOf(rel), up = dirOf(d);
|
|
60
|
+
if (SUBS_DIR_RE.test(nameOf(d))) { return up; }
|
|
61
|
+
if (SUBS_DIR_RE.test(nameOf(up))) { return dirOf(up); }
|
|
62
|
+
return d;
|
|
63
|
+
}
|
|
49
64
|
function humanSize(n) {
|
|
50
65
|
if (!n) { return ''; }
|
|
51
66
|
return n >= 1073741824 ? (n / 1073741824).toFixed(1) + ' GB' : n >= 1048576 ? Math.round(n / 1048576) + ' MB' : Math.max(1, Math.round(n / 1024)) + ' KB';
|
|
@@ -78,6 +93,7 @@ var LocalMedia = (function () {
|
|
|
78
93
|
}, function () { _tokenP = null; return ''; });
|
|
79
94
|
return _tokenP;
|
|
80
95
|
}
|
|
96
|
+
function serviceUrl(path) { return service() + path; } // (a link with its own ticket: no token)
|
|
81
97
|
function svcUrl(path, token) { return service() + path + (path.indexOf('?') === -1 ? '?' : '&') + 'token=' + (token || ''); }
|
|
82
98
|
// Where the token can't be read (Tizen 6: the service keeps it in a folder of its own), the
|
|
83
99
|
// service takes StremioK's X-StremioK header instead (a web page can't send one).
|
|
@@ -544,17 +560,17 @@ var LocalMedia = (function () {
|
|
|
544
560
|
function standaloneSubs(x) {
|
|
545
561
|
var vids = {};
|
|
546
562
|
(x.files || []).forEach(function (f) { var dd = dirOf(f.p); (vids[dd] = vids[dd] || []).push(stem(nameOf(f.p)).toLowerCase()); });
|
|
547
|
-
return (x.subs || []).filter(function (s) { return !isHidden(nameOf(s)) && !s.split('/').some(isHidden) && !isVideosSub(vids[
|
|
563
|
+
return (x.subs || []).filter(function (s) { return !WEAK_SUB_RE.test(s) && !isHidden(nameOf(s)) && !s.split('/').some(isHidden) && !isVideosSub(vids[subOwnerDir(s)], s); });
|
|
548
564
|
}
|
|
549
565
|
function isVideosSub(stems, rel) {
|
|
550
566
|
if (!stems || !stems.length) { return false; }
|
|
551
|
-
if (stems.length === 1) { return true; } // (the folder's only video: its subtitles, whatever their names)
|
|
552
|
-
var st = stem(nameOf(rel)).toLowerCase();
|
|
553
|
-
return stems.some(function (v) { return st.indexOf(v) === 0; });
|
|
567
|
+
if (stems.length === 1 || subOwnerDir(rel) !== dirOf(rel)) { return true; } // (the folder's only video, or in its Subs folder: its subtitles, whatever their names)
|
|
568
|
+
var st = stem(nameOf(rel)).toLowerCase(), ep = episodeKey(st);
|
|
569
|
+
return stems.some(function (v) { return st.indexOf(v) === 0 || (ep && episodeKey(v) === ep); });
|
|
554
570
|
}
|
|
555
571
|
// In a folder's listing (the Local tab): a subtitle file of its own, to match by hand.
|
|
556
572
|
function isStandaloneSub(entries, x) {
|
|
557
|
-
if (!x || x.dir || !isSub(x.name)) { return false; }
|
|
573
|
+
if (!x || x.dir || !isSub(x.name) || WEAK_SUB_RE.test(x.name)) { return false; }
|
|
558
574
|
var stems = (entries || []).filter(function (y) { return !y.dir && isVideo(y.name); }).map(function (y) { return stem(y.name).toLowerCase(); });
|
|
559
575
|
return !isVideosSub(stems, x.rel || x.name);
|
|
560
576
|
}
|
|
@@ -574,10 +590,11 @@ var LocalMedia = (function () {
|
|
|
574
590
|
var d = queue.shift();
|
|
575
591
|
seen++;
|
|
576
592
|
return list(drive, d.rel).then(function (r) {
|
|
593
|
+
var vids = r.entries.filter(function (x) { return !x.dir && isVideo(x.name); }).map(function (x) { return stem(x.name).toLowerCase(); });
|
|
577
594
|
r.entries.forEach(function (x) {
|
|
578
595
|
if (isHidden(x.name)) { return; }
|
|
579
596
|
if (x.dir) { if (d.depth < CLIENT_WALK_DEPTH) { queue.push({ rel: x.rel, depth: d.depth + 1 }); } }
|
|
580
|
-
else if (isVideo(x.name) || isSub(x.name)) { out.push({ p: x.rel, size: x.size }); }
|
|
597
|
+
else if (isVideo(x.name) || (isSub(x.name) && (!WEAK_SUB_RE.test(x.name) || vids.some(function (v) { return x.name.toLowerCase().indexOf(v) === 0; })))) { out.push({ p: x.rel, size: x.size }); } // (a .sub / .txt: named like a video beside it)
|
|
581
598
|
});
|
|
582
599
|
}, function () {}).then(next);
|
|
583
600
|
}
|
|
@@ -739,17 +756,30 @@ var LocalMedia = (function () {
|
|
|
739
756
|
});
|
|
740
757
|
return { lang: lang, forced: forced };
|
|
741
758
|
}
|
|
742
|
-
// A video's subtitle files: in its folder
|
|
743
|
-
// Film.forced.eng.srt),
|
|
759
|
+
// A video's subtitle files: in its folder or a Subs / Subtitles folder beside it (or its
|
|
760
|
+
// Subs/<video's name>/), named like it (Film.srt, Film.en.srt, Film.forced.eng.srt), with its
|
|
761
|
+
// episode number (Show 1x02.srt for Show.S01E02.mkv), or any there when it's the folder's only
|
|
762
|
+
// video (or in its own Subs/<name>/ folder). .sub and .txt only when named like it.
|
|
744
763
|
function sidecars(drive, rel, subRels, alone) {
|
|
745
|
-
var dir = dirOf(rel), base = stem(nameOf(rel)).toLowerCase();
|
|
764
|
+
var dir = dirOf(rel), base = stem(nameOf(rel)).toLowerCase(), ep = episodeKey(base);
|
|
765
|
+
function where(s) {
|
|
766
|
+
var d = dirOf(s);
|
|
767
|
+
if (d === dir) { return 'here'; }
|
|
768
|
+
if (dirOf(d) === dir && SUBS_DIR_RE.test(nameOf(d))) { return 'subs'; }
|
|
769
|
+
if (dirOf(dirOf(d)) === dir && SUBS_DIR_RE.test(nameOf(dirOf(d))) && nameOf(d).toLowerCase() === base) { return 'own'; }
|
|
770
|
+
return '';
|
|
771
|
+
}
|
|
746
772
|
return subRels.filter(function (s) {
|
|
747
|
-
|
|
748
|
-
|
|
773
|
+
var w = where(s), st = stem(nameOf(s)).toLowerCase();
|
|
774
|
+
if (!w || isHidden(nameOf(s))) { return false; }
|
|
775
|
+
if (st.indexOf(base) === 0) { return true; }
|
|
776
|
+
if (WEAK_SUB_RE.test(s)) { return false; }
|
|
777
|
+
return alone || w === 'own' || (!!ep && episodeKey(st) === ep);
|
|
749
778
|
}).map(function (s) {
|
|
750
|
-
var st = stem(nameOf(s)),
|
|
751
|
-
var
|
|
752
|
-
|
|
779
|
+
var st = stem(nameOf(s)), low = st.toLowerCase(), m = EPISODE_RE.exec(st);
|
|
780
|
+
var rest = low.indexOf(base) === 0 ? st.slice(base.length) : (ep && m && episodeKey(st) === ep) ? st.slice(m.index + m[0].length) : st;
|
|
781
|
+
var l = langFrom(rest), inSubs = where(s) !== 'here';
|
|
782
|
+
return subTrack(drive, s, l.lang, inSubs ? U.t('In its Subs folder') : l.forced ? U.t('Next to the file (forced)') : U.t('Next to the file'));
|
|
753
783
|
});
|
|
754
784
|
}
|
|
755
785
|
function subTrack(drive, s, lang, label) {
|
|
@@ -801,13 +831,16 @@ var LocalMedia = (function () {
|
|
|
801
831
|
var BIG = 2147483647;
|
|
802
832
|
// A network folder's file: its link with the folder's sign-in (NetFolders.playUrl).
|
|
803
833
|
function openUrl(url, size) {
|
|
804
|
-
if (typeof NetFolders !== 'undefined' && /^https
|
|
834
|
+
if (typeof NetFolders !== 'undefined' && /^(https?|smb|dlna):/i.test(url || '')) { var nu = NetFolders.playUrl(url); if (nu) { return nu; } }
|
|
805
835
|
if (!/^file:\/\/\/opt\/media\//i.test(url || '')) { return url; }
|
|
806
836
|
var abs = realPath(url);
|
|
807
837
|
if (!size) { var hit = _recent.get(url); size = hit && hit._localFile ? hit._localFile.size : 0; }
|
|
808
838
|
if (!(size > BIG) || !_token || !service()) { return url; }
|
|
809
839
|
return svcUrl('/fsfile?path=' + encodeURIComponent(abs), _token);
|
|
810
840
|
}
|
|
841
|
+
// What must be asked for before a file plays (a network folder's ticket: NetFolders.prepare),
|
|
842
|
+
// or null (nothing: it plays at once).
|
|
843
|
+
function prepare(url) { return typeof NetFolders !== 'undefined' && NetFolders.prepare && /^(https?|smb|dlna):/i.test(url || '') ? NetFolders.prepare(url) : null; }
|
|
811
844
|
function isFolderUrl(url) { return typeof NetFolders !== 'undefined' && !!NetFolders.folderOfUrl(url); }
|
|
812
845
|
function isLocalStream(s) { return !!(s && s._local === MARK && typeof s.url === 'string' && (/^file:\/\/\/opt\/media\//i.test(s.url) || isFolderUrl(s.url))); }
|
|
813
846
|
// The files on your drives for a movie (tt…) or an episode (tt…:1:2), as sources.
|
|
@@ -874,6 +907,17 @@ var LocalMedia = (function () {
|
|
|
874
907
|
});
|
|
875
908
|
}
|
|
876
909
|
|
|
910
|
+
// What's in a file on a drive or in a network folder, from its header (the service's /fsmi,
|
|
911
|
+
// /dav/mi: see its mediaInfo).
|
|
912
|
+
function fileInfo(localFile, cancel) {
|
|
913
|
+
if (!localFile || !localFile.abs) { return Promise.reject(new Error('not a file')); }
|
|
914
|
+
if (localFile.dav) {
|
|
915
|
+
var nf = typeof NetFolders !== 'undefined' ? NetFolders.get(localFile.dav) : null;
|
|
916
|
+
return nf ? NetFolders.mediaInfo(nf, localFile.rel, cancel) : Promise.reject(new Error('no such folder'));
|
|
917
|
+
}
|
|
918
|
+
return askService('/fsmi?path=' + encodeURIComponent(localFile.abs), 25000, 262144, cancel);
|
|
919
|
+
}
|
|
920
|
+
|
|
877
921
|
// ---------- playing ----------
|
|
878
922
|
// From the Local tab: a matched file through its title's page (next episode, sources,
|
|
879
923
|
// addon subtitles…), straight into playback; any other as a plain file.
|
|
@@ -881,7 +925,8 @@ var LocalMedia = (function () {
|
|
|
881
925
|
var file = { p: entry.rel, size: entry.size || 0 };
|
|
882
926
|
var dir = dirOf(entry.rel), subNames = (siblings || []).filter(function (e) { return !e.dir && isSub(e.name); }).map(function (e) { return e.rel; });
|
|
883
927
|
var alone = (siblings || []).filter(function (e) { return !e.dir && isVideo(e.name); }).length <= 1;
|
|
884
|
-
var
|
|
928
|
+
var known = ((_index[drive.root] || {}).subs || []).filter(function (s) { return subOwnerDir(s) === dir && (!subNames.length || dirOf(s) !== dir); }); // (the folder's own from its listing; its Subs folder's from the drive's index)
|
|
929
|
+
var subs = sidecars(drive, entry.rel, subNames.concat(known), alone);
|
|
885
930
|
var st = makeStream(drive, file, subs, entry.uri);
|
|
886
931
|
var m = matchOf(entry.rel, entry.size);
|
|
887
932
|
if (m) {
|
|
@@ -949,7 +994,7 @@ var LocalMedia = (function () {
|
|
|
949
994
|
available: available, ready: ready, watch: watch, present: present, ensure: ensure, forgetDrive: forgetDrive, isNet: isNet, isFolderUrl: isFolderUrl, isRead: isRead, onChange: onChange, drives: drives, knownDrives: knownDrives, hasDrive: hasDrive, refreshDrives: refreshDrives,
|
|
950
995
|
serviceToken: function () { return readToken(); }, askService: askService, addDownloaded: addDownloaded, openUrl: openUrl, list: list, isVideo: isVideo, isSub: isSub, isHidden: isHidden, showHidden: showHidden, setShowHidden: setShowHidden, humanSize: humanSize,
|
|
951
996
|
parseName: parseName, choose: choose, matchOf: matchOf, lookup: lookup, matchFolder: matchFolder, parsedOf: parsedOf, setMatch: setMatch, forgetMatches: forgetMatches, searchTitles: searchTitles,
|
|
952
|
-
scan: scan, stopScan: stopScan, continueMatching: continueMatching, status: status, clearIndex: clearIndex, streamsFor: streamsFor, subsForTitle: subsForTitle, isStandaloneSub: isStandaloneSub, streamForUrl: streamForUrl, isLocalStream: isLocalStream, subtitleExtra: subtitleExtra,
|
|
997
|
+
scan: scan, stopScan: stopScan, continueMatching: continueMatching, status: status, clearIndex: clearIndex, streamsFor: streamsFor, subsForTitle: subsForTitle, isStandaloneSub: isStandaloneSub, __sidecars: sidecars, __standaloneSubs: standaloneSubs, streamForUrl: streamForUrl, isLocalStream: isLocalStream, subtitleExtra: subtitleExtra, fileInfo: fileInfo, prepare: prepare, serviceUrl: serviceUrl,
|
|
953
998
|
play: play, playPlain: playPlain, resumePlain: resumePlain, plainId: plainId, parsePlainId: parsePlainId,
|
|
954
999
|
matchingAllowed: matchingAllowed, matchingAsked: matchingAsked, setMatching: setMatching, wouldMatch: wouldMatch, isPlainId: function (id) { return /^local:/.test('' + id); }
|
|
955
1000
|
};
|
package/js/netfolders.js
CHANGED
|
@@ -16,7 +16,17 @@ var NetFolders = (function () {
|
|
|
16
16
|
function onChange(fn) { _listeners.push(fn); }
|
|
17
17
|
function emit() { _listeners.slice().forEach(function (fn) { try { fn(); } catch (e) {} }); }
|
|
18
18
|
|
|
19
|
-
|
|
19
|
+
// A folder: WebDAV (http(s)://…/, the kind unsaid) or a Windows / NAS share (kind 'smb',
|
|
20
|
+
// smb://host/share/: through StremioK's service, its files played through it too).
|
|
21
|
+
// Or a DLNA media server (kind 'dlna': known by dlna://<its id>/, asked at its control link,
|
|
22
|
+
// f.control; no sign-in).
|
|
23
|
+
function isSmb(f) { return !!f && f.kind === 'smb'; }
|
|
24
|
+
function isDlna(f) { return !!f && f.kind === 'dlna'; }
|
|
25
|
+
function valid(f) {
|
|
26
|
+
if (!f || typeof f.id !== 'string' || !/^[a-z0-9]{4,16}$/.test(f.id) || typeof f.url !== 'string') { return false; }
|
|
27
|
+
if (isDlna(f)) { return /^dlna:\/\/[a-z0-9]{4,40}\/$/.test(f.url) && typeof f.control === 'string' && /^https?:\/\/[^\s@]+$/i.test(f.control); }
|
|
28
|
+
return isSmb(f) ? /^smb:\/\/[^\/\s@]+\/[^\/\\?#]+\/$/i.test(f.url) : /^https?:\/\/[^\s@]+\/$/i.test(f.url);
|
|
29
|
+
}
|
|
20
30
|
function all() { return U.listOf(U.store.get(KEY, []), MAX, valid); }
|
|
21
31
|
function save(list) { U.store.set(KEY, list); emit(); }
|
|
22
32
|
function folders() { return all().filter(function (f) { return !f.off; }); }
|
|
@@ -36,6 +46,8 @@ var NetFolders = (function () {
|
|
|
36
46
|
function baseOf(v) { return ('' + v).trim().replace(/\/*$/, '/'); }
|
|
37
47
|
// A name to show: its last folder, and its server ("media on 192.168.0.50").
|
|
38
48
|
function nameOf(url) {
|
|
49
|
+
var sm = /^smb:\/\/([^\/:]+)(?::\d+)?\/([^\/]+)\/$/i.exec(url || '');
|
|
50
|
+
if (sm) { return U.t('{folder} on {host}', { folder: sm[2], host: sm[1] }); }
|
|
39
51
|
var m = /^https?:\/\/([^\/:]+)(?::\d+)?(\/.*)?$/i.exec(url) || [], segs = (m[2] || '/').split('/').filter(Boolean), last = segs.length ? segs[segs.length - 1] : '';
|
|
40
52
|
try { last = decodeURIComponent(last); } catch (e) {}
|
|
41
53
|
return last ? U.t('{folder} on {host}', { folder: last, host: m[1] || url }) : (m[1] || url);
|
|
@@ -49,7 +61,7 @@ var NetFolders = (function () {
|
|
|
49
61
|
if (f.cert) { h['X-Dav-Cert'] = f.cert; }
|
|
50
62
|
return h;
|
|
51
63
|
}
|
|
52
|
-
function query(f, rel) { return '?u=' + encodeURIComponent(f.url) + (rel != null ? '&p=' + encodeURIComponent(rel) : ''); }
|
|
64
|
+
function query(f, rel) { return '?u=' + encodeURIComponent(isDlna(f) ? 'dlna:' + f.control : f.url) + (rel != null ? '&p=' + encodeURIComponent(rel) : ''); }
|
|
53
65
|
var WHY = {
|
|
54
66
|
auth: U.t('It refused the user name or password'),
|
|
55
67
|
untrusted: U.t('Its certificate isn’t from a known authority'),
|
|
@@ -58,13 +70,15 @@ var NetFolders = (function () {
|
|
|
58
70
|
missing: U.t('No such folder there'),
|
|
59
71
|
elsewhere: U.t('It sent StremioK to another address (not followed)'),
|
|
60
72
|
toolarge: U.t('Its answer was too large'),
|
|
61
|
-
busy: U.t('Another folder is being indexed: try again when it’s done')
|
|
73
|
+
busy: U.t('Another folder is being indexed: try again when it’s done'),
|
|
74
|
+
smb3: U.t('It only speaks SMB 3 (StremioK speaks SMB 2)'),
|
|
75
|
+
other: U.t('It failed')
|
|
62
76
|
};
|
|
63
77
|
// The service's answer, or what went wrong: an Error with why (and, untrusted, the
|
|
64
78
|
// certificate: cert, fp, name, until).
|
|
65
79
|
function ask(f, path, rel, timeout, max, cancel) {
|
|
66
80
|
if (typeof LocalMedia === 'undefined' || !LocalMedia.askService) { return Promise.reject(new Error(U.t('no StremioK service here'))); }
|
|
67
|
-
return LocalMedia.askService('/dav/' + path + query(f, rel), timeout, max, cancel, headers(f)).then(function (r) {
|
|
81
|
+
return LocalMedia.askService((isDlna(f) ? '/dlna/' : isSmb(f) ? '/smb/' : '/dav/') + path + query(f, rel), timeout, max, cancel, headers(f)).then(function (r) {
|
|
68
82
|
if (!r || typeof r !== 'object') { throw new Error(U.t('No answer from StremioK’s service')); }
|
|
69
83
|
if (r.why) {
|
|
70
84
|
var e = new Error((WHY[r.why] || U.t('It failed')) + (r.message && r.why !== 'auth' && r.why !== 'busy' ? ' (' + r.message + ')' : ''));
|
|
@@ -85,6 +99,7 @@ var NetFolders = (function () {
|
|
|
85
99
|
function list(f, rel) {
|
|
86
100
|
rel = ('' + (rel || '')).replace(/^\/+|\/+$/g, '');
|
|
87
101
|
return ask(f, 'list', rel, 30000, 4 * 1048576).then(function (r) {
|
|
102
|
+
noteDigest(f, !!r.digest);
|
|
88
103
|
return { entries: U.listOf(r.entries, 3000, function (x) { return x && typeof x.name === 'string' && x.name && x.name.indexOf('/') === -1; }).map(function (x) { return entryOf(f, rel, x); }) };
|
|
89
104
|
});
|
|
90
105
|
}
|
|
@@ -94,7 +109,52 @@ var NetFolders = (function () {
|
|
|
94
109
|
return { files: U.listOf(r.files, 20000, function (x) { return x && typeof x.p === 'string'; }), truncated: !!r.truncated };
|
|
95
110
|
});
|
|
96
111
|
}
|
|
97
|
-
function subPath(f, rel) { return '/dav/sub' + query(f, rel); }
|
|
112
|
+
function subPath(f, rel) { return (isDlna(f) ? '/dlna/sub' : isSmb(f) ? '/smb/sub' : '/dav/sub') + query(f, rel); }
|
|
113
|
+
// A folder whose server signs in with Digest (the service found it out): kept with it, so its
|
|
114
|
+
// files play through the service (a ticket: the TV's player sends Basic only).
|
|
115
|
+
function noteDigest(f, digest) {
|
|
116
|
+
if (!f || f.id === 'probe' || !!f.digest === digest) { if (f && f.id === 'probe') { f.digest = digest; } return; }
|
|
117
|
+
save(all().map(function (x) { if (x.id !== f.id) { return x; } var g = Object.assign({}, x); if (digest) { g.digest = true; } else { delete g.digest; } return g; }));
|
|
118
|
+
}
|
|
119
|
+
// The service's ticket for a folder whose files play through it (Digest), asked as a file
|
|
120
|
+
// starts (prepare) and kept TICKET_MS (the service keeps it hours, while used).
|
|
121
|
+
var TICKET_MS = 3600000, _tickets = {};
|
|
122
|
+
function needsTicket(f) { return !!(f && (f.digest || isSmb(f) || isDlna(f))); } // (Digest, or a share: the TV's player can do neither)
|
|
123
|
+
function prepare(url) {
|
|
124
|
+
var f = folderOfUrl(url);
|
|
125
|
+
if (!needsTicket(f)) { return null; }
|
|
126
|
+
var t = _tickets[f.id];
|
|
127
|
+
if (t && Date.now() - t.at < TICKET_MS) { return Promise.resolve(t.ticket); }
|
|
128
|
+
return ask(f, 'open', null, 8000, 4096).then(function (r) {
|
|
129
|
+
if (!r || !/^[0-9a-f]{32}$/.test(r.ticket || '')) { throw new Error('no ticket'); }
|
|
130
|
+
_tickets[f.id] = { ticket: r.ticket, at: Date.now() };
|
|
131
|
+
return r.ticket;
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
// What's in a video there, from its header (the service's /dav/mi: see mediaInfo).
|
|
135
|
+
function mediaInfo(f, rel, cancel) { return ask(f, 'mi', rel, 25000, 262144, cancel); }
|
|
136
|
+
// A media server's id as a folder's name: its UDN (or control link), hashed short.
|
|
137
|
+
function dlnaId(s) { var h = 5381; s = '' + s; for (var i = 0; i < s.length; i++) { h = ((h * 33) ^ s.charCodeAt(i)) >>> 0; } return 'm' + h.toString(36) + s.length.toString(36); }
|
|
138
|
+
// The media servers on the home network (asked now, a few seconds): [{ id, name, control }],
|
|
139
|
+
// those already added left out.
|
|
140
|
+
function discover() {
|
|
141
|
+
if (typeof LocalMedia === 'undefined' || !LocalMedia.askService) { return Promise.reject(new Error(U.t('no StremioK service here'))); }
|
|
142
|
+
return LocalMedia.askService('/dlna/discover', 20000, 262144).then(function (r) {
|
|
143
|
+
var have = all().filter(isDlna).map(function (f) { return f.control; });
|
|
144
|
+
return U.listOf(r && r.servers, 32, function (x) { return x && typeof x.control === 'string' && /^https?:\/\//i.test(x.control) && typeof x.name === 'string'; })
|
|
145
|
+
.filter(function (x) { return have.indexOf(x.control) === -1; });
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
// A server's shares, to pick one (smb://host/): [{ name, remark }].
|
|
149
|
+
function shares(host, user, pass) {
|
|
150
|
+
var f = { id: 'probe', kind: 'smb', url: 'smb://' + host + '/', user: '' + (user || ''), pass: '' + (pass || '') };
|
|
151
|
+
return ask(f, 'shares', null, 30000, 262144).then(function (r) { return U.listOf(r.shares, 200, function (x) { return x && typeof x.name === 'string' && x.name; }); });
|
|
152
|
+
}
|
|
153
|
+
// A server's address as typed for a share: a host (name or address, a port after it), or null.
|
|
154
|
+
function smbHostOf(v) {
|
|
155
|
+
var m = /^(?:smb:\/\/|\\\\)?([A-Za-z0-9._-]{1,253})(?::(\d{1,5}))?[\/\\]*$/.exec(('' + (v || '')).trim());
|
|
156
|
+
return m ? m[1] + (m[2] ? ':' + m[2] : '') : null;
|
|
157
|
+
}
|
|
98
158
|
|
|
99
159
|
// ---- links ----
|
|
100
160
|
// The folder a link is in (its address a prefix of the link), or null.
|
|
@@ -113,6 +173,9 @@ var NetFolders = (function () {
|
|
|
113
173
|
function playUrl(url) {
|
|
114
174
|
var f = folderOfUrl(url);
|
|
115
175
|
if (!f) { return null; }
|
|
176
|
+
var t = needsTicket(f) ? _tickets[f.id] : null;
|
|
177
|
+
if (t && typeof LocalMedia !== 'undefined' && LocalMedia.serviceUrl) { return LocalMedia.serviceUrl('/net/' + t.ticket + '/f?p=' + encodeURIComponent(relOf(f, url))); } // (Digest: through the service)
|
|
178
|
+
if (isSmb(f) || isDlna(f)) { return null; } // (a share's or a media server's file: through the service, its ticket asked first)
|
|
116
179
|
if (!f.user && !f.pass) { return '' + url; }
|
|
117
180
|
return ('' + url).replace(/^(https?:\/\/)/i, '$1' + encodeURIComponent(f.user || '') + ':' + encodeURIComponent(f.pass || '') + '@');
|
|
118
181
|
}
|
|
@@ -121,15 +184,20 @@ var NetFolders = (function () {
|
|
|
121
184
|
function newId() { var s = ''; while (s.length < 8) { s += Math.floor(Math.random() * 36).toString(36); } return s; }
|
|
122
185
|
// Ask the folder (its top's listing) with this sign-in: resolves the folder to keep, or
|
|
123
186
|
// rejects as ask does (untrusted: the certificate to ask about, then probe again with it).
|
|
124
|
-
function probe(url, user, pass, cert) {
|
|
187
|
+
function probe(url, user, pass, cert, kind, server) {
|
|
125
188
|
var f = { id: 'probe', url: baseOf(url), user: '' + (user || ''), pass: '' + (pass || ''), cert: cert || '' };
|
|
126
|
-
|
|
189
|
+
if (kind === 'smb') { f.kind = 'smb'; f.cert = ''; }
|
|
190
|
+
if (kind === 'dlna') { f = { id: 'probe', kind: 'dlna', url: 'dlna://' + dlnaId(server.id || server.control) + '/', control: server.control, user: '', pass: '', cert: '' }; }
|
|
191
|
+
return list(f, '').then(function (r) { return { url: f.url, user: f.user, pass: f.pass, cert: f.cert, name: kind === 'dlna' ? ('' + (server.name || 'DLNA')).slice(0, 80) : nameOf(f.url), entries: r.entries.length, digest: !!f.digest, kind: f.kind, control: f.control }; });
|
|
127
192
|
}
|
|
128
193
|
// Keep a folder probe() found (the same address again: replaced).
|
|
129
194
|
function add(p) {
|
|
130
195
|
var l = all().filter(function (f) { return f.url !== p.url; });
|
|
131
196
|
if (l.length >= MAX) { throw new Error(U.t('Up to {n} network folders', { n: MAX })); }
|
|
132
197
|
var f = { id: newId(), name: p.name || nameOf(p.url), url: p.url, user: p.user || '', pass: p.pass || '', cert: p.cert || '', at: Date.now() };
|
|
198
|
+
if (p.digest) { f.digest = true; }
|
|
199
|
+
if (p.kind === 'smb') { f.kind = 'smb'; }
|
|
200
|
+
if (p.kind === 'dlna') { f.kind = 'dlna'; f.control = p.control; }
|
|
133
201
|
l.push(f);
|
|
134
202
|
save(l);
|
|
135
203
|
U.log('local', 'Network folder “' + f.name + '” added' + (f.cert ? ' (its certificate trusted)' : ''));
|
|
@@ -152,6 +220,6 @@ var NetFolders = (function () {
|
|
|
152
220
|
return {
|
|
153
221
|
all: all, folders: folders, get: get, drives: drives, driveOf: driveOf, onChange: onChange,
|
|
154
222
|
addressProblem: addressProblem, nameOf: nameOf, probe: probe, add: add, setOn: setOn, remove: remove,
|
|
155
|
-
list: list, walk: walk, headers: headers, subPath: subPath, fileUrl: fileUrl, folderOfUrl: folderOfUrl, relOf: relOf, playUrl: playUrl
|
|
223
|
+
list: list, walk: walk, headers: headers, subPath: subPath, mediaInfo: mediaInfo, prepare: prepare, shares: shares, smbHostOf: smbHostOf, isSmb: isSmb, isDlna: isDlna, discover: discover, fileUrl: fileUrl, folderOfUrl: folderOfUrl, relOf: relOf, playUrl: playUrl
|
|
156
224
|
};
|
|
157
225
|
})();
|
package/js/player-audio.js
CHANGED
|
@@ -151,14 +151,19 @@
|
|
|
151
151
|
if (prefs.length && cfg.lang2 !== 'none' && cfg.lang2 !== cfg.lang) { prefs.push(cfg.lang2); }
|
|
152
152
|
// (the track playing already in that language: kept, not swapped for another
|
|
153
153
|
// track in it, e.g. the first English one when the file plays its second)
|
|
154
|
-
|
|
154
|
+
// (a commentary track, by the file's header, only when the language has nothing else)
|
|
155
|
+
var playing = -1, own = P.fileTracks ? P.fileTracks('audio', tracks) : null;
|
|
156
|
+
var talk = function (i) { return !!(own && own[i] && own[i].commentary); };
|
|
155
157
|
for (var k = 0; k < tracks.length; k++) { if (tracks[k].index === _audioIdx) { playing = k; break; } }
|
|
156
158
|
for (var p = 0; p < prefs.length && pos < 0; p++) {
|
|
157
|
-
if (playing >= 0 && langMatches(prefs[p], infoLang(trackInfo(tracks[playing])))) { pos = playing; break; }
|
|
159
|
+
if (playing >= 0 && !talk(playing) && langMatches(prefs[p], infoLang(trackInfo(tracks[playing])))) { pos = playing; break; }
|
|
160
|
+
var first = -1;
|
|
158
161
|
for (var i = 0; i < tracks.length; i++) {
|
|
159
|
-
|
|
160
|
-
if (
|
|
162
|
+
if (!langMatches(prefs[p], infoLang(trackInfo(tracks[i])))) { continue; }
|
|
163
|
+
if (first < 0) { first = i; }
|
|
164
|
+
if (!talk(i)) { pos = i; break; }
|
|
161
165
|
}
|
|
166
|
+
if (pos < 0 && first >= 0) { pos = first; }
|
|
162
167
|
}
|
|
163
168
|
}
|
|
164
169
|
return pos;
|
|
@@ -190,14 +195,16 @@
|
|
|
190
195
|
}
|
|
191
196
|
// Menu wording: "English · 6ch · EAC3 (eng)"; the raw tag keeps regional
|
|
192
197
|
// variants apart (es-419 vs es-ES).
|
|
193
|
-
function audioMenuLabel(tr, n) {
|
|
198
|
+
function audioMenuLabel(tr, n, own) {
|
|
194
199
|
var info = trackInfo(tr), lang = infoLang(info);
|
|
195
200
|
var ch = info.channels || info.channel, codec = info.fourCC || info.codec || '';
|
|
196
201
|
var parts = [lang && lang !== 'und' ? langName(lang) : U.t('Audio {n}', { n: n + 1 })];
|
|
197
202
|
if (ch) { parts.push(ch + 'ch'); }
|
|
198
203
|
if (codec) { parts.push(('' + codec).toUpperCase()); }
|
|
199
204
|
var label = parts.join(' · ');
|
|
200
|
-
|
|
205
|
+
label = (lang && lang !== 'und' && langName(lang).toLowerCase() !== ('' + lang).toLowerCase()) ? label + ' (' + lang + ')' : label;
|
|
206
|
+
var note = own && P.fileTrackNote ? P.fileTrackNote(own) : ''; // (its own name, from the file's header: "Commentary with the director")
|
|
207
|
+
return note ? label + ' · ' + note : label;
|
|
201
208
|
}
|
|
202
209
|
|
|
203
210
|
// force: the track picked is the one the TV already reports. If you can still hear
|
|
@@ -316,7 +323,8 @@
|
|
|
316
323
|
// same language's tracks sit together.
|
|
317
324
|
function audioMenu() {
|
|
318
325
|
var cfg = getAudioCfg(), prefs = [cfg.lang, cfg.lang2].filter(function (x) { return x && x !== 'default' && x !== 'none'; });
|
|
319
|
-
var
|
|
326
|
+
var all = getAudioTracks(), own = P.fileTracks ? P.fileTracks('audio', all) : null;
|
|
327
|
+
var tracks = all.map(function (tr, i) { return { tr: tr, n: i, k: langKey(trackLang(tr)) }; });
|
|
320
328
|
tracks.sort(function (a, b) {
|
|
321
329
|
var ra = langRank(a.k, prefs), rb = langRank(b.k, prefs);
|
|
322
330
|
if (ra !== rb) { return ra - rb; }
|
|
@@ -327,7 +335,7 @@
|
|
|
327
335
|
var items = tracks.map(function (x, i) {
|
|
328
336
|
var tr = x.tr;
|
|
329
337
|
if (tr.index === _audioIdx) { idx = i; }
|
|
330
|
-
return { label: audioMenuLabel(tr, x.n), sel: (tr.index === _audioIdx),
|
|
338
|
+
return { label: audioMenuLabel(tr, x.n, own && own[x.n]), sel: (tr.index === _audioIdx),
|
|
331
339
|
run: function () {
|
|
332
340
|
if (stuck) { closeMenu(); U.toast(cantSwitchText(), 6000); return; }
|
|
333
341
|
// re-picking the checked track re-applies it (see selectAudio)
|
package/js/player-controls.js
CHANGED
|
@@ -846,6 +846,73 @@
|
|
|
846
846
|
var tags = (info && Stremio.formatTags) ? Stremio.formatTags(info, S.actual) : '';
|
|
847
847
|
if (tags) { lines.push([U.t('Format'), tags]); }
|
|
848
848
|
}
|
|
849
|
+
// What the file's header says (S.mi: player-core's startFileInfo): its container and video,
|
|
850
|
+
// what its Dolby Vision does on this TV, and its audio and subtitle tracks, each with its
|
|
851
|
+
// language, codec and own name (MI_SHOW of each, then how many more).
|
|
852
|
+
var MI_SHOW = 6;
|
|
853
|
+
var CODEC_NAMES = { h264: 'H.264', hevc: 'HEVC', av1: 'AV1', vp9: 'VP9', vp8: 'VP8', mpeg2: 'MPEG-2', mpeg4: 'MPEG-4', aac: 'AAC', ac3: 'Dolby Digital', eac3: 'Dolby Digital Plus',
|
|
854
|
+
dts: 'DTS', truehd: 'Dolby TrueHD', flac: 'FLAC', opus: 'Opus', vorbis: 'Vorbis', mp3: 'MP3', mp2: 'MP2', pcm: 'PCM', alac: 'ALAC', srt: 'SRT', ass: 'ASS', ssa: 'SSA',
|
|
855
|
+
vtt: 'WebVTT', pgs: 'PGS', vobsub: 'VobSub', dvb: 'DVB', mov_text: 'MP4 text', ttml: 'TTML', cc608: 'CEA-608', textst: 'TextST', usf: 'USF' };
|
|
856
|
+
function codecName(c) { return CODEC_NAMES[c] || (c ? ('' + c).toUpperCase() : ''); }
|
|
857
|
+
function channelsName(n) { return ({ 1: '1.0', 2: '2.0', 3: '2.1', 6: '5.1', 7: '6.1', 8: '7.1' })[n] || (n ? n + 'ch' : ''); }
|
|
858
|
+
// Samsung TVs have no Dolby Vision: what's underneath plays (HDR10, HLG or SDR); a profile 5
|
|
859
|
+
// file has nothing underneath, so its colors come out wrong (green and purple).
|
|
860
|
+
function dvNote(dv) {
|
|
861
|
+
var p = dv.profile || '';
|
|
862
|
+
if (dv.compat === 1 || dv.compat === 6) { return U.t('Dolby Vision {p}: plays as HDR10', { p: p }); }
|
|
863
|
+
if (dv.compat === 4) { return U.t('Dolby Vision {p}: plays as HLG', { p: p }); }
|
|
864
|
+
if (dv.compat === 2) { return U.t('Dolby Vision {p}: plays as SDR', { p: p }); }
|
|
865
|
+
if (p) { return U.t('Dolby Vision {p}: no HDR10 layer, its colors look wrong on this TV', { p: p }); }
|
|
866
|
+
return U.t('Dolby Vision');
|
|
867
|
+
}
|
|
868
|
+
function trackLine(t) {
|
|
869
|
+
var lang = t.lang && !/^(und|zxx|mis)$/i.test(t.lang) ? P.langName(t.lang) : '';
|
|
870
|
+
var bits = [lang, codecName(t.codec), channelsName(t.channels)];
|
|
871
|
+
if (t.name && t.name.toLowerCase() !== lang.toLowerCase()) { bits.push('“' + t.name + '”'); }
|
|
872
|
+
if (t.forced && !/forced/i.test(t.name || '')) { bits.push(U.t('forced')); }
|
|
873
|
+
if (t.commentary && !/commentary/i.test(t.name || '')) { bits.push(U.t('commentary')); }
|
|
874
|
+
if (t.hi && !/\bSDH\b/i.test(t.name || '')) { bits.push('SDH'); }
|
|
875
|
+
return bits.filter(Boolean).join(' ');
|
|
876
|
+
}
|
|
877
|
+
// A track's own name and marks, for the menus (no language: the menu says it): "“Signs &
|
|
878
|
+
// songs” · forced", a picture subtitle (PGS, VobSub) said not shown (the TV hands over none).
|
|
879
|
+
function fileTrackNote(t) {
|
|
880
|
+
if (!t) { return ''; }
|
|
881
|
+
var bits = [];
|
|
882
|
+
if (t.name) { bits.push('“' + t.name + '”'); }
|
|
883
|
+
if (t.forced && !/forced/i.test(t.name || '')) { bits.push(U.t('forced')); }
|
|
884
|
+
if (t.commentary && !/commentary/i.test(t.name || '')) { bits.push(U.t('commentary')); }
|
|
885
|
+
if (t.hi && !/\bSDH\b/i.test(t.name || '')) { bits.push('SDH'); }
|
|
886
|
+
if (t.text === false && /^(pgs|vobsub|dvb)$/.test(t.codec || '')) { bits.push(U.t('{codec}: pictures, not shown', { codec: codecName(t.codec) })); }
|
|
887
|
+
return bits.join(' · ');
|
|
888
|
+
}
|
|
889
|
+
P.fileTrackNote = fileTrackNote;
|
|
890
|
+
function trackList(list) {
|
|
891
|
+
var out = list.slice(0, MI_SHOW).map(trackLine);
|
|
892
|
+
if (list.length > MI_SHOW) { out.push(U.t('{n} more', { n: list.length - MI_SHOW })); }
|
|
893
|
+
return out.join(' · ');
|
|
894
|
+
}
|
|
895
|
+
// The file in short, for a start that failed (player-core's formatFailText): its video and
|
|
896
|
+
// the audio that plays first. '' when the header said neither.
|
|
897
|
+
function fileSummary(mi) {
|
|
898
|
+
var v = mi.video, a = (mi.audio || []).filter(function (x) { return x.default; })[0] || (mi.audio || [])[0], out = [];
|
|
899
|
+
if (v && v.codec) { out.push([codecName(v.codec), v.bitDepth > 8 ? U.t('{n}-bit', { n: v.bitDepth }) : '', v.hdr === 'hdr10' && !v.dv ? 'HDR10' : v.hdr === 'hlg' && !v.dv ? 'HLG' : ''].filter(Boolean).join(' ')); }
|
|
900
|
+
if (v && v.dv) { out.push(v.dv.profile ? 'Dolby Vision ' + v.dv.profile : 'Dolby Vision'); }
|
|
901
|
+
if (a && a.codec) { out.push([codecName(a.codec), channelsName(a.channels)].filter(Boolean).join(' ')); }
|
|
902
|
+
return out.join(' · ');
|
|
903
|
+
}
|
|
904
|
+
P.fileSummary = fileSummary;
|
|
905
|
+
function fileLines(lines) {
|
|
906
|
+
var mi = S.mi;
|
|
907
|
+
if (!mi || !mi.container) { return; }
|
|
908
|
+
var v = mi.video, parts = [('' + mi.container).toUpperCase()];
|
|
909
|
+
if (v) { parts.push([codecName(v.codec), v.bitDepth > 8 ? U.t('{n}-bit', { n: v.bitDepth }) : '', v.hdr === 'hdr10' ? 'HDR10' : v.hdr === 'hlg' ? 'HLG' : ''].filter(Boolean).join(' ')); }
|
|
910
|
+
if (mi.duration > 0) { parts.push(U.fmtTime(mi.duration)); }
|
|
911
|
+
lines.push([U.t('In the file'), parts.filter(Boolean).join(' · ')]);
|
|
912
|
+
if (v && v.dv) { lines.push([U.t('Dolby Vision'), dvNote(v.dv)]); }
|
|
913
|
+
if (mi.audio && mi.audio.length) { lines.push([U.t('Audio tracks'), trackList(mi.audio)]); }
|
|
914
|
+
if (mi.subs && mi.subs.length) { lines.push([U.t('Subtitle tracks'), trackList(mi.subs)]); }
|
|
915
|
+
}
|
|
849
916
|
// How it reaches the player (no link): straight from its server, or through StremioK's service.
|
|
850
917
|
function howItPlays() {
|
|
851
918
|
var c = S.ctx;
|
|
@@ -860,6 +927,7 @@
|
|
|
860
927
|
if (!el || !S.ctx) { return; }
|
|
861
928
|
var lines = [], video = null, audio = null;
|
|
862
929
|
sourceLines(lines);
|
|
930
|
+
fileLines(lines);
|
|
863
931
|
if (P.useAV) {
|
|
864
932
|
try {
|
|
865
933
|
var now = avplay.getCurrentStreamInfo() || [];
|