From 1f46d9835a87f60aa75314c1442fc9cb2ff87e41 Mon Sep 17 00:00:00 2001
From: zhaarey <157944548+zhaarey@users.noreply.github.com>
Date: Tue, 4 Jun 2024 22:38:31 +0800
Subject: [PATCH] fix atmos mux

---
 main.go       | 14 ++++++--------
 main_atmos.go |  5 ++++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/main.go b/main.go
index 2c96a31..f7cb51c 100644
--- a/main.go
+++ b/main.go
@@ -828,14 +828,12 @@ func writeM4a(w *mp4.Writer, info *SongInfo, meta *AutoGenerated, data []byte, t
 					if err != nil {
 						return err
 					}
-					if meta.Data[0].Relationships.Tracks.Data[trackTotal - 1].Attributes.DiscNumber > 1{
-						disk := make([]byte, 8)
-						binary.BigEndian.PutUint32(disk, uint32(meta.Data[0].Relationships.Tracks.Data[index].Attributes.DiscNumber))
-						binary.BigEndian.PutUint16(disk[4:], uint16(meta.Data[0].Relationships.Tracks.Data[trackTotal - 1].Attributes.DiscNumber))
-						err = addMeta(mp4.BoxType{'d', 'i', 's', 'k'}, disk)
-						if err != nil {
-							return err
-						}
+					disk := make([]byte, 8)
+					binary.BigEndian.PutUint32(disk, uint32(meta.Data[0].Relationships.Tracks.Data[index].Attributes.DiscNumber))
+					binary.BigEndian.PutUint16(disk[4:], uint16(meta.Data[0].Relationships.Tracks.Data[trackTotal - 1].Attributes.DiscNumber))
+					err = addMeta(mp4.BoxType{'d', 'i', 's', 'k'}, disk)
+					if err != nil {
+						return err
 					}
 
 					ctx.UnderIlst = false
diff --git a/main_atmos.go b/main_atmos.go
index 5708b75..d9e8141 100644
--- a/main_atmos.go
+++ b/main_atmos.go
@@ -1278,10 +1278,13 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 			fmt.Sprintf("created=%s", meta.Data[0].Attributes.ReleaseDate),
 			fmt.Sprintf("album_artist=%s", meta.Data[0].Attributes.ArtistName),
 			fmt.Sprintf("composer=%s", meta.Data[0].Relationships.Tracks.Data[index].Attributes.ComposerName),
+			fmt.Sprintf("writer=%s", meta.Data[0].Relationships.Tracks.Data[index].Attributes.ComposerName),
+			fmt.Sprintf("performer=%s", meta.Data[0].Attributes.ArtistName),
 			fmt.Sprintf("copyright=%s", meta.Data[0].Attributes.Copyright),
 			fmt.Sprintf("ISRC=%s", meta.Data[0].Relationships.Tracks.Data[index].Attributes.Isrc),
 			fmt.Sprintf("UPC=%s", meta.Data[0].Attributes.Upc),
-			fmt.Sprintf("track=%d/%d", trackNum, trackTotal),
+			fmt.Sprintf("track=%s", trackNum),
+			fmt.Sprintf("tracknum=%d/%d", trackNum, trackTotal),
 			fmt.Sprintf("disk=%d/%d", meta.Data[0].Relationships.Tracks.Data[index].Attributes.DiscNumber, meta.Data[0].Relationships.Tracks.Data[trackTotal - 1].Attributes.DiscNumber),
 		}
 		if config.EmbedCover {