mirrors/deemix-js
1
0
Fork 0
mirror of https://gitlab.com/RemixDev/deemix-js.git synced 2025-01-16 11:15:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Cannot read property 'includes' of undefined error

Browse source
This commit is contained in:
RemixDev 2021-09-21 14:42:06 +02:00
parent a18c04acd4
commit ce1105ed96
1 changed files with 30 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
deemix/downloader.js
View file

@ -74,34 +74,12 @@ async function downloadImage(url, path, overwrite = OverwriteOption.DONT_OVERWRI
async function getPreferredBitrate(dz, track, preferredBitrate, shouldFallback, uuid, listener){ async function getPreferredBitrate(dz, track, preferredBitrate, shouldFallback, uuid, listener){
preferredBitrate = parseInt(preferredBitrate) preferredBitrate = parseInt(preferredBitrate)
if (track.localTrack) { return TrackFormats.LOCAL}
let falledBack = false let falledBack = false
let hasAlternative = track.fallbackID != 0 let hasAlternative = track.fallbackID != 0
let isGeolocked = false let isGeolocked = false
let wrongLicense = false let wrongLicense = false
const formats_non_360 = {
[TrackFormats.FLAC]: "FLAC",
[TrackFormats.MP3_320]: "MP3_320",
[TrackFormats.MP3_128]: "MP3_128"
}
const formats_360 = {
[TrackFormats.MP4_RA3]: "MP4_RA3",
[TrackFormats.MP4_RA2]: "MP4_RA2",
[TrackFormats.MP4_RA1]: "MP4_RA1"
}
const is360Format = Object.keys(formats_360).includes(preferredBitrate)
let formats
if (!shouldFallback){
formats = {...formats_360, ...formats_non_360}
}else if (is360Format){
formats = {...formats_360}
}else{
formats = {...formats_non_360}
}
async function testURL(track, url, formatName){ async function testURL(track, url, formatName){
if (!url) return false if (!url) return false
let request let request
@ -150,6 +128,33 @@ async function getPreferredBitrate(dz, track, preferredBitrate, shouldFallback,
return url return url
} }
if (track.localTrack) {
let url = await getCorrectURL(track, "MP3_MISC", TrackFormats.LOCAL)
track.urls["MP3_MISC"] = url
return TrackFormats.LOCAL
}
const formats_non_360 = {
[TrackFormats.FLAC]: "FLAC",
[TrackFormats.MP3_320]: "MP3_320",
[TrackFormats.MP3_128]: "MP3_128"
}
const formats_360 = {
[TrackFormats.MP4_RA3]: "MP4_RA3",
[TrackFormats.MP4_RA2]: "MP4_RA2",
[TrackFormats.MP4_RA1]: "MP4_RA1"
}
const is360Format = Object.keys(formats_360).includes(preferredBitrate)
let formats
if (!shouldFallback){
formats = {...formats_360, ...formats_non_360}
}else if (is360Format){
formats = {...formats_360}
}else{
formats = {...formats_non_360}
}
for (let i = 0; i < Object.keys(formats).length; i++){ for (let i = 0; i < Object.keys(formats).length; i++){
// Check bitrates // Check bitrates
let formatNumber = Object.keys(formats).reverse()[i] let formatNumber = Object.keys(formats).reverse()[i]
@ -197,6 +202,8 @@ async function getPreferredBitrate(dz, track, preferredBitrate, shouldFallback,
} }
} }
if (is360Format) throw new TrackNot360 if (is360Format) throw new TrackNot360
let url = await getCorrectURL(track, "MP3_MISC", TrackFormats.DEFAULT)
track.urls["MP3_MISC"] = url
return TrackFormats.DEFAULT return TrackFormats.DEFAULT
} }
@ -466,6 +473,7 @@ class Downloader {
// Download the track // Download the track
if (!trackAlreadyDownloaded || this.settings.overwriteFile == OverwriteOption.OVERWRITE){ if (!trackAlreadyDownloaded || this.settings.overwriteFile == OverwriteOption.OVERWRITE){
track.downloadURL = track.urls[formatsName[track.bitrate]] track.downloadURL = track.urls[formatsName[track.bitrate]]
if (!track.downloadURL) throw new DownloadFailed('notAvailable', track)
let stream = fs.createWriteStream(writepath) let stream = fs.createWriteStream(writepath)
try { try {
await streamTrack(stream, track, 0, this.downloadObject, this.listener) await streamTrack(stream, track, 0, this.downloadObject, this.listener)