From 9990266256b8859b3d500ff0fc0fcee6e1e64193 Mon Sep 17 00:00:00 2001
From: René 'Necoro' Neumann <necoro@necoro.eu>
Date: Fri, 1 May 2020 18:27:23 +0200
Subject: Reintroduce yaml-internal `feed`

---
 pkg/config/yaml.go | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'pkg/config/yaml.go')

diff --git a/pkg/config/yaml.go b/pkg/config/yaml.go
index 1afba0a..66f099a 100644
--- a/pkg/config/yaml.go
+++ b/pkg/config/yaml.go
@@ -29,9 +29,14 @@ type group struct {
 	Feeds []configGroupFeed
 }
 
+type feed struct {
+	Name string
+	Url  string
+}
+
 type configGroupFeed struct {
 	Target  yaml.Node
-	Feed    Feed  `yaml:",inline"`
+	Feed    feed  `yaml:",inline"`
 	Group   group `yaml:",inline"`
 	Options Map   `yaml:",inline"`
 }
@@ -187,7 +192,6 @@ func buildFeeds(cfg []configGroupFeed, target []string, feeds Feeds, globalFeedO
 			return fmt.Errorf("Entry with targetStr %s is both a Feed and a group", target)
 
 		case f.isFeed():
-			feedCopy := f.Feed
 			name := f.Feed.Name
 			if name == "" {
 				return fmt.Errorf("Unnamed feed")
@@ -204,9 +208,12 @@ func buildFeeds(cfg []configGroupFeed, target []string, feeds Feeds, globalFeedO
 				}
 			}
 
-			feedCopy.Options = opt
-			feedCopy.Target = target
-			feeds[name] = &feedCopy
+			feeds[name] = &Feed{
+				Name:    name,
+				Url:     f.Feed.Url,
+				Options: opt,
+				Target:  target,
+			}
 
 		case f.isGroup():
 			if err := buildFeeds(f.Group.Feeds, target, feeds, globalFeedOptions); err != nil {
-- 
cgit v1.2.3-54-g00ecf