add playlists and atmos support

.gitignore

@@ -4,4 +4,5 @@
 !go.mod
 !go.sum
 !main.go
+!main_atmos.go
 !README.md

README.md

@@ -9,3 +9,6 @@ Original script by Sorrow. Modified by me to include some fixes and improvements
 5. Start frida server.
 6. Start the frida agent: `frida -U -l agent.js -f com.apple.android.music`.
 7. Start downloading some albums: `go run main.go https://music.apple.com/us/album/whenever-you-need-somebody-2022-remaster/1624945511`.
+8. Start downloading some playlists: `go run main.go https://music.apple.com/us/playlist/taylor-swift-essentials/pl.3950454ced8c45a3b0cc693c2a7db97b` or `go run main.go https://music.apple.com/us/playlist/hi-res-lossless-24-bit-192khz/pl.u-MDAWvpjt38370N`.
+9. For dolby atmos: `go run main_atmos.go https://music.apple.com/us/album/1989-taylors-version-deluxe/1713845538`.
+

main.go

@@ -714,6 +714,7 @@ func writeM4a(w *mp4.Writer, info *SongInfo, meta *AutoGenerated, data []byte, t
 							return err
 						}
 
+
 						// plID, err := strconv.ParseUint(album.ID, 10, 32)
 						// if err != nil {
 						// 	return err
@@ -896,6 +897,17 @@ func decryptSong(info *SongInfo, keys []string, manifest *AutoGenerated, filenam
 func checkUrl(url string) (string, string) {
 	pat := regexp.MustCompile(`^(?:https:\/\/(?:beta\.music|music)\.apple\.com\/(\w{2})(?:\/album|\/album\/.+))\/(?:id)?(\d[^\D]+)(?:$|\?)`)
 	matches := pat.FindAllStringSubmatch(url, -1)
+	
+	if matches == nil {
+		return "", ""
+	} else {
+		return matches[0][1], matches[0][2]
+	}
+}
+func checkUrlPlaylist(url string) (string, string) {
+	pat := regexp.MustCompile(`^(?:https:\/\/(?:beta\.music|music)\.apple\.com\/(\w{2})(?:\/playlist|\/playlist\/.+))\/(?:id)?(pl\.[\w-]+)(?:$|\?)`)
+	matches := pat.FindAllStringSubmatch(url, -1)
+	
 	if matches == nil {
 		return "", ""
 	} else {
@@ -903,8 +915,16 @@ func checkUrl(url string) (string, string) {
 	}
 }
 
+
+
 func getMeta(albumId string, token string, storefront string) (*AutoGenerated, error) {
-	req, err := http.NewRequest("GET", fmt.Sprintf("https://amp-api.music.apple.com/v1/catalog/%s/albums/%s", storefront, albumId), nil)
+	var mtype string
+	if strings.Contains(albumId, "pl.") {
+		mtype = "playlists"
+	} else {
+		mtype = "albums"
+	}
+	req, err := http.NewRequest("GET", fmt.Sprintf("https://amp-api.music.apple.com/v1/catalog/%s/%s/%s", storefront,mtype, albumId), nil)
 	if err != nil {
 		return nil, err
 	}
@@ -973,6 +993,8 @@ func writeCover(sanAlbumFolder, url string) error {
 }
 
 func rip(albumId string, token string, storefront string) error {
+
+
 	meta, err := getMeta(albumId, token, storefront)
 	if err != nil {
 		fmt.Println("Failed to get album metadata.\n")
@@ -1050,7 +1072,13 @@ func main() {
 	albumTotal := len(os.Args[1:])
 	for albumNum, url := range os.Args[1:] {
 		fmt.Printf("Album %d of %d:\n", albumNum+1, albumTotal)
-		storefront, albumId := checkUrl(url)
+		var storefront, albumId string
+		if strings.Contains(url, "playlist") {
+			storefront, albumId = checkUrlPlaylist(url)
+		} else {
+			storefront, albumId = checkUrl(url)
+		}
+		
 		if albumId == "" {
 			fmt.Printf("Invalid URL: %s\n", url)
 			continue