diff --git a/js/app.js b/js/app.js index d790b49..6ad391d 100644 --- a/js/app.js +++ b/js/app.js @@ -1334,8 +1334,8 @@ document.addEventListener('DOMContentLoaded', async () => { try { const { mix, tracks } = await MusicAPI.instance.getMix(mixId); - const { downloadPlaylistAsZip } = await loadDownloadsModule(); - await downloadPlaylistAsZip( + const { downloadPlaylist } = await loadDownloadsModule(); + await downloadPlaylist( mix, tracks, MusicAPI.instance, @@ -1383,8 +1383,8 @@ document.addEventListener('DOMContentLoaded', async () => { tracks = data.tracks; } - const { downloadPlaylistAsZip } = await loadDownloadsModule(); - await downloadPlaylistAsZip( + const { downloadPlaylist } = await loadDownloadsModule(); + await downloadPlaylist( playlist, tracks, MusicAPI.instance, @@ -2300,8 +2300,8 @@ document.addEventListener('DOMContentLoaded', async () => { try { const { album, tracks } = await MusicAPI.instance.getAlbum(albumId); - const { downloadAlbumAsZip } = await loadDownloadsModule(); - await downloadAlbumAsZip( + const { downloadAlbum } = await loadDownloadsModule(); + await downloadAlbum( album, tracks, MusicAPI.instance, diff --git a/js/downloads.js b/js/downloads.js index b42da41..759fba6 100644 --- a/js/downloads.js +++ b/js/downloads.js @@ -723,7 +723,7 @@ export async function downloadTracks(tracks, api, quality, lyricsManager = null) }); } -export async function downloadAlbumAsZip(album, tracks, api, quality, lyricsManager = null) { +export async function downloadAlbum(album, tracks, api, quality, lyricsManager = null) { const releaseDateStr = album.releaseDate || (tracks[0]?.streamStartDate ? tracks[0].streamStartDate.split('T')[0] : ''); const releaseDate = releaseDateStr ? new Date(releaseDateStr) : null; @@ -748,7 +748,7 @@ export async function downloadAlbumAsZip(album, tracks, api, quality, lyricsMana }); } -export async function downloadPlaylistAsZip(playlist, tracks, api, quality, lyricsManager = null) { +export async function downloadPlaylist(playlist, tracks, api, quality, lyricsManager = null) { const folderName = formatPathTemplate(modernSettings.folderTemplate, { albumTitle: playlist.title, albumArtist: 'Playlist', diff --git a/js/events.js b/js/events.js index e90f7cf..f069c2c 100644 --- a/js/events.js +++ b/js/events.js @@ -15,7 +15,7 @@ import { waveformSettings, keyboardShortcuts, } from './storage.js'; -import { showNotification, downloadTrackWithMetadata, downloadAlbumAsZip, downloadPlaylistAsZip } from './downloads.js'; +import { showNotification, downloadTrackWithMetadata, downloadAlbum, downloadPlaylist } from './downloads.js'; import { downloadQualitySettings } from './storage.js'; import { updateTabTitle, navigate } from './router.js'; import { db } from './db.js'; @@ -1238,7 +1238,7 @@ export async function handleTrackAction( if (action === 'download') { if (type === 'album') { - await downloadAlbumAsZip( + await downloadAlbum( collectionItem, tracks, api, @@ -1246,7 +1246,7 @@ export async function handleTrackAction( lyricsManager ); } else { - await downloadPlaylistAsZip( + await downloadPlaylist( collectionItem, tracks, api,