feat: adding itunes provider, deprecating spotify

.gitignore

@@ -4,5 +4,3 @@ bin/*
 !bin/.keep
 
 music/
-
-venv/

Dockerfile

@@ -8,17 +8,14 @@ RUN apk update && apk add -U make
 RUN make build
 
 
-FROM python:3.12-alpine
+FROM alpine:3.20
 
 WORKDIR /app
 
 COPY --from=build /app/bin/audio-scraper /app/audio-scraper
-COPY ./scripts /app/scripts
 
 RUN apk update && \
-	apk add -U yt-dlp-core ffmpeg
-
-RUN pip install ytmusicapi eyed3
+	apk add -U yt-dlp ffmpeg
 
 EXPOSE 8080
 

cmd/main.go

@@ -9,15 +9,15 @@ import (
 
 	"github.com/gorilla/mux"
 
+	filesystemimpl "audio-scraper/internal/adapters/filesystem/impl"
+	itunesimpl "audio-scraper/internal/adapters/itunes/impl"
+	lrclibimpl "audio-scraper/internal/adapters/lrclib/impl"
+	storeimpl "audio-scraper/internal/adapters/store/impl"
+	youtubeimpl "audio-scraper/internal/adapters/youtube/impl"
 	"audio-scraper/internal/api"
 	"audio-scraper/internal/constants"
 	"audio-scraper/internal/logger"
 	"audio-scraper/internal/pool"
-	"audio-scraper/internal/providers/filesystem"
-	"audio-scraper/internal/providers/lrclib"
-	"audio-scraper/internal/providers/spotify"
-	"audio-scraper/internal/providers/store"
-	"audio-scraper/internal/providers/youtube"
 )
 
 func main() {
@@ -29,15 +29,11 @@ func main() {
 	}
 	log.Info("started server", "host", "0.0.0.0", "port", port)
 
-	sp, err := spotify.NewSpotifyProvider(os.Getenv("SPOTIFY_CLIENT_ID"), os.Getenv("SPOTIFY_CLIENT_SECRET"))
-	if err != nil {
-		log.Error("failed to initialize Spotify provider", "error", err)
-		return
-	}
-	st := store.NewStoreProvider(log)
-	yt := youtube.NewYTProvider()
-	lrc := lrclib.NewLrclibProvider()
-	fs, err := filesystem.NewFSProvider(os.Getenv("MUSIC_HOME"), lrc)
+	md := itunesimpl.New()
+	st := storeimpl.New(log)
+	yt := youtubeimpl.New()
+	lrc := lrclibimpl.New()
+	fs, err := filesystemimpl.New(os.Getenv("MUSIC_HOME"), lrc)
 	if err != nil {
 		log.Error("failed to initialize filesystem provider", "error", err)
 		return
@@ -54,10 +50,10 @@ func main() {
 		FS:  fs,
 	})
 	h := api.NewHandlers(&api.Deps{
-		Log:     log,
-		Spotify: sp,
-		Store:   st,
-		Queue:   q,
+		Log:      log,
+		Metadata: md,
+		Store:    st,
+		Queue:    q,
 	})
 	router := mux.NewRouter()
 	router.HandleFunc("/", h.HealthHandler).Methods("GET")

go.mod

@@ -7,8 +7,6 @@ require (
 	github.com/faiface/beep v1.1.0
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/mux v1.8.1
-	github.com/zmb3/spotify/v2 v2.4.3
-	golang.org/x/oauth2 v0.33.0
 )
 
 require (

internal/providers/filesystem/filesystem.go → internal/adapters/filesystem/impl/filesystem.go

@@ -1,4 +1,6 @@
-package filesystem
+// Package filesystemimpl implements the filesystem.Provider port: it writes
+// downloaded audio into a MUSIC_HOME/Artist/Album tree and tags the files.
+package filesystemimpl
 
 import (
 	"context"
@@ -14,27 +16,33 @@ import (
 
 	"github.com/bogem/id3v2/v2"
 
+	"audio-scraper/internal/adapters/filesystem"
+	"audio-scraper/internal/adapters/lrclib"
 	"audio-scraper/internal/logger"
 	"audio-scraper/internal/models"
-	"audio-scraper/internal/providers/lrclib"
 )
 
-type FSClient struct {
+// Client is the local-filesystem library provider.
+type Client struct {
 	musicHome string
-	lrc       *lrclib.LrclibClient
+	lrc       lrclib.Provider
 }
 
-func NewFSProvider(musicHome string, lrc *lrclib.LrclibClient) (*FSClient, error) {
+var _ filesystem.Provider = (*Client)(nil)
+
+// New returns a filesystem provider rooted at musicHome, using lrc to resolve
+// lyrics during tagging.
+func New(musicHome string, lrc lrclib.Provider) (*Client, error) {
 	if musicHome == "" {
 		return nil, errors.New("missing MUSIC_HOME")
 	}
-	return &FSClient{
+	return &Client{
 		musicHome: musicHome,
 		lrc:       lrc,
 	}, nil
 }
 
-func (f *FSClient) InitializePath(ctx context.Context, job *models.DownloadJob) (string, error) {
+func (f *Client) InitializePath(ctx context.Context, job *models.DownloadJob) (string, error) {
 	log := logger.From(ctx)
 	path := filepath.Join(
 		f.musicHome,
@@ -63,7 +71,7 @@ func (f *FSClient) InitializePath(ctx context.Context, job *models.DownloadJob)
 	return outputPath, nil
 }
 
-func (f *FSClient) TagFile(ctx context.Context, filePath string, job *models.DownloadJob) error {
+func (f *Client) TagFile(ctx context.Context, filePath string, job *models.DownloadJob) error {
 	log := logger.From(ctx)
 	tag, err := id3v2.Open(filePath, id3v2.Options{Parse: true})
 	if err != nil {

internal/adapters/filesystem/interface.go

@@ -0,0 +1,19 @@
+// Package filesystem defines the local library port: where downloaded audio is
+// placed on disk and how it is tagged. The concrete implementation lives in the
+// impl subpackage.
+package filesystem
+
+import (
+	"context"
+
+	"audio-scraper/internal/models"
+)
+
+// Provider manages on-disk placement and tagging of downloaded tracks.
+type Provider interface {
+	// InitializePath creates the destination directory tree and returns the
+	// output file path for the job.
+	InitializePath(ctx context.Context, job *models.DownloadJob) (string, error)
+	// TagFile writes ID3 metadata, cover art and lyrics to the file at filePath.
+	TagFile(ctx context.Context, filePath string, job *models.DownloadJob) error
+}

internal/adapters/filesystem/mocks/mock.go

@@ -0,0 +1,31 @@
+// Package filesystemmock provides a test double for filesystem.Provider.
+package filesystemmock
+
+import (
+	"context"
+
+	"audio-scraper/internal/adapters/filesystem"
+	"audio-scraper/internal/models"
+)
+
+// Mock implements filesystem.Provider; set the *Func fields to control behavior.
+type Mock struct {
+	InitializePathFunc func(ctx context.Context, job *models.DownloadJob) (string, error)
+	TagFileFunc        func(ctx context.Context, filePath string, job *models.DownloadJob) error
+}
+
+var _ filesystem.Provider = (*Mock)(nil)
+
+func (m *Mock) InitializePath(ctx context.Context, job *models.DownloadJob) (string, error) {
+	if m.InitializePathFunc != nil {
+		return m.InitializePathFunc(ctx, job)
+	}
+	return "", nil
+}
+
+func (m *Mock) TagFile(ctx context.Context, filePath string, job *models.DownloadJob) error {
+	if m.TagFileFunc != nil {
+		return m.TagFileFunc(ctx, filePath, job)
+	}
+	return nil
+}