From 245896e4a7ec2872a81a754af27d2da21c14b76c Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Sun, 19 Mar 2023 13:18:24 -0600
Subject: [PATCH] music: check compilation flag value

Only map compilation flags if the value is "1".
---
 CHANGELOG.md                                                  | 3 +++
 .../main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt   | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50c02470d..2c03ffbe9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## dev
 
+#### What's New
+- Added support for `COMPILATION` and `ITUNESCOMPILATION` flags.
+
 #### What's Improved
 - Accept `REPLAYGAIN_*` adjustment information on OPUS files alongside
 `R128_*` adjustments.
diff --git a/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt b/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt
index 3391da98a..f305f4a81 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/metadata/TagWorker.kt
@@ -159,7 +159,8 @@ private constructor(private val rawSong: RawSong, private val future: Future<Tra
         textFrames["TCON"]?.let { rawSong.genreNames = it }
 
         // Compilation Flag
-        (textFrames["TXXX:compilation"] ?: textFrames["TXXX:itunescompilation"])?.let {
+        (textFrames["TCMP"] ?: textFrames["TXXX:compilation"] ?: textFrames["TXXX:itunescompilation"])?.let {
+            if (it.size != 1 || it[0] != "1") return@let
             rawSong.albumArtistNames = rawSong.albumArtistNames.ifEmpty { COMPILATION_ALBUM_ARTISTS }
             rawSong.releaseTypes = rawSong.releaseTypes.ifEmpty { COMPILATION_RELEASE_TYPES }
         }
@@ -266,6 +267,7 @@ private constructor(private val rawSong: RawSong, private val future: Future<Tra
 
         // Compilation Flag
         (comments["compilation"] ?: comments["itunescompilation"])?.let {
+            if (it.size != 1 || it[0] != "1") return@let
             rawSong.albumArtistNames = rawSong.albumArtistNames.ifEmpty { COMPILATION_ALBUM_ARTISTS }
             rawSong.releaseTypes = rawSong.releaseTypes.ifEmpty { COMPILATION_RELEASE_TYPES }
         }