From 1bbfde2e473621b7448a022be50584be01081737 Mon Sep 17 00:00:00 2001
From: lostf1sh <slorixbaba@outlook.com>
Date: Fri, 19 Jun 2026 17:58:48 +0300
Subject: [PATCH] Refine artist parsing and album display metadata

---
 .idea/deploymentTargetSelector.xml            |  4 +-
 .../pixelplay/data/database/MusicDao.kt       |  4 ++
 .../pixelplay/data/gdrive/GDriveRepository.kt | 11 ++---
 .../data/media/SongMetadataEditor.kt          |  3 ++
 .../preferences/UserPreferencesRepository.kt  | 13 +++++-
 .../pixelplay/data/stream/CloudMusicUtils.kt  | 12 +++---
 .../data/worker/AlbumGroupingUtils.kt         | 12 +++++-
 .../pixelplay/data/worker/SyncWorker.kt       |  4 +-
 .../UserPreferencesRepositoryTest.kt          | 28 +++++++++++++
 .../data/stream/CloudMusicUtilsTest.kt        | 23 +++++++++++
 .../data/worker/AlbumGroupingUtilsTest.kt     | 18 ++++++++
 .../data/worker/ArtistParsingUtilsTest.kt     | 41 +++++++++++++++++++
 12 files changed, 153 insertions(+), 20 deletions(-)
 create mode 100644 app/src/test/java/com/theveloper/pixelplay/data/stream/CloudMusicUtilsTest.kt

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index d8b7d40b0..c932c1186 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="deploymentTargetSelector">
     <selectionStates>
-      <SelectionState runConfigName="app">
+      <SelectionState runConfigName="wear">
         <option name="selectionMode" value="DROPDOWN" />
         <DropdownSelection timestamp="2026-03-26T13:52:07.598927Z">
           <Target type="DEFAULT_BOOT">
@@ -13,7 +13,7 @@
         </DropdownSelection>
         <DialogSelection />
       </SelectionState>
-      <SelectionState runConfigName="wear">
+      <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
         <DropdownSelection timestamp="2026-03-26T13:52:07.598927Z">
           <Target type="DEFAULT_BOOT">
