From 5a0bce52009ee318aa3d97add39b23cc870a080d Mon Sep 17 00:00:00 2001
From: zhaarey <157944548+zhaarey@users.noreply.github.com>
Date: Tue, 4 Jun 2024 19:00:42 +0800
Subject: [PATCH] add ReleaseYear

---
 config.yaml    | 4 ++--
 main.go        | 1 +
 main_atmos.go  | 1 +
 main_select.go | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/config.yaml b/config.yaml
index f5302e8..560e01a 100644
--- a/config.yaml
+++ b/config.yaml
@@ -11,8 +11,8 @@ force-api: false
 get-m3u8-from-device: false
 alac-max: 192000  #192000 96000 48000 44100
 atmos-max: 2768  #2768 2448
-#{AlbumId} {AlbumName} {ArtistName} {ReleaseDate} {UPC} {Copyright}
-#example: {ReleaseDate} - {ArtistName} - {AlbumName}({AlbumId})
+#{AlbumId} {AlbumName} {ArtistName} {ReleaseDate} {ReleaseYear} {UPC} {Copyright}
+#example: {ReleaseYear} - {ArtistName} - {AlbumName}({AlbumId})({UPC})({Copyright})
 album-folder-format: "{AlbumName}"
 #{SongNumer} {SongName} {DiscNumber} {TrackNumber}
 #example: Disk {DiscNumber} - Track {TrackNumber} {SongName}"
diff --git a/main.go b/main.go
index 7e67990..2c96a31 100644
--- a/main.go
+++ b/main.go
@@ -1170,6 +1170,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 	singerFolder := filepath.Join(config.AlacSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
 	albumFolder := strings.NewReplacer(
 		"{ReleaseDate}", meta.Data[0].Attributes.ReleaseDate,
+		"{ReleaseYear}", meta.Data[0].Attributes.ReleaseDate[:4],
 		"{ArtistName}", meta.Data[0].Attributes.ArtistName,
 		"{AlbumName}", meta.Data[0].Attributes.Name,
 		"{UPC}", meta.Data[0].Attributes.Upc,
diff --git a/main_atmos.go b/main_atmos.go
index 75caf86..5708b75 100644
--- a/main_atmos.go
+++ b/main_atmos.go
@@ -1128,6 +1128,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 	singerFolder := filepath.Join(config.AtmosSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
 	albumFolder := strings.NewReplacer(
         "{ReleaseDate}", meta.Data[0].Attributes.ReleaseDate,
+		"{ReleaseYear}", meta.Data[0].Attributes.ReleaseDate[:4],
         "{ArtistName}", meta.Data[0].Attributes.ArtistName,
         "{AlbumName}", meta.Data[0].Attributes.Name,
 		"{UPC}", meta.Data[0].Attributes.Upc,
diff --git a/main_select.go b/main_select.go
index 9047937..6352733 100644
--- a/main_select.go
+++ b/main_select.go
@@ -1131,6 +1131,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 	singerFolder := filepath.Join("AM-DL downloads", forbiddenNames.ReplaceAllString(singerFoldername, "_"))
 	albumFolder := strings.NewReplacer(
 		"{ReleaseDate}", meta.Data[0].Attributes.ReleaseDate,
+		"{ReleaseYear}", meta.Data[0].Attributes.ReleaseDate[:4],
 		"{ArtistName}", meta.Data[0].Attributes.ArtistName,
 		"{AlbumName}", meta.Data[0].Attributes.Name,
 		"{UPC}", meta.Data[0].Attributes.Upc,