_R
/
apple-music-alac-atmos-downloader
mirror of https://github.com/zhaarey/apple-music-alac-atmos-downloader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix artist-folder

Browse Source
pull/22/head
zhaarey 4 months ago
parent 8628931fa6
commit 8251a7cce1
3 changed files with 6 additions and 9 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      main.go
  2. 5
      main_atmos.go
  3. 5
      main_select.go

5
main.go
Unescape View File

@ -1163,9 +1163,8 @@ func rip(albumId string, token string, storefront string, userToken string) erro
fmt.Println("Failed to get album metadata.\n") fmt.Println("Failed to get album metadata.\n")
return err return err
} }
singerFolder:="" var singerFoldername string
if config.ArtistFolderFormat != ""{ if config.ArtistFolderFormat != ""{
var singerFoldername string
if strings.Contains(albumId, "pl.") { if strings.Contains(albumId, "pl.") {
singerFoldername = strings.NewReplacer( singerFoldername = strings.NewReplacer(
"{ArtistName}", "Apple Music", "{ArtistName}", "Apple Music",
@ -1182,8 +1181,8 @@ func rip(albumId string, token string, storefront string, userToken string) erro
} }
singerFoldername = strings.TrimSpace(singerFoldername) singerFoldername = strings.TrimSpace(singerFoldername)
fmt.Println(singerFoldername) fmt.Println(singerFoldername)
singerFolder = filepath.Join(config.AlacSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
} }
singerFolder := filepath.Join(config.AlacSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
manifest1, err := getInfoFromAdam(meta.Data[0].Relationships.Tracks.Data[0].ID, token, storefront) manifest1, err := getInfoFromAdam(meta.Data[0].Relationships.Tracks.Data[0].ID, token, storefront)
if err != nil { if err != nil {
fmt.Println("Failed to get manifest.\n", err) fmt.Println("Failed to get manifest.\n", err)

5
main_atmos.go
Unescape View File

@ -1123,9 +1123,8 @@ func rip(albumId string, token string, storefront string, userToken string) erro
fmt.Println("Failed to get album metadata.\n") fmt.Println("Failed to get album metadata.\n")
return err return err
} }
singerFolder:="" var singerFoldername string
if config.ArtistFolderFormat != ""{ if config.ArtistFolderFormat != ""{
var singerFoldername string
if strings.Contains(albumId, "pl.") { if strings.Contains(albumId, "pl.") {
singerFoldername = strings.NewReplacer( singerFoldername = strings.NewReplacer(
"{ArtistName}", "Apple Music", "{ArtistName}", "Apple Music",
@ -1142,8 +1141,8 @@ func rip(albumId string, token string, storefront string, userToken string) erro
} }
singerFoldername = strings.TrimSpace(singerFoldername) singerFoldername = strings.TrimSpace(singerFoldername)
fmt.Println(singerFoldername) fmt.Println(singerFoldername)
singerFolder = filepath.Join(config.AlacSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
} }
singerFolder := filepath.Join(config.AtmosSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
var albumFolder string var albumFolder string
Quality:=fmt.Sprintf("%dkbps", config.AtmosMax-2000) Quality:=fmt.Sprintf("%dkbps", config.AtmosMax-2000)
if config.AddCodec{ if config.AddCodec{

5
main_select.go
Unescape View File

@ -1125,9 +1125,8 @@ func rip(albumId string, token string, storefront string, userToken string) erro
fmt.Println("Failed to get album metadata.\n") fmt.Println("Failed to get album metadata.\n")
return err return err
} }
singerFolder:="" var singerFoldername string
if config.ArtistFolderFormat != ""{ if config.ArtistFolderFormat != ""{
var singerFoldername string
if strings.Contains(albumId, "pl.") { if strings.Contains(albumId, "pl.") {
singerFoldername = strings.NewReplacer( singerFoldername = strings.NewReplacer(
"{ArtistName}", "Apple Music", "{ArtistName}", "Apple Music",
@ -1144,8 +1143,8 @@ func rip(albumId string, token string, storefront string, userToken string) erro
} }
singerFoldername = strings.TrimSpace(singerFoldername) singerFoldername = strings.TrimSpace(singerFoldername)
fmt.Println(singerFoldername) fmt.Println(singerFoldername)
singerFolder = filepath.Join(config.AlacSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
} }
singerFolder := filepath.Join(config.AlacSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
var albumFolder string var albumFolder string
if strings.Contains(albumId, "pl.") { if strings.Contains(albumId, "pl.") {
albumFolder = strings.NewReplacer( albumFolder = strings.NewReplacer(

Write Preview
Loading…
Cancel
Save