From 1e8e1789cd44e9489164ff3eda072697a9581d22 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Sun, 14 Dec 2025 04:26:39 -0800
Subject: [PATCH] remove artist song list fetch post-processing

- the post-processing sort breaks the correct order returned by the API
---
 src/shared/api/utils.ts | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/shared/api/utils.ts b/src/shared/api/utils.ts
index 59368793c..763bb3c2e 100644
--- a/src/shared/api/utils.ts
+++ b/src/shared/api/utils.ts
@@ -306,7 +306,11 @@ export const sortSongsByFetchedOrder = (
     }
 
     // Sort each group by discNumber and trackNumber
+    // Skip sorting for ALBUM_ARTIST as songs are already sorted by the API
     for (const [fetchedId, groupSongs] of songsByFetchedId.entries()) {
+        if (itemType === LibraryItem.ALBUM_ARTIST) {
+            continue;
+        }
         const sortedGroup = orderBy(groupSongs, ['discNumber', 'trackNumber'], ['asc', 'asc']);
         songsByFetchedId.set(fetchedId, sortedGroup);
     }
@@ -324,12 +328,17 @@ export const sortSongsByFetchedOrder = (
     const matchedIds = new Set(result.map((s) => s.id));
     const unmatchedSongs = songs.filter((s) => !matchedIds.has(s.id));
     if (unmatchedSongs.length > 0) {
-        const sortedUnmatched = orderBy(
-            unmatchedSongs,
-            ['discNumber', 'trackNumber'],
-            ['asc', 'asc'],
-        );
-        result.push(...sortedUnmatched);
+        // Skip sorting for ALBUM_ARTIST as songs are already sorted by the API
+        if (itemType === LibraryItem.ALBUM_ARTIST) {
+            result.push(...unmatchedSongs);
+        } else {
+            const sortedUnmatched = orderBy(
+                unmatchedSongs,
+                ['discNumber', 'trackNumber'],
+                ['asc', 'asc'],
+            );
+            result.push(...sortedUnmatched);
+        }
     }
 
     return result;