dasha 3.1.8 → 3.1.9
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/lib/track.js +26 -10
- package/package.json +1 -1
package/lib/track.js
CHANGED
|
@@ -11,7 +11,9 @@ const parseMimes = (codecs) =>
|
|
|
11
11
|
const createResolutionFilter = (videos) => {
|
|
12
12
|
return ({ width, height }) => {
|
|
13
13
|
return videos.filter(
|
|
14
|
-
(track) =>
|
|
14
|
+
(track) =>
|
|
15
|
+
(!width || track.width === width) &&
|
|
16
|
+
(!height || track.height === height),
|
|
15
17
|
);
|
|
16
18
|
};
|
|
17
19
|
};
|
|
@@ -30,9 +32,13 @@ const createVideoCodecFilter = (videos) => createCodecFilter(videos);
|
|
|
30
32
|
const createVideoQualityFilter = (videos) => {
|
|
31
33
|
return (quality) => {
|
|
32
34
|
if (!quality) return [getBestTrack(videos)];
|
|
33
|
-
const trackQuality = String(quality).includes('p')
|
|
35
|
+
const trackQuality = String(quality).includes('p')
|
|
36
|
+
? quality
|
|
37
|
+
: `${quality}p`;
|
|
34
38
|
const results = videos.filter((track) => track.quality === trackQuality);
|
|
35
|
-
results.
|
|
39
|
+
results.sort((a, b) =>
|
|
40
|
+
b.bitrate && a.bitrate ? b.bitrate.bps - a.bitrate.bps : 0,
|
|
41
|
+
);
|
|
36
42
|
return results.length ? results : [getBestTrack(videos)];
|
|
37
43
|
};
|
|
38
44
|
};
|
|
@@ -49,13 +55,17 @@ const createAudioLanguageFilter = (audios) => {
|
|
|
49
55
|
if (!alreadyAdded) languages.push(audio.language);
|
|
50
56
|
}
|
|
51
57
|
} else {
|
|
52
|
-
audios.
|
|
58
|
+
audios.sort((a, b) =>
|
|
59
|
+
a.bitrate && b.bitrate ? b.bitrate.bps - a.bitrate.bps : 0,
|
|
60
|
+
);
|
|
53
61
|
return audios.slice(0, maxTracksPerLanguage);
|
|
54
62
|
}
|
|
55
63
|
}
|
|
56
64
|
const filtered = [];
|
|
57
65
|
for (const language of languages) {
|
|
58
|
-
const tracks = audios.filter((track) =>
|
|
66
|
+
const tracks = audios.filter((track) =>
|
|
67
|
+
track.language?.startsWith(language),
|
|
68
|
+
);
|
|
59
69
|
filtered.push(...tracks);
|
|
60
70
|
}
|
|
61
71
|
const results = [];
|
|
@@ -75,7 +85,8 @@ const createAudioLanguageFilter = (audios) => {
|
|
|
75
85
|
const createAudioChannelsFilter = (audios) => {
|
|
76
86
|
return (channels) => {
|
|
77
87
|
if (!channels) return audios;
|
|
78
|
-
const value =
|
|
88
|
+
const value =
|
|
89
|
+
typeof channels === 'string' ? parseFloat(channels) : channels;
|
|
79
90
|
return audios.filter((track) => track.channels === value);
|
|
80
91
|
};
|
|
81
92
|
};
|
|
@@ -85,18 +96,23 @@ const createSubtitleLanguageFilter = (subtitles) => {
|
|
|
85
96
|
if (!languages.length) return subtitles;
|
|
86
97
|
return subtitles.filter((track) =>
|
|
87
98
|
languages.some(
|
|
88
|
-
(language) =>
|
|
99
|
+
(language) =>
|
|
100
|
+
track.language?.startsWith(language) ||
|
|
101
|
+
track.label?.startsWith(language),
|
|
89
102
|
),
|
|
90
103
|
);
|
|
91
104
|
};
|
|
92
105
|
};
|
|
93
106
|
|
|
94
|
-
const filterByResolution = (tracks, resolution) =>
|
|
95
|
-
|
|
107
|
+
const filterByResolution = (tracks, resolution) =>
|
|
108
|
+
createResolutionFilter(tracks)(resolution);
|
|
109
|
+
const filterByQuality = (tracks, quality) =>
|
|
110
|
+
createVideoQualityFilter(tracks)(quality);
|
|
96
111
|
const filterByCodecs = (tracks, codecs) => createCodecFilter(tracks)(codecs);
|
|
97
112
|
const filterByLanguages = (tracks, languages, maxTracksPerLanguage) =>
|
|
98
113
|
createAudioLanguageFilter(tracks)(languages, maxTracksPerLanguage);
|
|
99
|
-
const filterByChannels = (tracks, channels) =>
|
|
114
|
+
const filterByChannels = (tracks, channels) =>
|
|
115
|
+
createAudioChannelsFilter(tracks)(channels);
|
|
100
116
|
|
|
101
117
|
module.exports = {
|
|
102
118
|
parseMimes,
|