Multi artist support by lostf1sh · Pull Request #548 · theovilardo/PixelPlayer

lostf1sh · 2025-12-16T20:57:46Z

This pull request introduces comprehensive support for multi-artist relationships in the music database, enabling each song to have multiple associated artists and each artist to be linked with multiple songs. The migration is carefully handled to maintain backward compatibility and ensure efficient queries. The changes span database schema updates, model enhancements, and new DAO methods, as well as the addition of related user preferences.

Database schema and migration for multi-artist support:

Added a new SongArtistCrossRef junction table to represent the many-to-many relationship between songs and artists, including a flag for the primary artist. The database version is incremented, and a migration is provided to populate this table from existing data. (app/src/main/java/com/theveloper/pixelplay/data/database/SongArtistCrossRef.kt, app/src/main/java/com/theveloper/pixelplay/data/database/PixelPlayDatabase.kt) [1] [2] [3]
Updated the SongEntity model to add an albumArtist column and adjusted conversion functions to handle the new structure. (app/src/main/java/com/theveloper/pixelplay/data/database/SongEntity.kt) [1] [2] [3] [4] [5]
Enhanced the MusicDao interface with new methods for managing and querying the song-artist cross-references, including batch inserts, deletions, and retrievals for both songs and artists. Transactional methods are provided for bulk operations. (app/src/main/java/com/theveloper/pixelplay/data/database/MusicDao.kt)

Model and API enhancements:

Introduced the ArtistRef data class for simplified artist references and updated the Song model to include a list of ArtistRef objects, an albumArtist field, and helper properties for display and primary artist access. (app/src/main/java/com/theveloper/pixelplay/data/model/LibraryModels.kt, app/src/main/java/com/theveloper/pixelplay/data/model/Song.kt) [1] [2] [3]

User preferences for multi-artist features:

Added new preference keys to support multi-artist configuration, such as artist separation, delimiters, and grouping by album artist. (app/src/main/java/com/theveloper/pixelplay/data/preferences/UserPreferencesRepository.kt)

IDE and build configuration:

Updated Gradle settings for the project, including JVM and Gradle home configuration. (.idea/gradle.xml)

Database changes: - Add SongArtistCrossRef junction table for many-to-many relationships - Add SongWithArtists and ArtistWithSongs relation classes - Add albumArtist field to SongEntity - Add ArtistRef model and update Song model with artists list - Database migration 9→10 with junction table creation Preferences: - Add ARTIST_SEPARATION_ENABLED for toggling artist splitting - Add ARTIST_DELIMITERS for custom delimiter list (default: /, ;, ,, +, &) - Add GROUP_BY_ALBUM_ARTIST for album organization - Add ARTIST_SETTINGS_RESCAN_REQUIRED for pending library rescan Parsing logic: - Add splitArtistsByDelimiters() extension in Extensions.kt - Backslash escape support (\\) to preserve delimiters in names SyncWorker & DAO: - Query ALBUM_ARTIST from MediaStore - Split artists when enabled and create cross-references - Batch insert cross-refs in chunks of 500 - Efficient queries with JOINs for artist-song relationships UI Screens: - ArtistSettingsScreen: Toggles, delimiter config nav, info/examples cards - DelimiterConfigScreen: Add/remove delimiters with chips, reset option - Rescan warning banner when settings change - Navigation from Settings → Artists sub-screen

Copilot

Pull request overview

This pull request introduces comprehensive multi-artist support to the music player, allowing songs to have multiple associated artists through a many-to-many relationship. The implementation includes database schema updates with a junction table, intelligent artist parsing with configurable delimiters, and new UI screens for managing multi-artist settings.

Key changes:

Database migration (v9→v10) with SongArtistCrossRef junction table for many-to-many artist-song relationships
Artist name parsing with configurable delimiters (/, ;, ,, +, &) and escape sequence support
New settings screens for configuring multi-artist behavior and delimiter customization
Updated data models to support multiple artists per song while maintaining backward compatibility

Reviewed changes

Copilot reviewed 20 out of 21 changed files in this pull request and generated 15 comments.

Show a summary per file

