Compare commits

..

No commits in common. '6c9015200c4cb212436acf44354c63ddefabcd76' and '5f528e76a9c94271795b3eda61123998067a602c' have entirely different histories.

  1. 29
      .github/workflows/go.yml
  2. 131
      main.go
  3. 83
      main_atmos.go
  4. 109
      main_select.go

@ -12,6 +12,7 @@ jobs:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- name: Set up Go
uses: actions/setup-go@v4
with:
@ -22,17 +23,21 @@ jobs:
go build -o main.exe -v ./main.go
go build -o main_atmos.exe -v ./main_atmos.go
go build -o main_select.exe -v ./main_select.go
- name: Create a new directory and copy files
run: |
mkdir -p alac
cp agent.js alac/
cp config.yaml alac/
cp main.exe alac/
cp main_atmos.exe alac/
cp main_select.exe alac/
- name: Upload apple-music-alac-atmos-downloader
- name: Upload main.exe
uses: actions/upload-artifact@v2
with:
name: apple-music-alac-atmos-downloader-main
path: main.exe
- name: Upload main_atmos.exe
uses: actions/upload-artifact@v2
with:
name: apple-music-alac-atmos-downloader-atmos
path: main_atmos.exe
- name: Upload main_select.exe
uses: actions/upload-artifact@v2
with:
name: apple-music-alac-atmos-downloader
path: alac/*
name: apple-music-alac-atmos-downloader-select
path: main_select.exe

@ -5,6 +5,7 @@ import (
"bytes"
"encoding/binary"
"encoding/json"
"gopkg.in/yaml.v2"
"errors"
"fmt"
"io"
@ -22,8 +23,6 @@ import (
"strings"
"time"
"gopkg.in/yaml.v2"
"github.com/abema/go-mp4"
"github.com/beevik/etree"
"github.com/grafov/m3u8"
@ -37,7 +36,6 @@ const (
var (
forbiddenNames = regexp.MustCompile(`[/\\<>:"|?*]`)
)
type Config struct {
MediaUserToken string `yaml:"media-user-token"`
SaveLrcFile bool `yaml:"save-lrc-file"`
@ -78,7 +76,6 @@ type SongInfo struct {
alacParam *Alac
samples []SampleInfo
}
func loadConfig() error {
// 读取config.yaml文件内容
data, err := ioutil.ReadFile("config.yaml")
@ -693,10 +690,10 @@ func writeM4a(w *mp4.Writer, info *SongInfo, meta *AutoGenerated, data []byte, t
if err != nil {
return err
}
AlbumName := meta.Data[0].Relationships.Tracks.Data[index].Attributes.AlbumName
if strings.Contains(meta.Data[0].ID, "pl.") {
AlbumName:=meta.Data[0].Relationships.Tracks.Data[index].Attributes.AlbumName
if strings.Contains(meta.Data[0].ID, "pl."){
if !config.UseSongInfoForPlaylist {
AlbumName = meta.Data[0].Attributes.Name
AlbumName=meta.Data[0].Attributes.Name
}
}
err = addMeta(mp4.BoxType{'\251', 'a', 'l', 'b'}, AlbumName)
@ -808,7 +805,7 @@ func writeM4a(w *mp4.Writer, info *SongInfo, meta *AutoGenerated, data []byte, t
return err
}
if !strings.Contains(meta.Data[0].ID, "pl.") {
if !strings.Contains(meta.Data[0].ID, "pl."){
plID, err := strconv.ParseUint(meta.Data[0].ID, 10, 32)
if err != nil {
return err
@ -839,8 +836,8 @@ func writeM4a(w *mp4.Writer, info *SongInfo, meta *AutoGenerated, data []byte, t
binary.BigEndian.PutUint32(trkn, uint32(meta.Data[0].Relationships.Tracks.Data[index].Attributes.TrackNumber))
binary.BigEndian.PutUint16(trkn[4:], uint16(trackTotal))
binary.BigEndian.PutUint32(disk, uint32(meta.Data[0].Relationships.Tracks.Data[index].Attributes.DiscNumber))
binary.BigEndian.PutUint16(disk[4:], uint16(meta.Data[0].Relationships.Tracks.Data[trackTotal-1].Attributes.DiscNumber))
if strings.Contains(meta.Data[0].ID, "pl.") {
binary.BigEndian.PutUint16(disk[4:], uint16(meta.Data[0].Relationships.Tracks.Data[trackTotal - 1].Attributes.DiscNumber))
if strings.Contains(meta.Data[0].ID, "pl."){
if !config.UseSongInfoForPlaylist {
binary.BigEndian.PutUint32(trkn, uint32(trackNum))
binary.BigEndian.PutUint16(trkn[4:], uint16(trackTotal))
@ -1120,8 +1117,8 @@ func getSongLyrics(songId string, storefront string, token string, userToken str
}
}
func writeCover(sanAlbumFolder, name string, url string) error {
covPath := filepath.Join(sanAlbumFolder, name+"."+config.CoverFormat)
func writeCover(sanAlbumFolder,name string, url string) error {
covPath := filepath.Join(sanAlbumFolder, name+"." + config.CoverFormat)
exists, err := fileExists(covPath)
if err != nil {
fmt.Println("Failed to check if cover exists.")
@ -1182,13 +1179,13 @@ func rip(albumId string, token string, storefront string, userToken string) erro
return err
}
var singerFoldername string
if config.ArtistFolderFormat != "" {
if config.ArtistFolderFormat != ""{
if strings.Contains(albumId, "pl.") {
singerFoldername = strings.NewReplacer(
"{ArtistName}", "Apple Music",
"{ArtistId}", "",
).Replace(config.ArtistFolderFormat)
} else {
}else{
singerFoldername = strings.NewReplacer(
"{ArtistName}", meta.Data[0].Attributes.ArtistName,
"{ArtistId}", meta.Data[0].Relationships.Artists.Data[0].ID,
@ -1209,29 +1206,29 @@ func rip(albumId string, token string, storefront string, userToken string) erro
fmt.Println("Unavailable in ALAC.")
}
var Quality string
EnhancedHls_m3u8, err := checkM3u8(meta.Data[0].Relationships.Tracks.Data[0].ID, "album")
if strings.HasPrefix(EnhancedHls_m3u8, "http") {
manifest1.Attributes.ExtendedAssetUrls.EnhancedHls = EnhancedHls_m3u8
EnhancedHls_m3u8,err:=checkM3u8(meta.Data[0].Relationships.Tracks.Data[0].ID,"album")
if strings.HasPrefix(EnhancedHls_m3u8, "http"){
manifest1.Attributes.ExtendedAssetUrls.EnhancedHls=EnhancedHls_m3u8
}
if strings.Contains(config.AlbumFolderFormat, "Quality") {
Quality, err = extractMediaQuality(manifest1.Attributes.ExtendedAssetUrls.EnhancedHls)
if strings.Contains(config.AlbumFolderFormat, "Quality"){
Quality,err = extractMediaQuality(manifest1.Attributes.ExtendedAssetUrls.EnhancedHls)
if err != nil {
fmt.Println("Failed to extract quality from manifest.\n", err)
}
}
stringsToJoin := []string{}
if meta.Data[0].Attributes.IsAppleDigitalMaster || meta.Data[0].Attributes.IsMasteredForItunes {
if config.AppleMasterChoice != "" {
if meta.Data[0].Attributes.IsAppleDigitalMaster{
if config.AppleMasterChoice != ""{
stringsToJoin = append(stringsToJoin, config.AppleMasterChoice)
}
}
if meta.Data[0].Attributes.ContentRating == "explicit" {
if config.ExplicitChoice != "" {
if meta.Data[0].Attributes.ContentRating=="explicit"{
if config.ExplicitChoice != ""{
stringsToJoin = append(stringsToJoin, config.ExplicitChoice)
}
}
if meta.Data[0].Attributes.ContentRating == "clean" {
if config.CleanChoice != "" {
if meta.Data[0].Attributes.ContentRating=="clean"{
if config.CleanChoice != ""{
stringsToJoin = append(stringsToJoin, config.CleanChoice)
}
}
@ -1242,11 +1239,11 @@ func rip(albumId string, token string, storefront string, userToken string) erro
"{ArtistName}", "Apple Music",
"{PlaylistName}", meta.Data[0].Attributes.Name,
"{PlaylistId}", albumId,
"{Quality}", Quality,
"{Quality}",Quality,
"{Codec}", "ALAC",
"{Tag}", Tag_string,
"{Tag}",Tag_string,
).Replace(config.PlaylistFolderFormat)
} else {
}else{
albumFolder = strings.NewReplacer(
"{ReleaseDate}", meta.Data[0].Attributes.ReleaseDate,
"{ReleaseYear}", meta.Data[0].Attributes.ReleaseDate[:4],
@ -1258,7 +1255,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
"{AlbumId}", albumId,
"{Quality}", Quality,
"{Codec}", "ALAC",
"{Tag}", Tag_string,
"{Tag}",Tag_string,
).Replace(config.AlbumFolderFormat)
}
if strings.HasSuffix(albumFolder, ".") {
@ -1268,7 +1265,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
sanAlbumFolder := filepath.Join(singerFolder, forbiddenNames.ReplaceAllString(albumFolder, "_"))
os.MkdirAll(sanAlbumFolder, os.ModePerm)
fmt.Println(albumFolder)
err = writeCover(sanAlbumFolder, "cover", meta.Data[0].Attributes.Artwork.URL)
err = writeCover(sanAlbumFolder,"cover", meta.Data[0].Attributes.Artwork.URL)
if err != nil {
fmt.Println("Failed to write cover.")
}
@ -1286,31 +1283,31 @@ func rip(albumId string, token string, storefront string, userToken string) erro
fmt.Println("Unavailable in ALAC.")
continue
}
EnhancedHls_m3u8, err := checkM3u8(track.ID, "song")
if strings.HasPrefix(EnhancedHls_m3u8, "http") {
manifest.Attributes.ExtendedAssetUrls.EnhancedHls = EnhancedHls_m3u8
EnhancedHls_m3u8,err:=checkM3u8(track.ID,"song")
if strings.HasPrefix(EnhancedHls_m3u8, "http"){
manifest.Attributes.ExtendedAssetUrls.EnhancedHls=EnhancedHls_m3u8
}
var Quality string
if strings.Contains(config.SongFileFormat, "Quality") {
Quality, err = extractMediaQuality(manifest.Attributes.ExtendedAssetUrls.EnhancedHls)
if strings.Contains(config.SongFileFormat, "Quality"){
Quality,err = extractMediaQuality(manifest.Attributes.ExtendedAssetUrls.EnhancedHls)
if err != nil {
fmt.Println("Failed to extract quality from manifest.\n", err)
continue
}
}
stringsToJoin := []string{}
if track.Attributes.IsAppleDigitalMaster {
if config.AppleMasterChoice != "" {
if track.Attributes.IsAppleDigitalMaster{
if config.AppleMasterChoice != ""{
stringsToJoin = append(stringsToJoin, config.AppleMasterChoice)
}
}
if track.Attributes.ContentRating == "explicit" {
if config.ExplicitChoice != "" {
if track.Attributes.ContentRating=="explicit"{
if config.ExplicitChoice != ""{
stringsToJoin = append(stringsToJoin, config.ExplicitChoice)
}
}
if track.Attributes.ContentRating == "clean" {
if config.CleanChoice != "" {
if track.Attributes.ContentRating=="clean"{
if config.CleanChoice != ""{
stringsToJoin = append(stringsToJoin, config.CleanChoice)
}
}
@ -1323,7 +1320,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
"{DiscNumber}", fmt.Sprintf("%0d", track.Attributes.DiscNumber),
"{TrackNumber}", fmt.Sprintf("%0d", track.Attributes.TrackNumber),
"{Quality}", Quality,
"{Tag}", Tag_string,
"{Tag}",Tag_string,
"{Codec}", "ALAC",
).Replace(config.SongFileFormat)
fmt.Println(songName)
@ -1393,22 +1390,22 @@ func rip(albumId string, token string, storefront string, userToken string) erro
tags := []string{
fmt.Sprintf("lyrics=%s", lrc),
}
if track.Attributes.ContentRating == "explicit" {
if track.Attributes.ContentRating=="explicit"{
tags = append(tags, "rating=1")
} else if track.Attributes.ContentRating == "clean" {
}else if track.Attributes.ContentRating=="clean"{
tags = append(tags, "rating=2")
} else {
}else{
tags = append(tags, "rating=0")
}
if config.EmbedCover {
if strings.Contains(albumId, "pl.") && config.DlAlbumcoverForPlaylist {
err = writeCover(sanAlbumFolder, track.ID, track.Attributes.Artwork.URL)
err = writeCover(sanAlbumFolder,track.ID, track.Attributes.Artwork.URL)
if err != nil {
fmt.Println("Failed to write cover.")
}
tags = append(tags, fmt.Sprintf("cover=%s/%s.%s", sanAlbumFolder, track.ID, config.CoverFormat))
} else {
tags = append(tags, fmt.Sprintf("cover=%s/%s.%s", sanAlbumFolder, "cover", config.CoverFormat))
tags = append(tags, fmt.Sprintf("cover=%s/%s.%s", sanAlbumFolder,track.ID, config.CoverFormat))
}else{
tags = append(tags, fmt.Sprintf("cover=%s/%s.%s", sanAlbumFolder,"cover", config.CoverFormat))
}
}
tagsString := strings.Join(tags, ":")
@ -1418,8 +1415,8 @@ func rip(albumId string, token string, storefront string, userToken string) erro
continue
}
if strings.Contains(albumId, "pl.") && config.DlAlbumcoverForPlaylist {
if err := os.Remove(fmt.Sprintf("%s/%s.%s", sanAlbumFolder, track.ID, config.CoverFormat)); err != nil {
fmt.Printf("Error deleting file: %s/%s.%s\n", sanAlbumFolder, track.ID, config.CoverFormat)
if err := os.Remove(fmt.Sprintf("%s/%s.%s", sanAlbumFolder,track.ID, config.CoverFormat)); err != nil {
fmt.Printf("Error deleting file: %s/%s.%s\n", sanAlbumFolder,track.ID, config.CoverFormat)
continue
}
}
@ -1520,12 +1517,12 @@ func conventTTMLToLRC(ttml string) (string, error) {
return strings.Join(lrcLines, "\n"), nil
}
func checkM3u8(b string, f string) (string, error) {
func checkM3u8(b string,f string) (string, error) {
var EnhancedHls string
if config.Check != "" {
config.Check = strings.TrimSpace(config.Check)
if config.Check != ""{
config.Check=strings.TrimSpace(config.Check)
if strings.HasSuffix(config.Check, "txt") {
txtpath = config.Check
txtpath=config.Check
}
if strings.HasPrefix(config.Check, "http") {
req, err := http.NewRequest("GET", config.Check, nil)
@ -1547,8 +1544,8 @@ func checkM3u8(b string, f string) (string, error) {
if err != nil {
fmt.Println(err)
}
if string(Checkbody) != "no_found" {
EnhancedHls = string(Checkbody)
if string(Checkbody) != "no_found"{
EnhancedHls=string(Checkbody)
fmt.Println("Found m3u8 from API")
} else {
if config.ForceApi {
@ -1558,14 +1555,14 @@ func checkM3u8(b string, f string) (string, error) {
}
}
}
if config.GetM3u8FromDevice {
if config.GetM3u8FromDevice{
adamID := b
conn, err := net.Dial("tcp", "127.0.0.1:20020")
if err != nil {
fmt.Println("Error connecting to device:", err)
}
defer conn.Close()
if f == "song" {
if f =="song"{
fmt.Println("Connected to device")
}
@ -1594,7 +1591,7 @@ func checkM3u8(b string, f string) (string, error) {
response = bytes.TrimSpace(response)
if len(response) > 0 {
if f == "song" {
if f =="song"{
fmt.Println("Received URL:", string(response))
}
EnhancedHls = string(response)
@ -1614,7 +1611,7 @@ func checkM3u8(b string, f string) (string, error) {
if strings.HasPrefix(line, b) {
parts := strings.SplitN(line, ",", 2)
if len(parts) == 2 {
EnhancedHls = parts[1]
EnhancedHls=parts[1]
fmt.Println("Found m3u8 from txt")
}
}
@ -1653,16 +1650,16 @@ func extractMediaQuality(b string) (string, error) {
if variant.Codecs == "alac" {
split := strings.Split(variant.Audio, "-")
length := len(split)
length_int, err := strconv.Atoi(split[length-2])
length_int,err := strconv.Atoi(split[length-2])
if err != nil {
return "", err
}
if length_int <= config.AlacMax {
HZ, err := strconv.Atoi(split[length-2])
if length_int <= config.AlacMax{
HZ,err:=strconv.Atoi(split[length-2])
if err != nil {
fmt.Println(err)
}
KHZ := float64(HZ) / 1000.0
KHZ:=float64(HZ) / 1000.0
Quality = fmt.Sprintf("%sB-%.1fkHz", split[length-1], KHZ)
break
}
@ -1702,11 +1699,11 @@ func extractMedia(b string) (string, []string, error) {
if variant.Codecs == "alac" {
split := strings.Split(variant.Audio, "-")
length := len(split)
length_int, err := strconv.Atoi(split[length-2])
length_int,err := strconv.Atoi(split[length-2])
if err != nil {
return "", nil, err
}
if length_int <= config.AlacMax {
if length_int <= config.AlacMax{
fmt.Printf("%s-bit / %s Hz\n", split[length-1], split[length-2])
streamUrlTemp, err := masterUrl.Parse(variant.URI)
if err != nil {

@ -4,8 +4,10 @@ import (
"bytes"
"encoding/binary"
"encoding/json"
"gopkg.in/yaml.v2"
"errors"
"fmt"
"github.com/beevik/etree"
"io"
"io/ioutil"
"math"
@ -21,9 +23,6 @@ import (
"strings"
"time"
"github.com/beevik/etree"
"gopkg.in/yaml.v2"
"github.com/abema/go-mp4"
"github.com/grafov/m3u8"
)
@ -36,7 +35,6 @@ const (
var (
forbiddenNames = regexp.MustCompile(`[/\\<>:"|?*]`)
)
type Config struct {
MediaUserToken string `yaml:"media-user-token"`
SaveLrcFile bool `yaml:"save-lrc-file"`
@ -1065,8 +1063,8 @@ func getSongLyrics(songId string, storefront string, token string, userToken str
}
}
func writeCover(sanAlbumFolder, name string, url string) error {
covPath := filepath.Join(sanAlbumFolder, name+"."+config.CoverFormat)
func writeCover(sanAlbumFolder,name string, url string) error {
covPath := filepath.Join(sanAlbumFolder, name+"." + config.CoverFormat)
exists, err := fileExists(covPath)
if err != nil {
fmt.Println("Failed to check if cover exists.")
@ -1127,13 +1125,13 @@ func rip(albumId string, token string, storefront string, userToken string) erro
return err
}
var singerFoldername string
if config.ArtistFolderFormat != "" {
if config.ArtistFolderFormat != ""{
if strings.Contains(albumId, "pl.") {
singerFoldername = strings.NewReplacer(
"{ArtistName}", "Apple Music",
"{ArtistId}", "",
).Replace(config.ArtistFolderFormat)
} else {
}else{
singerFoldername = strings.NewReplacer(
"{ArtistName}", meta.Data[0].Attributes.ArtistName,
"{ArtistId}", meta.Data[0].Relationships.Artists.Data[0].ID,
@ -1147,45 +1145,46 @@ func rip(albumId string, token string, storefront string, userToken string) erro
}
singerFolder := filepath.Join(config.AtmosSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
stringsToJoin := []string{}
if meta.Data[0].Attributes.IsAppleDigitalMaster || meta.Data[0].Attributes.IsMasteredForItunes {
if config.AppleMasterChoice != "" {
if meta.Data[0].Attributes.IsAppleDigitalMaster{
if config.AppleMasterChoice != ""{
stringsToJoin = append(stringsToJoin, config.AppleMasterChoice)
}
}
if meta.Data[0].Attributes.ContentRating == "explicit" {
if config.ExplicitChoice != "" {
if meta.Data[0].Attributes.ContentRating=="explicit"{
if config.ExplicitChoice != ""{
stringsToJoin = append(stringsToJoin, config.ExplicitChoice)
}
}
if meta.Data[0].Attributes.ContentRating == "clean" {
if config.CleanChoice != "" {
if meta.Data[0].Attributes.ContentRating=="clean"{
if config.CleanChoice != ""{
stringsToJoin = append(stringsToJoin, config.CleanChoice)
}
}
Tag_string := strings.Join(stringsToJoin, " ")
var albumFolder string
Quality := fmt.Sprintf("%dkbps", config.AtmosMax-2000)
Quality:=fmt.Sprintf("%dkbps", config.AtmosMax-2000)
if strings.Contains(albumId, "pl.") {
albumFolder = strings.NewReplacer(
"{ArtistName}", "Apple Music",
"{PlaylistName}", meta.Data[0].Attributes.Name,
"{PlaylistId}", albumId,
"{Quality}", Quality,
"{Quality}",Quality,
"{Codec}", "Atmos",
"{Tag}", Tag_string,
"{Tag}",Tag_string,
).Replace(config.PlaylistFolderFormat)
} else {
}else{
albumFolder = strings.NewReplacer(
"{ReleaseDate}", meta.Data[0].Attributes.ReleaseDate,
"{ReleaseYear}", meta.Data[0].Attributes.ReleaseDate[:4],
"{ArtistName}", meta.Data[0].Attributes.ArtistName,
"{AlbumName}", meta.Data[0].Attributes.Name,
"{UPC}", meta.Data[0].Attributes.Upc,
"{RecordLabel}", meta.Data[0].Attributes.RecordLabel,
"{Copyright}", meta.Data[0].Attributes.Copyright,
"{AlbumId}", albumId,
"{Quality}", Quality,
"{Quality}",Quality,
"{Codec}", "Atmos",
"{Tag}", Tag_string,
"{Tag}",Tag_string,
).Replace(config.AlbumFolderFormat)
}
if strings.HasSuffix(albumFolder, ".") {
@ -1195,7 +1194,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
sanAlbumFolder := filepath.Join(singerFolder, forbiddenNames.ReplaceAllString(albumFolder, "_"))
os.MkdirAll(sanAlbumFolder, os.ModePerm)
fmt.Println(albumFolder)
err = writeCover(sanAlbumFolder, "cover", meta.Data[0].Attributes.Artwork.URL)
err = writeCover(sanAlbumFolder,"cover", meta.Data[0].Attributes.Artwork.URL)
if err != nil {
fmt.Println("Failed to write cover.")
}
@ -1215,18 +1214,18 @@ func rip(albumId string, token string, storefront string, userToken string) erro
}
stringsToJoin := []string{}
if track.Attributes.IsAppleDigitalMaster {
if config.AppleMasterChoice != "" {
if track.Attributes.IsAppleDigitalMaster{
if config.AppleMasterChoice != ""{
stringsToJoin = append(stringsToJoin, config.AppleMasterChoice)
}
}
if track.Attributes.ContentRating == "explicit" {
if config.ExplicitChoice != "" {
if track.Attributes.ContentRating=="explicit"{
if config.ExplicitChoice != ""{
stringsToJoin = append(stringsToJoin, config.ExplicitChoice)
}
}
if track.Attributes.ContentRating == "clean" {
if config.CleanChoice != "" {
if track.Attributes.ContentRating=="clean"{
if config.CleanChoice != ""{
stringsToJoin = append(stringsToJoin, config.CleanChoice)
}
}
@ -1237,9 +1236,9 @@ func rip(albumId string, token string, storefront string, userToken string) erro
"{SongName}", track.Attributes.Name,
"{DiscNumber}", string(track.Attributes.DiscNumber),
"{TrackNumber}", fmt.Sprintf("%02d", track.Attributes.TrackNumber),
"{Quality}", Quality,
"{Quality}",Quality,
"{Codec}", "Atmos",
"{Tag}", Tag_string,
"{Tag}",Tag_string,
).Replace(config.SongFileFormat)
fmt.Println(songName)
filename := fmt.Sprintf("%s.ec3", forbiddenNames.ReplaceAllString(songName, "_"))
@ -1328,13 +1327,13 @@ func rip(albumId string, token string, storefront string, userToken string) erro
}
if config.EmbedCover {
if strings.Contains(albumId, "pl.") && config.DlAlbumcoverForPlaylist {
err = writeCover(sanAlbumFolder, track.ID, track.Attributes.Artwork.URL)
err = writeCover(sanAlbumFolder,track.ID, track.Attributes.Artwork.URL)
if err != nil {
fmt.Println("Failed to write cover.")
}
tags = append(tags, fmt.Sprintf("cover=%s/%s.%s", sanAlbumFolder, track.ID, config.CoverFormat))
} else {
tags = append(tags, fmt.Sprintf("cover=%s/%s.%s", sanAlbumFolder, "cover", config.CoverFormat))
tags = append(tags, fmt.Sprintf("cover=%s/%s.%s", sanAlbumFolder,track.ID, config.CoverFormat))
}else{
tags = append(tags, fmt.Sprintf("cover=%s/%s.%s", sanAlbumFolder,"cover", config.CoverFormat))
}
}
if strings.Contains(albumId, "pl.") && !config.UseSongInfoForPlaylist {
@ -1342,17 +1341,17 @@ func rip(albumId string, token string, storefront string, userToken string) erro
tags = append(tags, fmt.Sprintf("track=%s", trackNum))
tags = append(tags, fmt.Sprintf("tracknum=%d/%d", trackNum, trackTotal))
tags = append(tags, fmt.Sprintf("album=%s", meta.Data[0].Attributes.Name))
} else {
tags = append(tags, fmt.Sprintf("disk=%d/%d", meta.Data[0].Relationships.Tracks.Data[index].Attributes.DiscNumber, meta.Data[0].Relationships.Tracks.Data[trackTotal-1].Attributes.DiscNumber))
}else{
tags = append(tags, fmt.Sprintf("disk=%d/%d", meta.Data[0].Relationships.Tracks.Data[index].Attributes.DiscNumber, meta.Data[0].Relationships.Tracks.Data[trackTotal - 1].Attributes.DiscNumber))
tags = append(tags, fmt.Sprintf("track=%s", meta.Data[0].Relationships.Tracks.Data[index].Attributes.TrackNumber))
tags = append(tags, fmt.Sprintf("tracknum=%d/%d", meta.Data[0].Relationships.Tracks.Data[index].Attributes.TrackNumber, trackTotal))
tags = append(tags, fmt.Sprintf("album=%s", meta.Data[0].Relationships.Tracks.Data[index].Attributes.AlbumName))
}
if track.Attributes.ContentRating == "explicit" {
if track.Attributes.ContentRating=="explicit"{
tags = append(tags, "rating=1")
} else if track.Attributes.ContentRating == "clean" {
}else if track.Attributes.ContentRating=="clean"{
tags = append(tags, "rating=2")
} else {
}else{
tags = append(tags, "rating=0")
}
tagsString := strings.Join(tags, ":")
@ -1368,8 +1367,8 @@ func rip(albumId string, token string, storefront string, userToken string) erro
continue
}
if strings.Contains(albumId, "pl.") && config.DlAlbumcoverForPlaylist {
if err := os.Remove(fmt.Sprintf("%s/%s.%s", sanAlbumFolder, track.ID, config.CoverFormat)); err != nil {
fmt.Printf("Error deleting file: %s/%s.%s\n", sanAlbumFolder, track.ID, config.CoverFormat)
if err := os.Remove(fmt.Sprintf("%s/%s.%s", sanAlbumFolder,track.ID, config.CoverFormat)); err != nil {
fmt.Printf("Error deleting file: %s/%s.%s\n", sanAlbumFolder,track.ID, config.CoverFormat)
continue
}
}
@ -1492,11 +1491,11 @@ func extractMedia(b string) (string, []string, error) {
if variant.Codecs == "ec-3" {
split := strings.Split(variant.Audio, "-")
length := len(split)
length_int, err := strconv.Atoi(split[length-1])
length_int,err := strconv.Atoi(split[length-1])
if err != nil {
return "", nil, err
}
if length_int <= config.AtmosMax {
if length_int <= config.AtmosMax{
fmt.Printf("%s\n", variant.Audio)
streamUrlTemp, err := masterUrl.Parse(variant.URI)
if err != nil {

@ -5,8 +5,10 @@ import (
"bytes"
"encoding/binary"
"encoding/json"
"gopkg.in/yaml.v2"
"errors"
"fmt"
"github.com/beevik/etree"
"io"
"io/ioutil"
"math"
@ -22,9 +24,6 @@ import (
"strings"
"time"
"github.com/beevik/etree"
"gopkg.in/yaml.v2"
"github.com/abema/go-mp4"
"github.com/grafov/m3u8"
)
@ -37,7 +36,6 @@ const (
var (
forbiddenNames = regexp.MustCompile(`[/\\<>:"|?*]`)
)
type Config struct {
MediaUserToken string `yaml:"media-user-token"`
SaveLrcFile bool `yaml:"save-lrc-file"`
@ -687,10 +685,10 @@ func writeM4a(w *mp4.Writer, info *SongInfo, meta *AutoGenerated, data []byte, t
if err != nil {
return err
}
AlbumName := meta.Data[0].Relationships.Tracks.Data[index].Attributes.AlbumName
if strings.Contains(meta.Data[0].ID, "pl.") {
AlbumName:=meta.Data[0].Relationships.Tracks.Data[index].Attributes.AlbumName
if strings.Contains(meta.Data[0].ID, "pl."){
if !config.UseSongInfoForPlaylist {
AlbumName = meta.Data[0].Attributes.Name
AlbumName=meta.Data[0].Attributes.Name
}
}
err = addMeta(mp4.BoxType{'\251', 'a', 'l', 'b'}, AlbumName)
@ -802,7 +800,7 @@ func writeM4a(w *mp4.Writer, info *SongInfo, meta *AutoGenerated, data []byte, t
return err
}
if !strings.Contains(meta.Data[0].ID, "pl.") {
if !strings.Contains(meta.Data[0].ID, "pl."){
plID, err := strconv.ParseUint(meta.Data[0].ID, 10, 32)
if err != nil {
return err
@ -832,8 +830,8 @@ func writeM4a(w *mp4.Writer, info *SongInfo, meta *AutoGenerated, data []byte, t
binary.BigEndian.PutUint32(trkn, uint32(meta.Data[0].Relationships.Tracks.Data[index].Attributes.TrackNumber))
binary.BigEndian.PutUint16(trkn[4:], uint16(trackTotal))
binary.BigEndian.PutUint32(disk, uint32(meta.Data[0].Relationships.Tracks.Data[index].Attributes.DiscNumber))
binary.BigEndian.PutUint16(disk[4:], uint16(meta.Data[0].Relationships.Tracks.Data[trackTotal-1].Attributes.DiscNumber))
if strings.Contains(meta.Data[0].ID, "pl.") {
binary.BigEndian.PutUint16(disk[4:], uint16(meta.Data[0].Relationships.Tracks.Data[trackTotal - 1].Attributes.DiscNumber))
if strings.Contains(meta.Data[0].ID, "pl."){
if !config.UseSongInfoForPlaylist {
binary.BigEndian.PutUint32(trkn, uint32(trackNum))
binary.BigEndian.PutUint16(trkn[4:], uint16(trackTotal))
@ -1113,8 +1111,8 @@ func getSongLyrics(songId string, storefront string, token string, userToken str
}
}
func writeCover(sanAlbumFolder, name string, url string) error {
covPath := filepath.Join(sanAlbumFolder, name+"."+config.CoverFormat)
func writeCover(sanAlbumFolder,name string, url string) error {
covPath := filepath.Join(sanAlbumFolder, name+"." + config.CoverFormat)
exists, err := fileExists(covPath)
if err != nil {
fmt.Println("Failed to check if cover exists.")
@ -1185,13 +1183,13 @@ func rip(albumId string, token string, storefront string, userToken string) erro
return err
}
var singerFoldername string
if config.ArtistFolderFormat != "" {
if config.ArtistFolderFormat != ""{
if strings.Contains(albumId, "pl.") {
singerFoldername = strings.NewReplacer(
"{ArtistName}", "Apple Music",
"{ArtistId}", "",
).Replace(config.ArtistFolderFormat)
} else {
}else{
singerFoldername = strings.NewReplacer(
"{ArtistName}", meta.Data[0].Attributes.ArtistName,
"{ArtistId}", meta.Data[0].Relationships.Artists.Data[0].ID,
@ -1205,18 +1203,18 @@ func rip(albumId string, token string, storefront string, userToken string) erro
}
singerFolder := filepath.Join(config.AlacSaveFolder, forbiddenNames.ReplaceAllString(singerFoldername, "_"))
stringsToJoin := []string{}
if meta.Data[0].Attributes.IsAppleDigitalMaster || meta.Data[0].Attributes.IsMasteredForItunes {
if config.AppleMasterChoice != "" {
if meta.Data[0].Attributes.IsAppleDigitalMaster{
if config.AppleMasterChoice != ""{
stringsToJoin = append(stringsToJoin, config.AppleMasterChoice)
}
}
if meta.Data[0].Attributes.ContentRating == "explicit" {
if config.ExplicitChoice != "" {
if meta.Data[0].Attributes.ContentRating=="explicit"{
if config.ExplicitChoice != ""{
stringsToJoin = append(stringsToJoin, config.ExplicitChoice)
}
}
if meta.Data[0].Attributes.ContentRating == "clean" {
if config.CleanChoice != "" {
if meta.Data[0].Attributes.ContentRating=="clean"{
if config.CleanChoice != ""{
stringsToJoin = append(stringsToJoin, config.CleanChoice)
}
}
@ -1229,8 +1227,8 @@ func rip(albumId string, token string, storefront string, userToken string) erro
fmt.Println("Unavailable in ALAC.")
}
var Quality string
if strings.Contains(config.AlbumFolderFormat, "Quality") {
Quality, err = extractMediaQuality(manifest1.Attributes.ExtendedAssetUrls.EnhancedHls)
if strings.Contains(config.AlbumFolderFormat, "Quality"){
Quality,err = extractMediaQuality(manifest1.Attributes.ExtendedAssetUrls.EnhancedHls)
if err != nil {
fmt.Println("Failed to extract quality from manifest.\n", err)
}
@ -1241,22 +1239,23 @@ func rip(albumId string, token string, storefront string, userToken string) erro
"{ArtistName}", "Apple Music",
"{PlaylistName}", meta.Data[0].Attributes.Name,
"{PlaylistId}", albumId,
"{Quality}", Quality,
"{Quality}",Quality,
"{Codec}", "ALAC",
"{Tag}", Tag_string,
"{Tag}",Tag_string,
).Replace(config.PlaylistFolderFormat)
} else {
}else{
albumFolder = strings.NewReplacer(
"{ReleaseDate}", meta.Data[0].Attributes.ReleaseDate,
"{ReleaseYear}", meta.Data[0].Attributes.ReleaseDate[:4],
"{ArtistName}", meta.Data[0].Attributes.ArtistName,
"{AlbumName}", meta.Data[0].Attributes.Name,
"{UPC}", meta.Data[0].Attributes.Upc,
"{RecordLabel}", meta.Data[0].Attributes.RecordLabel,
"{Copyright}", meta.Data[0].Attributes.Copyright,
"{AlbumId}", albumId,
"{Quality}", Quality,
"{Codec}", "ALAC",
"{Tag}", Tag_string,
"{Tag}",Tag_string,
).Replace(config.AlbumFolderFormat)
}
if strings.HasSuffix(albumFolder, ".") {
@ -1266,7 +1265,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
sanAlbumFolder := filepath.Join(singerFolder, forbiddenNames.ReplaceAllString(albumFolder, "_"))
os.MkdirAll(sanAlbumFolder, os.ModePerm)
fmt.Println(albumFolder)
err = writeCover(sanAlbumFolder, "cover", meta.Data[0].Attributes.Artwork.URL)
err = writeCover(sanAlbumFolder,"cover", meta.Data[0].Attributes.Artwork.URL)
if err != nil {
fmt.Println("Failed to write cover.")
}
@ -1285,7 +1284,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
manually_txt := false
m3u8_txt := ""
if strings.Contains(input, "txt") {
m3u8_txt = strings.TrimSpace(input)
m3u8_txt= strings.TrimSpace(input)
fmt.Print(m3u8_txt)
strArr := make([]string, len(arr))
for i, num := range arr {
@ -1329,26 +1328,26 @@ func rip(albumId string, token string, storefront string, userToken string) erro
continue
}
var Quality string
if strings.Contains(config.SongFileFormat, "Quality") {
Quality, err = extractMediaQuality(manifest.Attributes.ExtendedAssetUrls.EnhancedHls)
if strings.Contains(config.SongFileFormat, "Quality"){
Quality,err = extractMediaQuality(manifest.Attributes.ExtendedAssetUrls.EnhancedHls)
if err != nil {
fmt.Println("Failed to extract quality from manifest.\n", err)
continue
}
}
stringsToJoin := []string{}
if track.Attributes.IsAppleDigitalMaster {
if config.AppleMasterChoice != "" {
if track.Attributes.IsAppleDigitalMaster{
if config.AppleMasterChoice != ""{
stringsToJoin = append(stringsToJoin, config.AppleMasterChoice)
}
}
if track.Attributes.ContentRating == "explicit" {
if config.ExplicitChoice != "" {
if track.Attributes.ContentRating=="explicit"{
if config.ExplicitChoice != ""{
stringsToJoin = append(stringsToJoin, config.ExplicitChoice)
}
}
if track.Attributes.ContentRating == "clean" {
if config.CleanChoice != "" {
if track.Attributes.ContentRating=="clean"{
if config.CleanChoice != ""{
stringsToJoin = append(stringsToJoin, config.CleanChoice)
}
}
@ -1359,9 +1358,9 @@ func rip(albumId string, token string, storefront string, userToken string) erro
"{SongName}", track.Attributes.Name,
"{DiscNumber}", string(track.Attributes.DiscNumber),
"{TrackNumber}", fmt.Sprintf("%02d", track.Attributes.TrackNumber),
"{Quality}", Quality,
"{Quality}",Quality,
"{Codec}", "ALAC",
"{Tag}", Tag_string,
"{Tag}",Tag_string,
).Replace(config.SongFileFormat)
fmt.Println(songName)
filename := fmt.Sprintf("%s.m4a", forbiddenNames.ReplaceAllString(songName, "_"))
@ -1409,7 +1408,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
if strings.HasPrefix(line, track.ID) {
parts := strings.SplitN(line, ",", 2)
if len(parts) == 2 {
manifest.Attributes.ExtendedAssetUrls.EnhancedHls = parts[1]
manifest.Attributes.ExtendedAssetUrls.EnhancedHls=parts[1]
}
}
}
@ -1425,7 +1424,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
fmt.Println(err)
}
m3u8_url = strings.TrimSpace(m3u8_url)
manifest.Attributes.ExtendedAssetUrls.EnhancedHls = m3u8_url
manifest.Attributes.ExtendedAssetUrls.EnhancedHls=m3u8_url
}
trackUrl, keys, err := extractMedia(manifest.Attributes.ExtendedAssetUrls.EnhancedHls)
if err != nil {
@ -1460,21 +1459,21 @@ func rip(albumId string, token string, storefront string, userToken string) erro
}
if config.EmbedCover {
if strings.Contains(albumId, "pl.") && config.DlAlbumcoverForPlaylist {
err = writeCover(sanAlbumFolder, track.ID, track.Attributes.Artwork.URL)
err = writeCover(sanAlbumFolder,track.ID, track.Attributes.Artwork.URL)
if err != nil {
fmt.Println("Failed to write cover.")
}
tags = append(tags, fmt.Sprintf("cover=%s/%s.%s", sanAlbumFolder, track.ID, config.CoverFormat))
} else {
tags = append(tags, fmt.Sprintf("cover=%s/%s.%s", sanAlbumFolder, "cover", config.CoverFormat))
tags = append(tags, fmt.Sprintf("cover=%s/%s.%s", sanAlbumFolder,track.ID, config.CoverFormat))
}else{
tags = append(tags, fmt.Sprintf("cover=%s/%s.%s", sanAlbumFolder,"cover", config.CoverFormat))
}
}
if track.Attributes.ContentRating == "explicit" {
if track.Attributes.ContentRating=="explicit"{
tags = append(tags, "rating=1")
} else if track.Attributes.ContentRating == "clean" {
}else if track.Attributes.ContentRating=="clean"{
tags = append(tags, "rating=2")
} else {
}else{
tags = append(tags, "rating=0")
}
tagsString := strings.Join(tags, ":")
@ -1484,8 +1483,8 @@ func rip(albumId string, token string, storefront string, userToken string) erro
continue
}
if strings.Contains(albumId, "pl.") && config.DlAlbumcoverForPlaylist {
if err := os.Remove(fmt.Sprintf("%s/%s.%s", sanAlbumFolder, track.ID, config.CoverFormat)); err != nil {
fmt.Printf("Error deleting file: %s/%s.%s\n", sanAlbumFolder, track.ID, config.CoverFormat)
if err := os.Remove(fmt.Sprintf("%s/%s.%s", sanAlbumFolder,track.ID, config.CoverFormat)); err != nil {
fmt.Printf("Error deleting file: %s/%s.%s\n", sanAlbumFolder,track.ID, config.CoverFormat)
continue
}
}
@ -1601,16 +1600,16 @@ func extractMediaQuality(b string) (string, error) {
if variant.Codecs == "alac" {
split := strings.Split(variant.Audio, "-")
length := len(split)
length_int, err := strconv.Atoi(split[length-2])
length_int,err := strconv.Atoi(split[length-2])
if err != nil {
return "", err
}
if length_int <= config.AlacMax {
HZ, err := strconv.Atoi(split[length-2])
if length_int <= config.AlacMax{
HZ,err:=strconv.Atoi(split[length-2])
if err != nil {
fmt.Println(err)
}
KHZ := float64(HZ) / 1000.0
KHZ:=float64(HZ) / 1000.0
Quality = fmt.Sprintf("%sB-%.1fkHz", split[length-1], KHZ)
break
}
@ -1650,11 +1649,11 @@ func extractMedia(b string) (string, []string, error) {
if variant.Codecs == "alac" {
split := strings.Split(variant.Audio, "-")
length := len(split)
length_int, err := strconv.Atoi(split[length-2])
length_int,err := strconv.Atoi(split[length-2])
if err != nil {
return "", nil, err
}
if length_int <= config.AlacMax {
if length_int <= config.AlacMax{
fmt.Printf("%s-bit / %s Hz\n", split[length-1], split[length-2])
streamUrlTemp, err := masterUrl.Parse(variant.URI)
if err != nil {

Loading…
Cancel
Save