Refactor feed package

cmd/podsync/updater.go

@@ -14,6 +14,7 @@ import (
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 
+	"github.com/mxpv/podsync/pkg/builder"
 	"github.com/mxpv/podsync/pkg/config"
 	"github.com/mxpv/podsync/pkg/db"
 	"github.com/mxpv/podsync/pkg/feed"
@@ -90,8 +91,18 @@ func (u *Updater) Update(ctx context.Context, feedConfig *config.Feed) error {
 
 // updateFeed pulls API for new episodes and saves them to database
 func (u *Updater) updateFeed(ctx context.Context, feedConfig *config.Feed) error {
+	info, err := builder.ParseURL(feedConfig.URL)
+	if err != nil {
+		return errors.Wrapf(err, "failed to parse URL: %s", feedConfig.URL)
+	}
+
+	keyProvider, ok := u.keys[info.Provider]
+	if !ok {
+		return errors.Errorf("key provider %q not loaded", info.Provider)
+	}
+
 	// Create an updater for this feed type
-	provider, err := feed.New(ctx, feedConfig, u.keys)
+	provider, err := builder.New(ctx, info.Provider, keyProvider.Get())
 	if err != nil {
 		return err
 	}

pkg/builder/builder.go

@@ -0,0 +1,25 @@
+package builder
+
+import (
+	"context"
+
+	"github.com/pkg/errors"
+
+	"github.com/mxpv/podsync/pkg/config"
+	"github.com/mxpv/podsync/pkg/model"
+)
+
+type Builder interface {
+	Build(ctx context.Context, cfg *config.Feed) (*model.Feed, error)
+}
+
+func New(ctx context.Context, provider model.Provider, key string) (Builder, error) {
+	switch provider {
+	case model.ProviderYoutube:
+		return NewYouTubeBuilder(key)
+	case model.ProviderVimeo:
+		return NewVimeoBuilder(ctx, key)
+	default:
+		return nil, errors.Errorf("unsupported provider %q", provider)
+	}
+}

pkg/feed/url.go → pkg/builder/url.go

@@ -1,4 +1,4 @@
-package feed
+package builder
 
 import (
 	"net/url"

pkg/feed/url_test.go → pkg/builder/url_test.go

@@ -1,4 +1,4 @@
-package feed
+package builder
 
 import (
 	"net/url"

pkg/feed/vimeo.go → pkg/builder/vimeo.go

@@ -1,4 +1,4 @@
-package feed
+package builder
 
 import (
 	"net/http"

pkg/feed/vimeo_test.go → pkg/builder/vimeo_test.go

@@ -1,4 +1,4 @@
-package feed
+package builder
 
 import (
 	"context"

pkg/feed/youtube.go → pkg/builder/youtube.go

@@ -1,4 +1,4 @@
-package feed
+package builder
 
 import (
 	"context"

pkg/feed/youtube_test.go → pkg/builder/youtube_test.go

@@ -1,4 +1,4 @@
-package feed
+package builder
 
 import (
 	"context"

pkg/feed/deps.go

@@ -0,0 +1,17 @@
+//go:generate mockgen -source=deps.go -destination=deps_mock_test.go -package=feed
+
+package feed
+
+import (
+	"context"
+
+	"github.com/mxpv/podsync/pkg/model"
+)
+
+type feedProvider interface {
+	GetFeed(ctx context.Context, feedID string) (*model.Feed, error)
+}
+
+type urlProvider interface {
+	URL(ctx context.Context, ns string, fileName string) (string, error)
+}

pkg/feed/opml_test.go

@@ -1,5 +1,3 @@
-//go:generate mockgen -source=common.go -destination=common_mock_test.go -package=feed
-
 package feed
 
 import (