.github/workflows/go.yml

@@ -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

main.go

@@ -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")
@@ -1220,7 +1217,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 		}
 	}
 	stringsToJoin := []string{}
-	if meta.Data[0].Attributes.IsAppleDigitalMaster || meta.Data[0].Attributes.IsMasteredForItunes {
+	if meta.Data[0].Attributes.IsAppleDigitalMaster{
 		if config.AppleMasterChoice != ""{
 			stringsToJoin = append(stringsToJoin, config.AppleMasterChoice)
 		}

main_atmos.go

@@ -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"`   
@@ -1147,7 +1145,7 @@ 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 meta.Data[0].Attributes.IsAppleDigitalMaster{
 		if config.AppleMasterChoice != ""{
 			stringsToJoin = append(stringsToJoin, config.AppleMasterChoice)
 		}
@@ -1181,6 +1179,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 			"{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,

main_select.go

@@ -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"`   
@@ -1205,7 +1203,7 @@ 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 meta.Data[0].Attributes.IsAppleDigitalMaster{
 		if config.AppleMasterChoice != ""{
 			stringsToJoin = append(stringsToJoin, config.AppleMasterChoice)
 		}
@@ -1252,6 +1250,7 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 			"{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,