sim1222/apple-music-downloader-server
1
0
Fork 0
forked from sim1222-mirror/apple-music-downloader
Code Pull Requests Activity

TrimSpace

Browse Source
This commit is contained in:
zhaarey 2024-04-26 09:13:08 +08:00
parent ac4b50790d
commit 0236f804da
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.go
View File

@ -1080,17 +1080,13 @@ func rip(albumId string, token string, storefront string, userToken string) erro
if strings.HasSuffix(singerFoldername, ".") { if strings.HasSuffix(singerFoldername, ".") {
singerFoldername = strings.ReplaceAll(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, "_")) singerFolder := filepath.Join("AM-DL downloads", forbiddenNames.ReplaceAllString(singerFoldername, "_"))
albumFolder := fmt.Sprintf("%s", meta.Data[0].Attributes.Name) albumFolder := fmt.Sprintf("%s", meta.Data[0].Attributes.Name)
if strings.HasSuffix(albumFolder, ".") { if strings.HasSuffix(albumFolder, ".") {
albumFolder = strings.ReplaceAll(albumFolder, ".", "") albumFolder = strings.ReplaceAll(albumFolder, ".", "")
} }
if strings.HasSuffix(albumFolder, " ") { albumFolder = strings.TrimSpace(albumFolder)
albumFolder = strings.TrimSpace(albumFolder)
}
sanAlbumFolder := filepath.Join(singerFolder, forbiddenNames.ReplaceAllString(albumFolder, "_")) sanAlbumFolder := filepath.Join(singerFolder, forbiddenNames.ReplaceAllString(albumFolder, "_"))
os.MkdirAll(sanAlbumFolder, os.ModePerm) os.MkdirAll(sanAlbumFolder, os.ModePerm)
fmt.Println(singerFoldername) fmt.Println(singerFoldername)

8
main_atmos.go
View File

@ -1086,17 +1086,13 @@ func rip(albumId string, token string, storefront string, userToken string) erro
if strings.HasSuffix(singerFoldername, ".") { if strings.HasSuffix(singerFoldername, ".") {
singerFoldername = strings.ReplaceAll(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, "_")) singerFolder := filepath.Join("AM-DL-Atmos downloads", forbiddenNames.ReplaceAllString(singerFoldername, "_"))
albumFolder := fmt.Sprintf("%s [Atmos]", meta.Data[0].Attributes.Name) albumFolder := fmt.Sprintf("%s [Atmos]", meta.Data[0].Attributes.Name)
if strings.HasSuffix(albumFolder, ".") { if strings.HasSuffix(albumFolder, ".") {
albumFolder = strings.ReplaceAll(albumFolder, ".", "") albumFolder = strings.ReplaceAll(albumFolder, ".", "")
} }
if strings.HasSuffix(albumFolder, " ") { albumFolder = strings.TrimSpace(albumFolder)
albumFolder = strings.TrimSpace(albumFolder)
}
sanAlbumFolder := filepath.Join(singerFolder, forbiddenNames.ReplaceAllString(albumFolder, "_")) sanAlbumFolder := filepath.Join(singerFolder, forbiddenNames.ReplaceAllString(albumFolder, "_"))
os.MkdirAll(sanAlbumFolder, os.ModePerm) os.MkdirAll(sanAlbumFolder, os.ModePerm)
fmt.Println(singerFoldername) fmt.Println(singerFoldername)

8
main_select.go
View File

@ -1089,17 +1089,13 @@ func rip(albumId string, token string, storefront string, userToken string) erro
if strings.HasSuffix(singerFoldername, ".") { if strings.HasSuffix(singerFoldername, ".") {
singerFoldername = strings.ReplaceAll(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, "_")) singerFolder := filepath.Join("AM-DL downloads", forbiddenNames.ReplaceAllString(singerFoldername, "_"))
albumFolder := fmt.Sprintf("%s", meta.Data[0].Attributes.Name) albumFolder := fmt.Sprintf("%s", meta.Data[0].Attributes.Name)
if strings.HasSuffix(albumFolder, ".") { if strings.HasSuffix(albumFolder, ".") {
albumFolder = strings.ReplaceAll(albumFolder, ".", "") albumFolder = strings.ReplaceAll(albumFolder, ".", "")
} }
if strings.HasSuffix(albumFolder, " ") { albumFolder = strings.TrimSpace(albumFolder)
albumFolder = strings.TrimSpace(albumFolder)
}
sanAlbumFolder := filepath.Join(singerFolder, forbiddenNames.ReplaceAllString(albumFolder, "_")) sanAlbumFolder := filepath.Join(singerFolder, forbiddenNames.ReplaceAllString(albumFolder, "_"))
os.MkdirAll(sanAlbumFolder, os.ModePerm) os.MkdirAll(sanAlbumFolder, os.ModePerm)
fmt.Println(singerFoldername) fmt.Println(singerFoldername)