Superredstone/spotiflac-cli
1
0
Fork 0
mirror of https://github.com/Superredstone/spotiflac-cli.git synced 2026-03-07 20:18:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move track download to a different function

Browse Source
This commit is contained in:
Patrick Canal
2026-02-19 16:44:54 +01:00
parent 41e2484b2a
commit a85812a1b8
3 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/download.go
View File

@@ -23,12 +23,9 @@ type DownloadRequest struct {
SpotifyID string SpotifyID string
} }
func (app *App) Download(url string, outputFile string, serviceString string, quality string) error { func (app *App) Download(url string, outputFile string, service string, quality string) error {
var downloadUrl string if service == "" {
var fileName string service = DEFAULT_DOWNLOAD_SERVICE
if serviceString == "" {
serviceString = DEFAULT_DOWNLOAD_SERVICE
} }
urlType, err := ParseUrlType(url) urlType, err := ParseUrlType(url)
@@ -38,20 +35,28 @@ func (app *App) Download(url string, outputFile string, serviceString string, qu
switch urlType { switch urlType {
case UrlTypeTrack: case UrlTypeTrack:
songlink, err := app.ConvertSongUrl(url) if err := app.DownloadTrack(url, outputFile, service, quality); err != nil {
if err != nil {
return err return err
} }
}
tidalId, err := app.GetTidalIdFromSonglink(songlink) return nil
if err != nil { }
return err
}
downloadUrl, err = app.GetTidalDownloadUrl(tidalId, quality) func (app *App) DownloadTrack(url string, outputFile, service string, quality string) error {
if err != nil { songlink, err := app.ConvertSongUrl(url)
return err 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) metadata, err := app.GetTrackMetadata(url)
@@ -64,7 +69,7 @@ func (app *App) Download(url string, outputFile string, serviceString string, qu
return err return err
} }
outputFile, err = BuildFileOutput(outputFile, fileName, extension, metadata) outputFile, err = BuildFileOutput(outputFile, extension, metadata)
if err != nil { if err != nil {
return err return err
} }

2
lib/metadata.go
View File

@@ -44,6 +44,8 @@ func (app *App) PrintMetadata(url string) error {
} }
func (app *App) EmbedMetadata(file string, metadata TrackMetadata) error { func (app *App) EmbedMetadata(file string, metadata TrackMetadata) error {
app.log("Embedding metadata")
tag, err := id3v2.Open(file, id3v2.Options{Parse: true}) tag, err := id3v2.Open(file, id3v2.Options{Parse: true})
if err != nil { if err != nil {
return err return err

2
lib/utils.go
View File

@@ -71,7 +71,7 @@ func GetArtists(metadata TrackMetadata) (string, error) {
return result, nil 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 var result string
fileName, err := BuildFileName(metadata, extension) fileName, err := BuildFileName(metadata, extension)