Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

musikr.tag: handle compilation flag

Browse source
This commit is contained in:
Alexander Capehart 2025-01-04 13:40:52 -07:00
parent 3431e13cde
commit fddd527975
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
musikr/src/main/java/org/oxycblt/musikr/tag/parse/TagFields.kt
View file

@ -205,6 +205,8 @@ internal fun Metadata.genreNames() = xiph["GENRE"] ?: mp4["©gen"] ?: mp4["gnre"
// Compilation Flag // Compilation Flag
internal fun Metadata.isCompilation() = internal fun Metadata.isCompilation() =
// TCMP is a non-standard itunes extension // TCMP is a non-standard itunes extension
// We also only look for tags that are actually valid
// (i.e. 1 for true, 0 for false)
(xiph["COMPILATION"] (xiph["COMPILATION"]
?: xiph["ITUNESCOMPILATION"] ?: xiph["ITUNESCOMPILATION"]
?: mp4["cpil"] ?: mp4["cpil"]
@ -212,11 +214,7 @@ internal fun Metadata.isCompilation() =
?: mp4["----:COM.APPLE.ITUNES:ITUNESCOMPILATION"] ?: mp4["----:COM.APPLE.ITUNES:ITUNESCOMPILATION"]
?: id3v2["TCMP"] ?: id3v2["TCMP"]
?: id3v2["TXXX:COMPILATION"] ?: id3v2["TXXX:COMPILATION"]
?: id3v2["TXXX:ITUNESCOMPILATION"]) ?: id3v2["TXXX:ITUNESCOMPILATION"]) == listOf("1")
?.let {
// Ignore invalid instances of this tag
it == listOf("1")
}
// ReplayGain information // ReplayGain information
internal fun Metadata.replayGainTrackAdjustment() = internal fun Metadata.replayGainTrackAdjustment() =

13
musikr/src/main/java/org/oxycblt/musikr/tag/parse/TagParser.kt
View file

@ -32,6 +32,7 @@ internal interface TagParser {
private data object TagParserImpl : TagParser { private data object TagParserImpl : TagParser {
override fun parse(file: DeviceFile, metadata: Metadata): ParsedTags { override fun parse(file: DeviceFile, metadata: Metadata): ParsedTags {
val compilation = metadata.isCompilation()
return ParsedTags( return ParsedTags(
durationMs = metadata.properties.durationMs, durationMs = metadata.properties.durationMs,
replayGainTrackAdjustment = metadata.replayGainTrackAdjustment(), replayGainTrackAdjustment = metadata.replayGainTrackAdjustment(),
@ -46,12 +47,20 @@ private data object TagParserImpl : TagParser {
albumMusicBrainzId = metadata.albumMusicBrainzId(), albumMusicBrainzId = metadata.albumMusicBrainzId(),
albumName = metadata.albumName(), albumName = metadata.albumName(),
albumSortName = metadata.albumSortName(), albumSortName = metadata.albumSortName(),
releaseTypes = metadata.releaseTypes() ?: listOf(), // Compilation flag implies a compilation release type in the case that
// we don't have any other release types
releaseTypes =
metadata.releaseTypes() ?: listOf("compilation").takeIf { compilation } ?: listOf(),
artistMusicBrainzIds = metadata.artistMusicBrainzIds() ?: listOf(), artistMusicBrainzIds = metadata.artistMusicBrainzIds() ?: listOf(),
artistNames = metadata.artistNames() ?: listOf(), artistNames = metadata.artistNames() ?: listOf(),
artistSortNames = metadata.artistSortNames() ?: listOf(), artistSortNames = metadata.artistSortNames() ?: listOf(),
albumArtistMusicBrainzIds = metadata.albumArtistMusicBrainzIds() ?: listOf(), albumArtistMusicBrainzIds = metadata.albumArtistMusicBrainzIds() ?: listOf(),
albumArtistNames = metadata.albumArtistNames() ?: listOf(), // Compilation pretty heavily implies various artists in the case that we don't
// have any other album artists
albumArtistNames =
metadata.albumArtistNames()
?: listOf("Various Artists").takeIf { compilation }
?: listOf(),
albumArtistSortNames = metadata.albumArtistSortNames() ?: listOf(), albumArtistSortNames = metadata.albumArtistSortNames() ?: listOf(),
genreNames = metadata.genreNames() ?: listOf()) genreNames = metadata.genreNames() ?: listOf())
} }