working playlist albums

Author: krankydonkey

webui/src/client/views/SettingsPage.vue

@@ -991,13 +991,6 @@ function canDownload(bitrate: number) {
 					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">{{
@@ -1059,6 +1052,13 @@ function canDownload(bitrate: number) {
 							t("settings.downloads.createM3U8File")
 						}}</span>
 					</label>
+
+					<label class="with-checkbox">
+						<input v-model="settings.downloadAlbumSingles" type="checkbox" />
+						<span class="checkbox-text">{{
+							t("settings.downloads.downloadAlbumSingles")
+						}}</span>
+					</label>
 				</div>
 			</div>
 

webui/src/server/deemixApp.ts

@@ -175,7 +175,7 @@ export class DeemixApp {
 		return result;
 	}
 
-	async addToQueue(
+	async getDownloadObjects(
 		dz: Deezer,
 		url: string[],
 		bitrate: number,
@@ -241,8 +241,30 @@ export class DeemixApp {
 			});
 		}
 
-		const slimmedObjects: Record<string, any>[] = [];
+		return downloadObjs;
+	}
+
+	async addToQueue(
+		dz: Deezer,
+		url: string[],
+		bitrate: number,
+		retry: boolean = false
+	) {
+		let downloadObjs = await this.getDownloadObjects(dz, url, bitrate, retry);
+		if (this.settings.downloadAlbumSingles) {
+			const albumUrls = [];
+			downloadObjs.forEach((downloadObj) => {
+				if (downloadObj.type === "playlist") {
+					let playlist = new Collection(downloadObj)
+					playlist.collection.tracks.forEach((track) => {
+						albumUrls.push(track.album.link)
+					});
+				}
+			});
+			downloadObjs = await this.getDownloadObjects(dz, albumUrls, bitrate, retry);
+		}
 
+		const slimmedObjects: Record<string, any>[] = [];
 		downloadObjs.forEach((downloadObj) => {
 			// Check if element is already in queue
 			if (Object.keys(this.queue).includes(downloadObj.uuid) && !retry) {