File	Description
`Extensions.kt`	Adds `splitArtistsByDelimiters()` function with escape sequence support and `joinArtistsForDisplay()` helper
`PlayerViewModel.kt`	Adds `currentSongArtists` StateFlow to expose all artists for the currently playing song
`ArtistSettingsViewModel.kt`	New ViewModel managing multi-artist configuration, delimiters, and rescan requirements
`SettingsScreen.kt`	Adds navigation entry to new Artist settings screen
`DelimiterConfigScreen.kt`	New screen for managing artist delimiter configuration with add/remove functionality
`ArtistSettingsScreen.kt`	New screen for multi-artist parsing settings, album artist grouping, and informational content
`Screen.kt`	Adds routes for `ArtistSettings` and `DelimiterConfig` screens
`AppNavigation.kt`	Registers navigation destinations for new artist configuration screens
`FullPlayerContent.kt`	Adds artist picker bottom sheet for multi-artist songs and updates artist navigation
`AppModule.kt`	Registers MIGRATION_9_10 in database builder
`SyncWorker.kt`	Implements multi-artist preprocessing logic with delimiter-based splitting and junction table population
`MusicRepositoryImpl.kt`	Adds `getArtistsForSong()` implementation and updates artist queries to use junction table
`MusicRepository.kt`	Adds `getArtistsForSong()` interface method
`UserPreferencesRepository.kt`	Adds preferences for artist separation, delimiters, album artist grouping, and rescan flags
`Song.kt`	Extends model with `artists` list, `albumArtist` field, and convenience properties
`LibraryModels.kt`	Adds `ArtistRef` data class for simplified artist references
`SongEntity.kt`	Adds `albumArtist` column and `toSongWithArtists()` conversion function
`SongArtistCrossRef.kt`	New junction table entity with supporting data classes for many-to-many queries
`PixelPlayDatabase.kt`	Increments version to 10 and adds MIGRATION_9_10 for junction table creation
`MusicDao.kt`	Adds extensive junction table query methods and transactional batch operations
`.idea/gradle.xml`	Updates Gradle JVM and home configuration

Files not reviewed (1)

.idea/gradle.xml: Language not supported

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

app/src/main/java/com/theveloper/pixelplay/utils/Extensions.kt

Copilot · 2025-12-16T21:05:13Z

app/src/main/java/com/theveloper/pixelplay/presentation/viewmodel/ArtistSettingsViewModel.kt

+        if (current.size <= 1) return // Keep at least one delimiter
+
+        viewModelScope.launch {
+            userPreferencesRepository.setArtistDelimiters(current - delimiter)
+        }
+    }


The comment states 'Keep at least one delimiter', but the guard condition checks if size <= 1. This means if there's exactly 1 delimiter, the function returns early and doesn't remove it, which is correct. However, the logic in the UI (DelimiterConfigScreen lines 129-130) duplicates this check. If someone bypasses the ViewModel and calls setArtistDelimiters directly with an empty list, it would be allowed. Consider adding validation in setArtistDelimiters itself to ensure at least one delimiter is always maintained.

app/src/main/java/com/theveloper/pixelplay/data/database/SongEntity.kt

app/src/main/java/com/theveloper/pixelplay/data/repository/MusicRepositoryImpl.kt

Copilot · 2025-12-16T21:05:15Z

app/src/main/java/com/theveloper/pixelplay/data/worker/SyncWorker.kt

+        songs.forEach { song ->
+            val artistsToProcess = if (artistSeparationEnabled) {
+                song.artistName.splitArtistsByDelimiters(artistDelimiters)
+            } else {
+                listOf(song.artistName)
+            }
+
+            artistsToProcess.forEach { artistName ->
+                val normalizedName = artistName.trim()
+                if (normalizedName.isNotEmpty() && !artistNameToId.containsKey(normalizedName)) {
+                    // Check if this artist name matches the original artist in the song
+                    // If so, use the original MediaStore ID
+                    if (normalizedName == song.artistName) {
+                        artistNameToId[normalizedName] = song.artistId
+                    } else {
+                        // Generate a new ID for split artists
+                        artistNameToId[normalizedName] = nextArtistId.getAndIncrement()
+                    }
+                }
+            }
+        }


In the first pass through songs, you're calling splitArtistsByDelimiters for each song, and then calling it again for the same songs in the second pass. This duplicates the splitting work. Consider caching the split results from the first pass in a map (songId -> List of artist names) to avoid redundant string processing, especially for large libraries.

Can you fix that?

app/src/main/java/com/theveloper/pixelplay/data/database/MusicDao.kt

app/src/main/java/com/theveloper/pixelplay/presentation/components/player/FullPlayerContent.kt

Copilot · 2025-12-16T21:05:17Z

app/src/main/java/com/theveloper/pixelplay/data/worker/SyncWorker.kt

