refactor(downloads): rename functions to remove AsZip from names
This commit is contained in:
parent
2923757029
commit
9b7e1e2369
3 changed files with 11 additions and 11 deletions
12
js/app.js
12
js/app.js
|
|
@ -1334,8 +1334,8 @@ document.addEventListener('DOMContentLoaded', async () => {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const { mix, tracks } = await MusicAPI.instance.getMix(mixId);
|
const { mix, tracks } = await MusicAPI.instance.getMix(mixId);
|
||||||
const { downloadPlaylistAsZip } = await loadDownloadsModule();
|
const { downloadPlaylist } = await loadDownloadsModule();
|
||||||
await downloadPlaylistAsZip(
|
await downloadPlaylist(
|
||||||
mix,
|
mix,
|
||||||
tracks,
|
tracks,
|
||||||
MusicAPI.instance,
|
MusicAPI.instance,
|
||||||
|
|
@ -1383,8 +1383,8 @@ document.addEventListener('DOMContentLoaded', async () => {
|
||||||
tracks = data.tracks;
|
tracks = data.tracks;
|
||||||
}
|
}
|
||||||
|
|
||||||
const { downloadPlaylistAsZip } = await loadDownloadsModule();
|
const { downloadPlaylist } = await loadDownloadsModule();
|
||||||
await downloadPlaylistAsZip(
|
await downloadPlaylist(
|
||||||
playlist,
|
playlist,
|
||||||
tracks,
|
tracks,
|
||||||
MusicAPI.instance,
|
MusicAPI.instance,
|
||||||
|
|
@ -2300,8 +2300,8 @@ document.addEventListener('DOMContentLoaded', async () => {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const { album, tracks } = await MusicAPI.instance.getAlbum(albumId);
|
const { album, tracks } = await MusicAPI.instance.getAlbum(albumId);
|
||||||
const { downloadAlbumAsZip } = await loadDownloadsModule();
|
const { downloadAlbum } = await loadDownloadsModule();
|
||||||
await downloadAlbumAsZip(
|
await downloadAlbum(
|
||||||
album,
|
album,
|
||||||
tracks,
|
tracks,
|
||||||
MusicAPI.instance,
|
MusicAPI.instance,
|
||||||
|
|
|
||||||
|
|
@ -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 =
|
const releaseDateStr =
|
||||||
album.releaseDate || (tracks[0]?.streamStartDate ? tracks[0].streamStartDate.split('T')[0] : '');
|
album.releaseDate || (tracks[0]?.streamStartDate ? tracks[0].streamStartDate.split('T')[0] : '');
|
||||||
const releaseDate = releaseDateStr ? new Date(releaseDateStr) : null;
|
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, {
|
const folderName = formatPathTemplate(modernSettings.folderTemplate, {
|
||||||
albumTitle: playlist.title,
|
albumTitle: playlist.title,
|
||||||
albumArtist: 'Playlist',
|
albumArtist: 'Playlist',
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ import {
|
||||||
waveformSettings,
|
waveformSettings,
|
||||||
keyboardShortcuts,
|
keyboardShortcuts,
|
||||||
} from './storage.js';
|
} 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 { downloadQualitySettings } from './storage.js';
|
||||||
import { updateTabTitle, navigate } from './router.js';
|
import { updateTabTitle, navigate } from './router.js';
|
||||||
import { db } from './db.js';
|
import { db } from './db.js';
|
||||||
|
|
@ -1238,7 +1238,7 @@ export async function handleTrackAction(
|
||||||
|
|
||||||
if (action === 'download') {
|
if (action === 'download') {
|
||||||
if (type === 'album') {
|
if (type === 'album') {
|
||||||
await downloadAlbumAsZip(
|
await downloadAlbum(
|
||||||
collectionItem,
|
collectionItem,
|
||||||
tracks,
|
tracks,
|
||||||
api,
|
api,
|
||||||
|
|
@ -1246,7 +1246,7 @@ export async function handleTrackAction(
|
||||||
lyricsManager
|
lyricsManager
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
await downloadPlaylistAsZip(
|
await downloadPlaylist(
|
||||||
collectionItem,
|
collectionItem,
|
||||||
tracks,
|
tracks,
|
||||||
api,
|
api,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue