fix Various Artists

zhaarey · Jun 12, 2024 · b2bf894 · b2bf894
1 parent 76e2693
commit b2bf894
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/main.go b/main.go
@@ -1300,11 +1300,16 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 				"{ArtistName}", "Apple Music",
 				"{ArtistId}", "",
 			).Replace(config.ArtistFolderFormat)
-		} else {
+		} else if len(meta.Data[0].Relationships.Artists.Data) > 0 {
 			singerFoldername = strings.NewReplacer(
 				"{ArtistName}", meta.Data[0].Attributes.ArtistName,
 				"{ArtistId}", meta.Data[0].Relationships.Artists.Data[0].ID,
 			).Replace(config.ArtistFolderFormat)
+		} else {
+			singerFoldername = strings.NewReplacer(
+				"{ArtistName}", meta.Data[0].Attributes.ArtistName,
+				"{ArtistId}", "",
+			).Replace(config.ArtistFolderFormat)
 		}
 		if strings.HasSuffix(singerFoldername, ".") {
 			singerFoldername = strings.ReplaceAll(singerFoldername, ".", "")

diff --git a/main_atmos.go b/main_atmos.go
@@ -1246,11 +1246,16 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 				"{ArtistName}", "Apple Music",
 				"{ArtistId}", "",
 			).Replace(config.ArtistFolderFormat)
-		} else {
+		} else if len(meta.Data[0].Relationships.Artists.Data) > 0 {
 			singerFoldername = strings.NewReplacer(
 				"{ArtistName}", meta.Data[0].Attributes.ArtistName,
 				"{ArtistId}", meta.Data[0].Relationships.Artists.Data[0].ID,
 			).Replace(config.ArtistFolderFormat)
+		} else {
+			singerFoldername = strings.NewReplacer(
+				"{ArtistName}", meta.Data[0].Attributes.ArtistName,
+				"{ArtistId}", "",
+			).Replace(config.ArtistFolderFormat)
 		}
 		if strings.HasSuffix(singerFoldername, ".") {
 			singerFoldername = strings.ReplaceAll(singerFoldername, ".", "")

diff --git a/main_select.go b/main_select.go
@@ -1191,11 +1191,16 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 				"{ArtistName}", "Apple Music",
 				"{ArtistId}", "",
 			).Replace(config.ArtistFolderFormat)
-		} else {
+		} else if len(meta.Data[0].Relationships.Artists.Data) > 0 {
 			singerFoldername = strings.NewReplacer(
 				"{ArtistName}", meta.Data[0].Attributes.ArtistName,
 				"{ArtistId}", meta.Data[0].Relationships.Artists.Data[0].ID,
 			).Replace(config.ArtistFolderFormat)
+		} else {
+			singerFoldername = strings.NewReplacer(
+				"{ArtistName}", meta.Data[0].Attributes.ArtistName,
+				"{ArtistId}", "",
+			).Replace(config.ArtistFolderFormat)
 		}
 		if strings.HasSuffix(singerFoldername, ".") {
 			singerFoldername = strings.ReplaceAll(singerFoldername, ".", "")