+    @Suppress("unused")
    private fun preProcessAndDeduplicate(songs: List<SongEntity>): Triple<List<SongEntity>, List<AlbumEntity>, List<ArtistEntity>> {


The @Suppress("unused") annotation on the legacy preProcessAndDeduplicate function suggests it's kept for reference only. If this function is truly unused and only kept as reference, consider removing it entirely to reduce code maintenance burden, or move it to documentation/comments if the implementation logic needs to be preserved for reference.

app/src/main/java/com/theveloper/pixelplay/data/database/PixelPlayDatabase.kt

app/src/main/java/com/theveloper/pixelplay/data/model/Song.kt

…ents/player/FullPlayerContent.kt Co-authored-by: Copilot <[email protected]>

…ntity.kt Co-authored-by: Copilot <[email protected]>

…icRepositoryImpl.kt Co-authored-by: Copilot <[email protected]>

Co-authored-by: Copilot <[email protected]>

…ker.kt Co-authored-by: Copilot <[email protected]>

…Dao.kt Co-authored-by: Copilot <[email protected]>

…PlayDatabase.kt Co-authored-by: Copilot <[email protected]>

…ents/player/FullPlayerContent.kt Co-authored-by: Copilot <[email protected]>

Co-authored-by: Copilot <[email protected]>

lostf1sh · 2025-12-16T21:18:21Z

@copilot check again, i did the commits you requested.

Copilot · 2025-12-16T21:18:28Z

@lostf1sh I've opened a new pull request, #549, to work on those changes. Once the pull request is ready, I'll request review from you.

Co-authored-by: lostf1sh <[email protected]>

Optimize multi-artist processing: cache split results and remove redundant operations

theovilardo

good

udaign · 2026-01-15T15:44:17Z

Great job! Thank you for this!

lostf1sh added 5 commits December 16, 2025 22:38

feat: Enable clickable individual artists in Now Playing screen

bed6d7c

feat: Add artist picker for multi-artist Now Playing

c1d1cf1

fix: Use junction table for getSongsForArtist to support multi-artist

3972ed6

fix: getArtistById now works for secondary (split) artists

35d0434

Copilot AI review requested due to automatic review settings December 16, 2025 20:57

Copilot started reviewing on behalf of lostf1sh December 16, 2025 20:58 View session

Copilot AI reviewed Dec 16, 2025

View reviewed changes

lostf1sh and others added 10 commits December 17, 2025 00:10

Update app/src/main/java/com/theveloper/pixelplay/presentation/compon…

abac04d

…ents/player/FullPlayerContent.kt Co-authored-by: Copilot <[email protected]>

Update app/src/main/java/com/theveloper/pixelplay/data/database/SongE…

0bfd693

…ntity.kt Co-authored-by: Copilot <[email protected]>

Update app/src/main/java/com/theveloper/pixelplay/data/repository/Mus…

42d8f21

…icRepositoryImpl.kt Co-authored-by: Copilot <[email protected]>

Update app/src/main/java/com/theveloper/pixelplay/utils/Extensions.kt

de2c1f4

Co-authored-by: Copilot <[email protected]>

Update app/src/main/java/com/theveloper/pixelplay/data/worker/SyncWor…

a8c9ef9

…ker.kt Co-authored-by: Copilot <[email protected]>

Update app/src/main/java/com/theveloper/pixelplay/data/worker/SyncWor…

b00150a

…ker.kt Co-authored-by: Copilot <[email protected]>

Update app/src/main/java/com/theveloper/pixelplay/data/database/Music…

5b7e282

…Dao.kt Co-authored-by: Copilot <[email protected]>

Update app/src/main/java/com/theveloper/pixelplay/data/database/Pixel…

357212f

…PlayDatabase.kt Co-authored-by: Copilot <[email protected]>

Update app/src/main/java/com/theveloper/pixelplay/presentation/compon…

8ee4f77

…ents/player/FullPlayerContent.kt Co-authored-by: Copilot <[email protected]>

Update app/src/main/java/com/theveloper/pixelplay/data/model/Song.kt

f9510d0

Co-authored-by: Copilot <[email protected]>

lostf1sh requested a review from theovilardo December 16, 2025 21:17

Initial plan

8a2234d

Copilot AI mentioned this pull request Dec 16, 2025

Optimize multi-artist processing: cache split results and remove redundant operations #549

Merged

Copilot AI and others added 6 commits December 16, 2025 21:20

Fix: Cache split artist results to avoid redundant string processing

efecee1

Co-authored-by: lostf1sh <[email protected]>

Add validation to ensure at least one delimiter is always maintained

93660a5

Co-authored-by: lostf1sh <[email protected]>

Remove unused preProcessAndDeduplicate legacy function

3c378c6

Co-authored-by: lostf1sh <[email protected]>

Remove redundant split in album creation logic

e5b778e

Co-authored-by: lostf1sh <[email protected]>

Optimize: Combine preprocessing and first pass into single loop

64ed048

Co-authored-by: lostf1sh <[email protected]>

Merge pull request #549 from theovilardo/copilot/sub-pr-548

a63b00c

Optimize multi-artist processing: cache split results and remove redundant operations

theovilardo reviewed Dec 17, 2025

View reviewed changes

theovilardo merged commit 5e9afe5 into master Dec 17, 2025

lostf1sh deleted the multi-artist-support branch January 16, 2026 20:38

		@Suppress("unused")
		private fun preProcessAndDeduplicate(songs: List<SongEntity>): Triple<List<SongEntity>, List<AlbumEntity>, List<ArtistEntity>> {

Conversation

lostf1sh commented Dec 16, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Copilot AI Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

lostf1sh Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

lostf1sh Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

lostf1sh commented Dec 16, 2025

Uh oh!

Copilot AI commented Dec 16, 2025

Uh oh!

theovilardo left a comment

Choose a reason for hiding this comment

Uh oh!

udaign commented Jan 15, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants