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