Fix compilation albums artist reading

Author: kuba2k2

src/core/BeatSaberCore.tsx

@@ -99,8 +99,12 @@ export class BeatSaberCore {
 
 		if (BeatSaber.Settings.bsaberUsername && BeatSaber.Settings) {
 			Spicetify.showNotification("Syncing bookmarks...")
-			const keys = await BeatSaber.Api.getBookmarkKeys(BeatSaber.Settings.bsaberUsername)
-			const storedKeys = await BeatSaber.Storage.Map.getKeys(MapCategory.BOOKMARKED)
+			const keys = await BeatSaber.Api.getBookmarkKeys(
+				BeatSaber.Settings.bsaberUsername
+			)
+			const storedKeys = await BeatSaber.Storage.Map.getKeys(
+				MapCategory.BOOKMARKED
+			)
 			const missingPages = new Set<number>()
 
 			keys.forEach((key, index) => {
@@ -111,16 +115,24 @@ export class BeatSaberCore {
 
 			for (const page of missingPages) {
 				Spicetify.showNotification(`Getting bookmarks page ${page}...`)
-				const bookmarks = await BeatSaber.Api.getBookmarks(BeatSaber.Settings.bsaberUsername, page)
-				await BeatSaber.Storage.Map.put(MapCategory.BOOKMARKED, ...bookmarks)
+				const bookmarks = await BeatSaber.Api.getBookmarks(
+					BeatSaber.Settings.bsaberUsername,
+					page
+				)
+				await BeatSaber.Storage.Map.put(
+					MapCategory.BOOKMARKED,
+					...bookmarks
+				)
 			}
 		}
 
 		Spicetify.showNotification("Syncing downloads...")
 		const downloads = await BeatSaber.Api.getDownloads()
 		await BeatSaber.Storage.Map.put(MapCategory.DOWNLOADED, ...downloads)
 
-		Spicetify.showNotification(`Added ${bookmarkCount || "no"} new bookmarks`)
+		Spicetify.showNotification(
+			`Added ${bookmarkCount || "no"} new bookmarks`
+		)
 	}
 
 	public initializeSubApp(window: Window) {

src/core/api/ApiUtils.ts

@@ -17,7 +17,9 @@ export class ApiUtils {
 	BeastSaber = new BeastSaber()
 
 	constructor() {
-		this.BeastSaber.setRequestHandler(new BackendRequestHandler("bsaber.com"))
+		this.BeastSaber.setRequestHandler(
+			new BackendRequestHandler("bsaber.com")
+		)
 	}
 
 	async getTrackMetadata(uri: Spicetify.URI): Promise<BridgeTrack> {
@@ -51,8 +53,11 @@ export class ApiUtils {
 	}
 
 	private async login() {
-		if (!await this.BeastSaber.isLoggedIn()) {
-			await this.BeastSaber.login(BeatSaber.Settings.bsaberLogin, BeatSaber.Settings.bsaberPassword)
+		if (!(await this.BeastSaber.isLoggedIn())) {
+			await this.BeastSaber.login(
+				BeatSaber.Settings.bsaberLogin,
+				BeatSaber.Settings.bsaberPassword
+			)
 		}
 	}
 

src/core/queue/requests/MapsRequest.ts

@@ -1,4 +1,3 @@
-import { SortOrder } from "beatsaver-api/lib/api/search"
 import { Track, TrackState } from "../../models/Track"
 import { TrackQueueRequest } from "../base/TrackQueueRequest"
 

src/ui/watchers/AlbumWatcher.ts

@@ -11,6 +11,13 @@ export class AlbumWatcher extends BaseWatcher<HTMLDivElement> {
 	mount(child: Element): BaseWatcher<Element> {
 		if (!isHTMLDiv(child)) return
 
+		const stickyHeaderRow = <HTMLTableRowElement>(
+			child.querySelector("table.Table__sticky-header-table > thead > tr")
+		)
+		if (!stickyHeaderRow.querySelector(".TableCellBeatSaber")) {
+			stickyHeaderRow.insertCell(2).className = "TableCellBeatSaber"
+		}
+
 		const artists = []
 		child
 			.querySelectorAll(".AlbumMetaInfo__artists a")
@@ -19,14 +26,16 @@ export class AlbumWatcher extends BaseWatcher<HTMLDivElement> {
 				artists.push(artist.textContent.trim())
 			})
 
-		const stickyHeaderRow = <HTMLTableRowElement>(
-			child.querySelector("table.Table__sticky-header-table > thead > tr")
-		)
-		if (!stickyHeaderRow.querySelector(".TableCellBeatSaber")) {
-			stickyHeaderRow.insertCell(2).className = "TableCellBeatSaber"
+		const table = <HTMLTableElement>child.querySelector(".Table > table")
+
+		if (!artists.length && child.querySelector(".AlbumMetaInfo__artists")) {
+			// probably a compilation
+			return new TracklistWatcher(
+				table,
+				TracklistTypes.ALBUM_REACT_COMPILATION
+			)
 		}
 
-		const table = <HTMLTableElement>child.querySelector(".Table > table")
 		return new TracklistWatcher(table, TracklistTypes.ALBUM_REACT, artists)
 	}
 }

src/ui/watchers/TrackWatcher.tsx

@@ -51,7 +51,7 @@ export class TrackWatcher extends BaseWatcher<HTMLTableRowElement> {
 		const uri = Spicetify.URI.fromString(
 			this.root.getAttribute(this.type.uriAttribute)
 		)
-		const artists = this.artists ? [...this.artists] : []
+		let artists = this.artists ? [...this.artists] : []
 		const title = this.root
 			.querySelector(this.type.titleQuery)
 			?.textContent?.trim()
@@ -64,7 +64,9 @@ export class TrackWatcher extends BaseWatcher<HTMLTableRowElement> {
 			artists.push(artist.textContent.trim())
 		})
 
-		if (!uri || !artists || !title) return
+		artists = artists.filter((artist) => !!artist)
+
+		if (!uri || !artists.length || !title) return
 
 		if (!Spicetify.URI.isTrack(uri)) return
 

src/ui/watchers/TracklistType.ts

@@ -63,4 +63,16 @@ export class TracklistTypes {
 		artistsQuery: ".TableCellSong__featuredArtists a",
 		artistsQueryUnavailable: ".TableCellSong__featuredArtists span",
 	}
+	static readonly ALBUM_REACT_COMPILATION: TracklistType = {
+		hasHeader: true,
+		uriAttribute: "data-ta-uri",
+		headerClass: "TableHeaderRow",
+		cellIndex: 2,
+		cellQuery: ".TableCellBeatSaber",
+		cellClass: "TableCell TableCellBeatSaber",
+		cellHeaderClass: "TableCellBeatSaber",
+		titleQuery: ".TableCellSong__track-name",
+		artistsQuery: ".TableCellArtists > span a",
+		artistsQueryUnavailable: ".TableCellArtists > span span",
+	}
 }