mirror of
https://github.com/Superredstone/spotiflac-cli.git
synced 2026-03-07 20:18:07 +01:00
refactor: move track download to a different function
This commit is contained in:
@@ -23,12 +23,9 @@ type DownloadRequest struct {
|
||||
SpotifyID string
|
||||
}
|
||||
|
||||
func (app *App) Download(url string, outputFile string, serviceString string, quality string) error {
|
||||
var downloadUrl string
|
||||
var fileName string
|
||||
|
||||
if serviceString == "" {
|
||||
serviceString = DEFAULT_DOWNLOAD_SERVICE
|
||||
func (app *App) Download(url string, outputFile string, service string, quality string) error {
|
||||
if service == "" {
|
||||
service = DEFAULT_DOWNLOAD_SERVICE
|
||||
}
|
||||
|
||||
urlType, err := ParseUrlType(url)
|
||||
@@ -38,20 +35,28 @@ func (app *App) Download(url string, outputFile string, serviceString string, qu
|
||||
|
||||
switch urlType {
|
||||
case UrlTypeTrack:
|
||||
songlink, err := app.ConvertSongUrl(url)
|
||||
if err != nil {
|
||||
if err := app.DownloadTrack(url, outputFile, service, quality); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
tidalId, err := app.GetTidalIdFromSonglink(songlink)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
downloadUrl, err = app.GetTidalDownloadUrl(tidalId, quality)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
func (app *App) DownloadTrack(url string, outputFile, service string, quality string) error {
|
||||
songlink, err := app.ConvertSongUrl(url)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
tidalId, err := app.GetTidalIdFromSonglink(songlink)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
downloadUrl, err := app.GetTidalDownloadUrl(tidalId, quality)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
metadata, err := app.GetTrackMetadata(url)
|
||||
@@ -64,7 +69,7 @@ func (app *App) Download(url string, outputFile string, serviceString string, qu
|
||||
return err
|
||||
}
|
||||
|
||||
outputFile, err = BuildFileOutput(outputFile, fileName, extension, metadata)
|
||||
outputFile, err = BuildFileOutput(outputFile, extension, metadata)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -44,6 +44,8 @@ func (app *App) PrintMetadata(url string) error {
|
||||
}
|
||||
|
||||
func (app *App) EmbedMetadata(file string, metadata TrackMetadata) error {
|
||||
app.log("Embedding metadata")
|
||||
|
||||
tag, err := id3v2.Open(file, id3v2.Options{Parse: true})
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
@@ -71,7 +71,7 @@ func GetArtists(metadata TrackMetadata) (string, error) {
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func BuildFileOutput(outputFile string, fileName string, extension string, metadata TrackMetadata) (string, error) {
|
||||
func BuildFileOutput(outputFile string, extension string, metadata TrackMetadata) (string, error) {
|
||||
var result string
|
||||
|
||||
fileName, err := BuildFileName(metadata, extension)
|
||||
|
||||
Reference in New Issue
Block a user