From 0236f804da22a6dad9b86f3a959f8d16e823f878 Mon Sep 17 00:00:00 2001
From: zhaarey <157944548+zhaarey@users.noreply.github.com>
Date: Fri, 26 Apr 2024 09:13:08 +0800
Subject: [PATCH] TrimSpace

---
 main.go        | 8 ++------
 main_atmos.go  | 8 ++------
 main_select.go | 8 ++------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/main.go b/main.go
index 643124e..8d9e069 100644
--- a/main.go
+++ b/main.go
@@ -1080,17 +1080,13 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 	if strings.HasSuffix(singerFoldername, ".") {
 		singerFoldername = strings.ReplaceAll(singerFoldername, ".", "")
 	}
-	if strings.HasSuffix(singerFoldername, " ") {
-		singerFoldername = strings.TrimSpace(singerFoldername)
-	}
+	singerFoldername = strings.TrimSpace(singerFoldername)
 	singerFolder := filepath.Join("AM-DL downloads", forbiddenNames.ReplaceAllString(singerFoldername, "_"))
 	albumFolder := fmt.Sprintf("%s", meta.Data[0].Attributes.Name)
 	if strings.HasSuffix(albumFolder, ".") {
 		albumFolder = strings.ReplaceAll(albumFolder, ".", "")
 	}
-	if strings.HasSuffix(albumFolder, " ") {
-		albumFolder = strings.TrimSpace(albumFolder)
-	}
+	albumFolder = strings.TrimSpace(albumFolder)
 	sanAlbumFolder := filepath.Join(singerFolder, forbiddenNames.ReplaceAllString(albumFolder, "_"))
 	os.MkdirAll(sanAlbumFolder, os.ModePerm)
 	fmt.Println(singerFoldername)
diff --git a/main_atmos.go b/main_atmos.go
index c81813c..e3876aa 100644
--- a/main_atmos.go
+++ b/main_atmos.go
@@ -1086,17 +1086,13 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 	if strings.HasSuffix(singerFoldername, ".") {
 		singerFoldername = strings.ReplaceAll(singerFoldername, ".", "")
 	}
-	if strings.HasSuffix(singerFoldername, " ") {
-		singerFoldername = strings.TrimSpace(singerFoldername)
-	}
+	singerFoldername = strings.TrimSpace(singerFoldername)
 	singerFolder := filepath.Join("AM-DL-Atmos downloads", forbiddenNames.ReplaceAllString(singerFoldername, "_"))
 	albumFolder := fmt.Sprintf("%s [Atmos]", meta.Data[0].Attributes.Name)
 	if strings.HasSuffix(albumFolder, ".") {
 		albumFolder = strings.ReplaceAll(albumFolder, ".", "")
 	}
-	if strings.HasSuffix(albumFolder, " ") {
-		albumFolder = strings.TrimSpace(albumFolder)
-	}
+	albumFolder = strings.TrimSpace(albumFolder)
 	sanAlbumFolder := filepath.Join(singerFolder, forbiddenNames.ReplaceAllString(albumFolder, "_"))
 	os.MkdirAll(sanAlbumFolder, os.ModePerm)
 	fmt.Println(singerFoldername)
diff --git a/main_select.go b/main_select.go
index 5ad954f..103406b 100644
--- a/main_select.go
+++ b/main_select.go
@@ -1089,17 +1089,13 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 	if strings.HasSuffix(singerFoldername, ".") {
 		singerFoldername = strings.ReplaceAll(singerFoldername, ".", "")
 	}
-	if strings.HasSuffix(singerFoldername, " ") {
-		singerFoldername = strings.TrimSpace(singerFoldername)
-	}
+	singerFoldername = strings.TrimSpace(singerFoldername)
 	singerFolder := filepath.Join("AM-DL downloads", forbiddenNames.ReplaceAllString(singerFoldername, "_"))
 	albumFolder := fmt.Sprintf("%s", meta.Data[0].Attributes.Name)
 	if strings.HasSuffix(albumFolder, ".") {
 		albumFolder = strings.ReplaceAll(albumFolder, ".", "")
 	}
-	if strings.HasSuffix(albumFolder, " ") {
-		albumFolder = strings.TrimSpace(albumFolder)
-	}
+	albumFolder = strings.TrimSpace(albumFolder)
 	sanAlbumFolder := filepath.Join(singerFolder, forbiddenNames.ReplaceAllString(albumFolder, "_"))
 	os.MkdirAll(sanAlbumFolder, os.ModePerm)
 	fmt.Println(singerFoldername)