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

fix Quality

Browse Source
This commit is contained in:
zhaarey 2024-07-03 10:38:41 +08:00
parent ab9f035019
commit 1cdf29cebc
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
main.go
View File

@ -1334,24 +1334,26 @@ func rip(albumId string, token string, storefront string, userToken string) erro
fmt.Println(singerFoldername) fmt.Println(singerFoldername)
} }
singerFolder := filepath.Join(config.AlacSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_")) singerFolder := filepath.Join(config.AlacSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
var Quality string
if strings.Contains(config.AlbumFolderFormat, "Quality") {
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)
} } else {
if manifest1.Attributes.ExtendedAssetUrls.EnhancedHls == "" { if manifest1.Attributes.ExtendedAssetUrls.EnhancedHls == "" {
fmt.Println("Unavailable in ALAC.") fmt.Println("Unavailable in ALAC.\n")
} } else {
var Quality string
EnhancedHls_m3u8, err := checkM3u8(meta.Data[0].Relationships.Tracks.Data[0].ID, "album") EnhancedHls_m3u8, err := checkM3u8(meta.Data[0].Relationships.Tracks.Data[0].ID, "album")
if strings.HasPrefix(EnhancedHls_m3u8, "http") { if strings.HasPrefix(EnhancedHls_m3u8, "http") {
manifest1.Attributes.ExtendedAssetUrls.EnhancedHls = EnhancedHls_m3u8 manifest1.Attributes.ExtendedAssetUrls.EnhancedHls = EnhancedHls_m3u8
} }
if strings.Contains(config.AlbumFolderFormat, "Quality") {
Quality, err = extractMediaQuality(manifest1.Attributes.ExtendedAssetUrls.EnhancedHls) Quality, err = extractMediaQuality(manifest1.Attributes.ExtendedAssetUrls.EnhancedHls)
if err != nil { if err != nil {
fmt.Println("Failed to extract quality from manifest.\n", err) fmt.Println("Failed to extract quality from manifest.\n", err)
} }
} }
}
}
stringsToJoin := []string{} stringsToJoin := []string{}
if meta.Data[0].Attributes.IsAppleDigitalMaster || meta.Data[0].Attributes.IsMasteredForItunes { if meta.Data[0].Attributes.IsAppleDigitalMaster || meta.Data[0].Attributes.IsMasteredForItunes {
if config.AppleMasterChoice != "" { if config.AppleMasterChoice != "" {

12
main_select.go
View File

@ -1232,20 +1232,22 @@ func rip(albumId string, token string, storefront string, userToken string) erro
} }
} }
Tag_string := strings.Join(stringsToJoin, " ") Tag_string := strings.Join(stringsToJoin, " ")
var Quality string
if strings.Contains(config.AlbumFolderFormat, "Quality") {
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)
} } else {
if manifest1.Attributes.ExtendedAssetUrls.EnhancedHls == "" { if manifest1.Attributes.ExtendedAssetUrls.EnhancedHls == "" {
fmt.Println("Unavailable in ALAC.") fmt.Println("Unavailable in ALAC.\n")
} } else {
var Quality string
if strings.Contains(config.AlbumFolderFormat, "Quality") {
Quality, err = extractMediaQuality(manifest1.Attributes.ExtendedAssetUrls.EnhancedHls) Quality, err = extractMediaQuality(manifest1.Attributes.ExtendedAssetUrls.EnhancedHls)
if err != nil { if err != nil {
fmt.Println("Failed to extract quality from manifest.\n", err) fmt.Println("Failed to extract quality from manifest.\n", err)
} }
} }
}
}
var albumFolder string var albumFolder string
if strings.Contains(albumId, "pl.") { if strings.Contains(albumId, "pl.") {
albumFolder = strings.NewReplacer( albumFolder = strings.NewReplacer(