diff --git a/internal/deezer/album.go b/internal/deezer/album.go index b4e87ec..8f53e88 100644 --- a/internal/deezer/album.go +++ b/internal/deezer/album.go @@ -3,7 +3,7 @@ package deezer import ( "encoding/json" "fmt" - "path" + "path/filepath" "github.com/flytam/filenamify" ) @@ -41,7 +41,7 @@ func (a *Album) SetTracks(t []*Track) { func (a *Album) OutputDir(outputDir string) string { base := fmt.Sprintf("%s - %s", a.Results.Data.Artist, a.Results.Data.Title) base, _ = filenamify.Filenamify(base, filenamify.Options{}) - return path.Join(outputDir, base) + return filepath.Join(outputDir, base) } func (a *Album) decode(data []byte) error { diff --git a/internal/deezer/artist.go b/internal/deezer/artist.go index bee54f6..12b997d 100644 --- a/internal/deezer/artist.go +++ b/internal/deezer/artist.go @@ -2,7 +2,7 @@ package deezer import ( "encoding/json" - "path" + "path/filepath" "github.com/flytam/filenamify" ) @@ -32,7 +32,7 @@ func (a *Artist) SetTracks(t []*Track) { func (a *Artist) OutputDir(outputDir string) string { base, _ := filenamify.Filenamify(a.Results.Data.Name, filenamify.Options{}) - return path.Join(outputDir, base) + return filepath.Join(outputDir, base) } func (a *Artist) decode(data []byte) error { diff --git a/internal/deezer/playlist.go b/internal/deezer/playlist.go index 326e061..b6f3b65 100644 --- a/internal/deezer/playlist.go +++ b/internal/deezer/playlist.go @@ -2,7 +2,7 @@ package deezer import ( "encoding/json" - "path" + "path/filepath" "github.com/flytam/filenamify" ) @@ -34,7 +34,7 @@ func (p *Playlist) SetTracks(t []*Track) { func (p *Playlist) OutputDir(outputDir string) string { base, _ := filenamify.Filenamify(p.Results.Data.Title, filenamify.Options{}) - return path.Join(outputDir, base) + return filepath.Join(outputDir, base) } func (p *Playlist) decode(data []byte) error { diff --git a/internal/deezer/single.go b/internal/deezer/single.go index 4f8578e..05cbc07 100644 --- a/internal/deezer/single.go +++ b/internal/deezer/single.go @@ -2,7 +2,7 @@ package deezer import ( "encoding/json" - "path" + "path/filepath" ) type Single struct { @@ -28,7 +28,7 @@ func (s *Single) Tracks() []*Track { func (s *Single) SetTracks(tracks []*Track) {} func (s *Single) OutputDir(outputDir string) string { - return path.Join(outputDir, "Singles") + return filepath.Join(outputDir, "Singles") } func (s *Single) decode(data []byte) error { diff --git a/internal/download/track.go b/internal/download/track.go index deba0de..1783c57 100644 --- a/internal/download/track.go +++ b/internal/download/track.go @@ -4,7 +4,7 @@ import ( "context" "errors" "fmt" - "path" + "path/filepath" "strings" "time" @@ -43,7 +43,7 @@ func (d *Downloader) downloadTrack(ctx context.Context, resource deezer.Resource defer cancel() fileName := track.Filename(d.kind, mediaFormat) - outputPath := path.Join(outputDir, fileName) + outputPath := filepath.Join(outputDir, fileName) key := deezer.BlowfishKey(track.ID) if err := d.streamToFile(dlCtx, stream, outputPath, key); err != nil { diff --git a/internal/store/store.go b/internal/store/store.go index 3f13208..8080bec 100644 --- a/internal/store/store.go +++ b/internal/store/store.go @@ -2,7 +2,7 @@ package store import ( "fmt" - "path" + "path/filepath" bolt "go.etcd.io/bbolt" ) @@ -12,7 +12,7 @@ type Store struct { } func Open(dir string) (*Store, error) { - db, err := bolt.Open(path.Join(dir, ".tracks.db"), 0600, nil) + db, err := bolt.Open(filepath.Join(dir, ".tracks.db"), 0600, nil) if err != nil { return nil, fmt.Errorf("failed to open database: %w", err) } diff --git a/internal/tag/tag.go b/internal/tag/tag.go index 517166a..bb3bd31 100644 --- a/internal/tag/tag.go +++ b/internal/tag/tag.go @@ -1,7 +1,7 @@ package tag import ( - "path" + "path/filepath" "github.com/bogem/id3v2/v2" "github.com/go-flac/flacvorbis/v2" @@ -39,7 +39,7 @@ type tagger interface { } func newTagger(filePath string) (tagger, error) { - if path.Ext(filePath) == ".mp3" { + if filepath.Ext(filePath) == ".mp3" { tag, err := id3v2.Open(filePath, id3v2.Options{Parse: true}) if err != nil { return nil, err