diff --git a/js/downloads.js b/js/downloads.js index 1a5abad..90a682d 100644 --- a/js/downloads.js +++ b/js/downloads.js @@ -278,7 +278,15 @@ function removeBulkDownloadTask(notifEl) { }, 300); } -async function downloadTrackBlob(track, quality, api, lyricsManager = null, signal = null, onProgress = null, coverBlob = null) { +async function downloadTrackBlob( + track, + quality, + api, + lyricsManager = null, + signal = null, + onProgress = null, + coverBlob = null +) { let enrichedTrack = { ...track, artist: track.artist || (track.artists && track.artists.length > 0 ? track.artists[0] : null), @@ -566,9 +574,17 @@ async function bulkDownloadToZipStream( updateBulkDownloadProgress(notification, i, tracks.length, trackTitle); try { - const { blob, extension } = await downloadTrackBlob(track, quality, api, null, signal, (p) => { - updateBulkDownloadProgress(notification, i, tracks.length, trackTitle, p); - }, coverBlob); + const { blob, extension } = await downloadTrackBlob( + track, + quality, + api, + null, + signal, + (p) => { + updateBulkDownloadProgress(notification, i, tracks.length, trackTitle, p); + }, + coverBlob + ); const filename = buildTrackFilename(track, quality, extension); const discNumber = discLayout.resolveDiscNumber(i); yield { @@ -710,9 +726,17 @@ async function bulkDownloadToZipBlob( updateBulkDownloadProgress(notification, i, tracks.length, trackTitle); try { - const { blob, extension } = await downloadTrackBlob(track, quality, api, null, signal, (p) => { - updateBulkDownloadProgress(notification, i, tracks.length, trackTitle, p); - }, coverBlob); + const { blob, extension } = await downloadTrackBlob( + track, + quality, + api, + null, + signal, + (p) => { + updateBulkDownloadProgress(notification, i, tracks.length, trackTitle, p); + }, + coverBlob + ); const filename = buildTrackFilename(track, quality, extension); const discNumber = discLayout.resolveDiscNumber(i); yield { @@ -855,9 +879,17 @@ async function bulkDownloadToZipNeutralino( updateBulkDownloadProgress(notification, i, tracks.length, trackTitle); try { - const { blob, extension } = await downloadTrackBlob(track, quality, api, null, signal, (p) => { - updateBulkDownloadProgress(notification, i, tracks.length, trackTitle, p); - }, coverBlob); + const { blob, extension } = await downloadTrackBlob( + track, + quality, + api, + null, + signal, + (p) => { + updateBulkDownloadProgress(notification, i, tracks.length, trackTitle, p); + }, + coverBlob + ); const filename = buildTrackFilename(track, quality, extension); const discNumber = discLayout.resolveDiscNumber(i); yield { @@ -1185,7 +1217,15 @@ export async function downloadDiscography(artist, selectedReleases, api, quality const track = tracks[i]; if (signal.aborted) break; try { - const { blob, extension } = await downloadTrackBlob(track, quality, api, null, signal, null, coverBlob); + const { blob, extension } = await downloadTrackBlob( + track, + quality, + api, + null, + signal, + null, + coverBlob + ); const filename = buildTrackFilename(track, quality, extension); const discNumber = discLayout.resolveDiscNumber(i); yield { diff --git a/js/metadata.js b/js/metadata.js index f49e16c..b0f1ceb 100644 --- a/js/metadata.js +++ b/js/metadata.js @@ -41,7 +41,7 @@ function getFullArtistString(track) { } /** - * + * * @param {Object} track * @returns {string|null} */ @@ -988,19 +988,7 @@ async function createFlacPictureBlockFromBytes(imageBytes, mimeType = 'image/jpe const description = ''; const descBytes = new TextEncoder().encode(description); - - const totalSize = - 4 + - 4 + - mimeBytes.length + - 4 + - descBytes.length + - 4 + - 4 + - 4 + - 4 + - 4 + - imageBytes.length; + const totalSize = 4 + 4 + mimeBytes.length + 4 + descBytes.length + 4 + 4 + 4 + 4 + 4 + imageBytes.length; const buffer = new ArrayBuffer(totalSize); const view = new DataView(buffer);