Merge pull request #35 from itouakirai/main

add ttml lyrics download

config.yaml

@@ -1,8 +1,9 @@
 media-user-token: "your-media-user-token" #If you need to obtain the lyrics, need to change it
 authorization-token: "your-authorization-token" #You don't need to change it; it can automatically obtain token
+lrc-type: "lyrics"   #lyrics or syllable-lyrics
+lrc-format: "lrc"   #lrc or ttml
 embed-lrc: true
 save-lrc-file: false
-lrc-format: "lyrics"   #lyrics syllable-lyrics
 save-artist-cover: false
 save-animated-artwork: false    # If enabled, requires ffmpeg
 emby-animated-artwork: false    # If enabled, requires ffmpeg

main.go

@@ -52,6 +52,7 @@ type Config struct {
 	MediaUserToken          string `yaml:"media-user-token"`
 	AuthorizationToken      string `yaml:"authorization-token"`
 	SaveLrcFile             bool   `yaml:"save-lrc-file"`
+	LrcType              string `yaml:"lrc-type"`
 	LrcFormat               string `yaml:"lrc-format"`
 	SaveAnimatedArtwork     bool   `yaml:"save-animated-artwork"`
 	EmbyAnimatedArtwork     bool   `yaml:"emby-animated-artwork"`
@@ -1318,7 +1319,7 @@ func getMeta(albumId string, token string, storefront string) (*AutoGenerated, e
 
 func getSongLyrics(songId string, storefront string, token string, userToken string) (string, error) {
 	req, err := http.NewRequest("GET",
-		fmt.Sprintf("https://amp-api.music.apple.com/v1/catalog/%s/songs/%s/%s", storefront, songId, config.LrcFormat), nil)
+		fmt.Sprintf("https://amp-api.music.apple.com/v1/catalog/%s/songs/%s/%s", storefront, songId, config.LrcType), nil)
 	if err != nil {
 		return "", err
 	}
@@ -1710,14 +1711,25 @@ func rip(albumId string, token string, storefront string, userToken string) erro
 				filename = fmt.Sprintf("%s.ec3", forbiddenNames.ReplaceAllString(songName, "_"))
 			}
 			m4afilename := fmt.Sprintf("%s.m4a", forbiddenNames.ReplaceAllString(songName, "_"))
-			lrcFilename := fmt.Sprintf("%s.lrc", forbiddenNames.ReplaceAllString(songName, "_"))
+			lrcFilename := fmt.Sprintf("%s.%s", forbiddenNames.ReplaceAllString(songName, "_"), config.LrcFormat)
 			trackPath := filepath.Join(sanAlbumFolder, filename)
 			m4atrackPath := filepath.Join(sanAlbumFolder, m4afilename)
 			var lrc string = ""
 			if userToken != "your-media-user-token" && (config.EmbedLrc || config.SaveLrcFile) {
 				ttml, err := getSongLyrics(track.ID, storefront, token, userToken)
 				if err != nil {
 					fmt.Println("Failed to get lyrics")
+				} else if config.LrcFormat == "ttml"{
+					if config.SaveLrcFile {
+						lrc = ttml
+						err := writeLyrics(sanAlbumFolder, lrcFilename, lrc)
+						if err != nil {
+							fmt.Printf("Failed to write lyrics")
+						}
+						if !config.EmbedLrc {
+							lrc = ""
+						}
+					}
 				} else {
 					lrc, err = conventTTMLToLRC(ttml)
 					if err != nil {