initial attempt at downloading albums from playlist tracks

Author: krankydonkey

cli/src/download.ts

@@ -18,7 +18,7 @@ const listener: Listener = {
 	},
 };
 
-export const downloadLinks = async (
+const initialLinks = async (
 	dz: Deezer,
 	urls: string[],
 	settings: Settings,
@@ -27,6 +27,7 @@ export const downloadLinks = async (
 	const bitrate = settings.maxBitrate ?? TrackFormats.MP3_128;
 
 	const downloadObjects = [];
+	const expandedObjects = [];
 	for (const url of urls) {
 		try {
 			const downloadObject = await generateDownloadObject(
@@ -36,7 +37,6 @@ export const downloadLinks = async (
 				{ spotify: spotifyPlugin },
 				listener
 			);
-
 			if (Array.isArray(downloadObject)) {
 				downloadObjects.concat(downloadObject);
 			} else {
@@ -59,6 +59,42 @@ export const downloadLinks = async (
 			}
 		}
 	}
+	return downloadObjects
+}
+
+
+export const downloadLinks = async (
+	dz: Deezer,
+	urls: string[],
+	settings: Settings,
+	spotifyPlugin: SpotifyPlugin
+) => {
+	const initialObjects = await initialLinks(
+		dz,
+		urls,
+		settings,
+		spotifyPlugin
+	)
+	let downloadObjects = [];
+	if (settings.downloadAlbumSingles) {
+		const albumUrls = [];
+		for (let downloadObject of initialObjects) {
+			if (downloadObject.type === "playlist") {
+				for (let track of downloadObject.collection.tracks) {
+					albumUrls.push(track.album.link)
+				}
+			}
+		}
+		const uniqueUrls = [...new Set(albumUrls)];
+		downloadObjects = await initialLinks(
+			dz,
+			uniqueUrls,
+			settings,
+			spotifyPlugin
+		)
+	} else {
+		downloadObjects = initialObjects;
+	}
 
 	for (let downloadObject of downloadObjects) {
 		if (downloadObject instanceof Convertable) {

deemix/src/settings.ts

@@ -42,6 +42,7 @@ export const DEFAULT_SETTINGS: Settings = {
 	queueConcurrency: 10,
 	maxBitrate: TrackFormats.MP3_128,
 	feelingLucky: false,
+	downloadAlbumSingles: false,
 	fallbackBitrate: false,
 	fallbackSearch: false,
 	fallbackISRC: false,

deemix/src/types/Settings.ts

@@ -61,6 +61,7 @@ export interface Settings {
 	illegalCharacterReplacer?: string;
 	queueConcurrency?: number;
 	maxBitrate?: number;
+	downloadAlbumSingles?: boolean;
 	fallbackBitrate?: boolean;
 	fallbackSearch?: boolean;
 	logErrors?: boolean;

webui/src/client/lang/en.mjs

@@ -310,6 +310,7 @@ const en = {
 				e: "No, and don't look at the extensions",
 				l: "Overwrite only if upgrading bitrate (mp3 only)",
 			},
+			downloadAlbumSingles: "Download albums of playlist tracks",
 			fallbackBitrate: "Bitrate fallback",
 			fallbackSearch: "Search fallback",
 			fallbackISRC: "Fallback with ISRC search",

webui/src/client/views/SettingsPage.vue

@@ -990,6 +990,14 @@ function canDownload(bitrate: number) {
 				<div
 					class="settings-container__third settings-container__third--only-checkbox"
 				>
+
+					<label class="with-checkbox">
+						<input v-model="settings.downloadAlbumSingles" type="checkbox" />
+						<span class="checkbox-text">{{
+							t("settings.downloads.downloadAlbumSingles")
+						}}</span>
+					</label>
+
 					<label class="with-checkbox">
 						<input v-model="settings.fallbackBitrate" type="checkbox" />
 						<span class="checkbox-text">{{