diff --git a/app/src/main/java/com/theveloper/pixelplay/data/database/MusicDao.kt b/app/src/main/java/com/theveloper/pixelplay/data/database/MusicDao.kt
index c45d119ca..8a141e350 100644
--- a/app/src/main/java/com/theveloper/pixelplay/data/database/MusicDao.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/data/database/MusicDao.kt
@@ -1653,6 +1653,7 @@ interface MusicDao {
             artist_id = :artistId,
             artists_json = :artistsJson,
             album_name = :album,
+            album_artist = :albumArtist,
             genre = :genre,
             track_number = :trackNumber,
             disc_number = :discNumber
@@ -1665,6 +1666,7 @@ interface MusicDao {
         artistId: Long,
         artistsJson: String?,
         album: String,
+        albumArtist: String?,
         genre: String?,
         trackNumber: Int,
         discNumber: Int?
@@ -1678,6 +1680,7 @@ interface MusicDao {
         artistId: Long,
         artistsJson: String?,
         album: String,
+        albumArtist: String?,
         genre: String?,
         trackNumber: Int,
         discNumber: Int?,
@@ -1695,6 +1698,7 @@ interface MusicDao {
             artistId = artistId,
             artistsJson = artistsJson,
             album = album,
+            albumArtist = albumArtist,
             genre = genre,
             trackNumber = trackNumber,
             discNumber = discNumber
diff --git a/app/src/main/java/com/theveloper/pixelplay/data/gdrive/GDriveRepository.kt b/app/src/main/java/com/theveloper/pixelplay/data/gdrive/GDriveRepository.kt
index 1a3457e27..3aadb6b4b 100644
--- a/app/src/main/java/com/theveloper/pixelplay/data/gdrive/GDriveRepository.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/data/gdrive/GDriveRepository.kt
@@ -16,6 +16,7 @@ import com.theveloper.pixelplay.data.database.SongEntity
 import com.theveloper.pixelplay.data.database.SourceType
 import com.theveloper.pixelplay.data.database.toSong
 import com.theveloper.pixelplay.data.model.Song
+import com.theveloper.pixelplay.data.stream.CloudMusicUtils
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
@@ -526,14 +527,8 @@ class GDriveRepository @Inject constructor(
         )
     }
 
-    private fun parseArtistNames(rawArtist: String): List<String> {
-        if (rawArtist.isBlank()) return listOf("Unknown Artist")
-        val parsed = rawArtist.split(Regex("\\s*[,/&;+]\\s*"))
-            .map { it.trim() }
-            .filter { it.isNotBlank() }
-            .distinct()
-        return if (parsed.isEmpty()) listOf("Unknown Artist") else parsed
-    }
+    private fun parseArtistNames(rawArtist: String): List<String> =
+        CloudMusicUtils.parseArtistNames(rawArtist)
 
     private fun toUnifiedSongId(driveFileId: String): Long {
         return -(GDRIVE_SONG_ID_OFFSET + driveFileId.hashCode().toLong().absoluteValue)
diff --git a/app/src/main/java/com/theveloper/pixelplay/data/media/SongMetadataEditor.kt b/app/src/main/java/com/theveloper/pixelplay/data/media/SongMetadataEditor.kt
index 245c9b4e8..e1f7c41eb 100644
--- a/app/src/main/java/com/theveloper/pixelplay/data/media/SongMetadataEditor.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/data/media/SongMetadataEditor.kt
@@ -152,6 +152,7 @@ class SongMetadataEditor(
         title: String,
         artist: String,
         album: String,
+        albumArtist: String?,
         genre: String?,
         trackNumber: Int,
         discNumber: Int?
@@ -222,6 +223,7 @@ class SongMetadataEditor(
             artistId = primaryArtistId,
             artistsJson = artistsJson,
             album = album,
+            albumArtist = albumArtist,
             genre = genre,
             trackNumber = trackNumber,
             discNumber = discNumber,
@@ -525,6 +527,7 @@ class SongMetadataEditor(
                 title = newTitle,
                 artist = newArtist,
                 album = newAlbum,
+                albumArtist = newAlbumArtist,
                 genre = normalizedGenre,
                 trackNumber = newTrackNumber,
                 discNumber = newDiscNumber
diff --git a/app/src/main/java/com/theveloper/pixelplay/data/preferences/UserPreferencesRepository.kt b/app/src/main/java/com/theveloper/pixelplay/data/preferences/UserPreferencesRepository.kt
index 9efca552a..da931897c 100644
--- a/app/src/main/java/com/theveloper/pixelplay/data/preferences/UserPreferencesRepository.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/data/preferences/UserPreferencesRepository.kt
@@ -995,7 +995,11 @@ suspend fun markDirectoryRulesVersionApplied(version: Int) {
     // ─── Multi-artist settings ────────────────────────────────────────────────
 
     val artistDelimitersFlow: Flow<List<String>> =
-        pref { decodeJsonPref(it, PreferencesKeys.ARTIST_DELIMITERS, DEFAULT_ARTIST_DELIMITERS) }
+        pref {
+            normalizeLegacyDefaultArtistDelimiters(
+                decodeJsonPref(it, PreferencesKeys.ARTIST_DELIMITERS, DEFAULT_ARTIST_DELIMITERS)
+            )
+        }
 
     suspend fun setArtistDelimiters(delimiters: List<String>) {
         if (delimiters.isEmpty()) return
@@ -1347,7 +1351,9 @@ suspend fun markDirectoryRulesVersionApplied(version: Int) {
 
     companion object {
         /** Default character delimiters for splitting multi-artist tags. */
-        val DEFAULT_ARTIST_DELIMITERS = listOf("/", ";", ",", "+", "&")
+        val DEFAULT_ARTIST_DELIMITERS = listOf(";")
+
+        private val LEGACY_DEFAULT_ARTIST_DELIMITERS = listOf("/", ";", ",", "+", "&")
 
         /** Default word-based delimiters matched case-insensitively with whitespace boundaries. */
         val DEFAULT_ARTIST_WORD_DELIMITERS = listOf(
@@ -1360,6 +1366,9 @@ suspend fun markDirectoryRulesVersionApplied(version: Int) {
 
     // ─── Private utilities ────────────────────────────────────────────────────
 
+    private fun normalizeLegacyDefaultArtistDelimiters(delimiters: List<String>): List<String> =
+        if (delimiters == LEGACY_DEFAULT_ARTIST_DELIMITERS) DEFAULT_ARTIST_DELIMITERS else delimiters
+
     /** Increments [value] by 1, wrapping back to 0 on overflow. */
     private fun incrementWrapped(value: Int?) =
         if (value == null || value == Int.MAX_VALUE) 0 else value + 1
diff --git a/app/src/main/java/com/theveloper/pixelplay/data/stream/CloudMusicUtils.kt b/app/src/main/java/com/theveloper/pixelplay/data/stream/CloudMusicUtils.kt
index ff86e0d1c..2bbe8da32 100644
--- a/app/src/main/java/com/theveloper/pixelplay/data/stream/CloudMusicUtils.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/data/stream/CloudMusicUtils.kt
@@ -1,5 +1,7 @@
 package com.theveloper.pixelplay.data.stream
 
+import com.theveloper.pixelplay.data.preferences.UserPreferencesRepository
+import com.theveloper.pixelplay.utils.splitArtistsByDelimiters
 import org.json.JSONObject
 
 /**
@@ -26,13 +28,13 @@ object CloudMusicUtils {
         return result
     }
 
-    /** Split a raw artist string like "A, B & C" into individual names. */
+    /** Split a raw artist string using the same conservative defaults as local library sync. */
     fun parseArtistNames(rawArtist: String): List<String> {
         if (rawArtist.isBlank()) return listOf("Unknown Artist")
-        val parsed = rawArtist.split(Regex("\\s*[,/&;+、]\\s*"))
-            .map { it.trim() }
-            .filter { it.isNotBlank() }
-            .distinct()
+        val parsed = rawArtist.splitArtistsByDelimiters(
+            delimiters = UserPreferencesRepository.DEFAULT_ARTIST_DELIMITERS,
+            wordDelimiters = UserPreferencesRepository.DEFAULT_ARTIST_WORD_DELIMITERS
+        )
         return if (parsed.isEmpty()) listOf("Unknown Artist") else parsed
     }
 }
diff --git a/app/src/main/java/com/theveloper/pixelplay/data/worker/AlbumGroupingUtils.kt b/app/src/main/java/com/theveloper/pixelplay/data/worker/AlbumGroupingUtils.kt
index c5e877c4a..2e017b99b 100644
--- a/app/src/main/java/com/theveloper/pixelplay/data/worker/AlbumGroupingUtils.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/data/worker/AlbumGroupingUtils.kt
@@ -67,7 +67,9 @@ internal fun buildAlbumGroupingKeys(album: AlbumEntity): List<AlbumGroupingKey>
 
 internal fun chooseAlbumDisplayArtist(
     songs: List<SongEntity>,
-    preferAlbumArtist: Boolean
+    preferAlbumArtist: Boolean,
+    artistDelimiters: List<String> = emptyList(),
+    wordDelimiters: List<String> = emptyList()
 ): String {
     if (songs.isEmpty()) return "Unknown Artist"
 
@@ -78,7 +80,13 @@ internal fun chooseAlbumDisplayArtist(
     )
     val trackArtist = mostCommonValue(
         songs.map { song ->
-            song.artistName.normalizeMetadataTextOrEmpty()
+            collectArtistNames(
+                rawArtistName = song.artistName,
+                title = song.title,
+                artistDelimiters = artistDelimiters,
+                wordDelimiters = wordDelimiters,
+                extractFromTitle = true
+            ).firstOrNull().normalizeMetadataTextOrEmpty()
         }
     )
 
diff --git a/app/src/main/java/com/theveloper/pixelplay/data/worker/SyncWorker.kt b/app/src/main/java/com/theveloper/pixelplay/data/worker/SyncWorker.kt
index 02d160a44..91e4d8987 100644
--- a/app/src/main/java/com/theveloper/pixelplay/data/worker/SyncWorker.kt
+++ b/app/src/main/java/com/theveloper/pixelplay/data/worker/SyncWorker.kt
@@ -620,7 +620,9 @@ constructor(
              val representativeAlbumArt = songsInAlbum.firstNotNullOfOrNull { it.albumArtUriString }
              val determinedAlbumArtist = chooseAlbumDisplayArtist(
                  songs = songsInAlbum,
-                 preferAlbumArtist = groupByAlbumArtist
+                 preferAlbumArtist = groupByAlbumArtist,
+                 artistDelimiters = artistDelimiters,
+                 wordDelimiters = wordDelimiters
              )
              val determinedAlbumArtistId = resolveAlbumDisplayArtistId(
                  displayArtist = determinedAlbumArtist,
diff --git a/app/src/test/java/com/theveloper/pixelplay/data/preferences/UserPreferencesRepositoryTest.kt b/app/src/test/java/com/theveloper/pixelplay/data/preferences/UserPreferencesRepositoryTest.kt
index 6c75bf38d..adc8690cb 100644
--- a/app/src/test/java/com/theveloper/pixelplay/data/preferences/UserPreferencesRepositoryTest.kt
+++ b/app/src/test/java/com/theveloper/pixelplay/data/preferences/UserPreferencesRepositoryTest.kt
@@ -11,6 +11,34 @@ import java.nio.file.Files
 
 class UserPreferencesRepositoryTest {
 
+    @Test
+    fun `default artist delimiters avoid common characters inside artist names`() {
+        assertEquals(listOf(";"), UserPreferencesRepository.DEFAULT_ARTIST_DELIMITERS)
+    }
+
+    @Test
+    fun `artistDelimitersFlow normalizes stored legacy defaults`() = runTest {
+        val tempDir = Files.createTempDirectory("user-preferences-repository-test")
+        try {
+            val repository = UserPreferencesRepository(
+                dataStore = PreferenceDataStoreFactory.create(
+                    scope = backgroundScope,
+                    produceFile = { tempDir.resolve("settings.preferences_pb").toFile() }
+                ),
+                json = Json
+            )
+
+            repository.setArtistDelimiters(listOf("/", ";", ",", "+", "&"))
+
+            assertEquals(
+                UserPreferencesRepository.DEFAULT_ARTIST_DELIMITERS,
+                repository.artistDelimitersFlow.first()
+            )
+        } finally {
+            tempDir.toFile().deleteRecursively()
+        }
+    }
+
     @Test
     fun `clearPreferencesExceptKeys preserves initial setup completion`() = runTest {
         val tempDir = Files.createTempDirectory("user-preferences-repository-test")
diff --git a/app/src/test/java/com/theveloper/pixelplay/data/stream/CloudMusicUtilsTest.kt b/app/src/test/java/com/theveloper/pixelplay/data/stream/CloudMusicUtilsTest.kt
new file mode 100644
index 000000000..bfd35a313
--- /dev/null
+++ b/app/src/test/java/com/theveloper/pixelplay/data/stream/CloudMusicUtilsTest.kt
@@ -0,0 +1,23 @@
+package com.theveloper.pixelplay.data.stream
+
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class CloudMusicUtilsTest {
+
+    @Test
+    fun `parseArtistNames preserves common punctuation in artist names by default`() {
+        assertEquals(listOf("W&W"), CloudMusicUtils.parseArtistNames("W&W"))
+        assertEquals(listOf("AC/DC"), CloudMusicUtils.parseArtistNames("AC/DC"))
+        assertEquals(listOf("Lost & Found"), CloudMusicUtils.parseArtistNames("Lost & Found"))
+        assertEquals(listOf("Black Country, New Road"), CloudMusicUtils.parseArtistNames("Black Country, New Road"))
+    }
+
+    @Test
+    fun `parseArtistNames still splits explicit semicolon artists`() {
+        assertEquals(
+            listOf("Artist One", "Artist Two"),
+            CloudMusicUtils.parseArtistNames("Artist One; Artist Two")
+        )
+    }
+}
diff --git a/app/src/test/java/com/theveloper/pixelplay/data/worker/AlbumGroupingUtilsTest.kt b/app/src/test/java/com/theveloper/pixelplay/data/worker/AlbumGroupingUtilsTest.kt
index b535a2cc1..fee88c597 100644
--- a/app/src/test/java/com/theveloper/pixelplay/data/worker/AlbumGroupingUtilsTest.kt
+++ b/app/src/test/java/com/theveloper/pixelplay/data/worker/AlbumGroupingUtilsTest.kt
@@ -113,6 +113,24 @@ class AlbumGroupingUtilsTest {
         assertThat(displayArtist).isEqualTo("The Weeknd")
     }
 
+    @Test
+    fun `chooseAlbumDisplayArtist uses primary parsed artist for feature-heavy albums`() {
+        val songs = listOf(
+            testSong(artistName = "Gorillaz feat. Stevie Nicks", albumArtist = null),
+            testSong(artistName = "Gorillaz feat. Thundercat", albumArtist = null),
+            testSong(artistName = "Gorillaz feat. Tame Impala", albumArtist = null)
+        )
+
+        val displayArtist = chooseAlbumDisplayArtist(
+            songs = songs,
+            preferAlbumArtist = false,
+            artistDelimiters = listOf(";"),
+            wordDelimiters = listOf("feat.")
+        )
+
+        assertThat(displayArtist).isEqualTo("Gorillaz")
+    }
+
     @Test
     fun `chooseAlbumDisplayArtist prefers album artist when grouping is on`() {
         val songs = listOf(
diff --git a/app/src/test/java/com/theveloper/pixelplay/data/worker/ArtistParsingUtilsTest.kt b/app/src/test/java/com/theveloper/pixelplay/data/worker/ArtistParsingUtilsTest.kt
index 937fab122..ca0cfa610 100644
--- a/app/src/test/java/com/theveloper/pixelplay/data/worker/ArtistParsingUtilsTest.kt
+++ b/app/src/test/java/com/theveloper/pixelplay/data/worker/ArtistParsingUtilsTest.kt
@@ -2,9 +2,50 @@ package com.theveloper.pixelplay.data.worker
 
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
+import com.theveloper.pixelplay.data.preferences.UserPreferencesRepository
 
 class ArtistParsingUtilsTest {
 
+    @Test
+    fun `default delimiters preserve ampersand slash comma and plus inside artist names`() {
+        assertEquals(
+            listOf("W&W"),
+            collectArtistNames(
+                rawArtistName = "W&W",
+                title = "Rave Culture",
+                artistDelimiters = UserPreferencesRepository.DEFAULT_ARTIST_DELIMITERS,
+                wordDelimiters = UserPreferencesRepository.DEFAULT_ARTIST_WORD_DELIMITERS
+            )
+        )
+        assertEquals(
+            listOf("AC/DC"),
+            collectArtistNames(
+                rawArtistName = "AC/DC",
+                title = "Back In Black",
+                artistDelimiters = UserPreferencesRepository.DEFAULT_ARTIST_DELIMITERS,
+                wordDelimiters = UserPreferencesRepository.DEFAULT_ARTIST_WORD_DELIMITERS
+            )
+        )
+        assertEquals(
+            listOf("Lost & Found"),
+            collectArtistNames(
+                rawArtistName = "Lost & Found",
+                title = "Found",
+                artistDelimiters = UserPreferencesRepository.DEFAULT_ARTIST_DELIMITERS,
+                wordDelimiters = UserPreferencesRepository.DEFAULT_ARTIST_WORD_DELIMITERS
+            )
+        )
+        assertEquals(
+            listOf("Black Country, New Road"),
+            collectArtistNames(
+                rawArtistName = "Black Country, New Road",
+                title = "Track X",
+                artistDelimiters = UserPreferencesRepository.DEFAULT_ARTIST_DELIMITERS,
+                wordDelimiters = UserPreferencesRepository.DEFAULT_ARTIST_WORD_DELIMITERS
+            )
+        )
+    }
+
     @Test
     fun `choosePreferredArtistName prefers media store when it contains more artists`() {
         val result =