aboutsummaryrefslogtreecommitdiff
path: root/internal/config
diff options
context:
space:
mode:
Diffstat (limited to 'internal/config')
-rw-r--r--internal/config/config.go63
-rw-r--r--internal/config/yaml.go96
-rw-r--r--internal/config/yaml_test.go255
3 files changed, 1 insertions, 413 deletions
diff --git a/internal/config/config.go b/internal/config/config.go
index fa14315..0cebf34 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -1,73 +1,12 @@
package config
-import (
- "fmt"
- "io/ioutil"
- "strings"
-)
-
type Map map[string]interface{}
-type Feeds map[string]*Feed
-
-func (f Feeds) String() string {
- var b strings.Builder
- app := func(a ...interface{}) {
- _, _ = fmt.Fprint(&b, a...)
- }
- app("Feeds [")
-
- first := true
- for k, v := range f {
- if !first {
- app(", ")
- }
- app(`"`, k, `"`, ": ")
- if v == nil {
- app("<nil>")
- } else {
- _, _ = fmt.Fprintf(&b, "%+v", *v)
- }
- first = false
- }
- app("]")
-
- return b.String()
-}
type Config struct {
GlobalConfig Map
- Feeds Feeds
}
-type Feed struct {
- Name string
- Target []string `yaml:"-"`
- Url string
+type Options struct {
MinFreq int `yaml:"min-frequency"`
InclImages *bool `yaml:"include-images"`
}
-
-func Load(path string) (Config, error) {
- var finishedCfg Config
-
- buf, err := ioutil.ReadFile(path)
- if err != nil {
- return finishedCfg, fmt.Errorf("while reading '%s': %w", path, err)
- }
-
- var parsedCfg config
- if parsedCfg, err = parse(buf); err != nil {
- return finishedCfg, err
- }
-
- finishedCfg = Config{
- GlobalConfig: parsedCfg.GlobalConfig,
- Feeds: make(Feeds),
- }
-
- if err := buildFeeds(parsedCfg.Feeds, []string{}, finishedCfg.Feeds); err != nil {
- return finishedCfg, fmt.Errorf("while parsing: %w", err)
- }
-
- return finishedCfg, nil
-}
diff --git a/internal/config/yaml.go b/internal/config/yaml.go
deleted file mode 100644
index 80fb383..0000000
--- a/internal/config/yaml.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package config
-
-import (
- "fmt"
-
- "gopkg.in/yaml.v3"
-)
-
-type config struct {
- GlobalConfig Map `yaml:",inline"`
- Feeds []configGroupFeed
-}
-
-type Group struct {
- Group string
- Feeds []configGroupFeed
-}
-
-type configGroupFeed struct {
- Target *string
- Feed `yaml:",inline"`
- Group `yaml:",inline"`
-}
-
-func (grpFeed *configGroupFeed) isGroup() bool {
- return grpFeed.Group.Group != ""
-}
-
-func (grpFeed *configGroupFeed) isFeed() bool {
- return grpFeed.Feed.Name != "" || grpFeed.Feed.Url != ""
-}
-
-func (grpFeed *configGroupFeed) target() string {
- if grpFeed.Target != nil {
- return *grpFeed.Target
- }
- if grpFeed.Name != "" {
- return grpFeed.Name
- }
-
- return grpFeed.Group.Group
-}
-
-func parse(buf []byte) (config, error) {
- var parsedCfg config
- if err := yaml.Unmarshal(buf, &parsedCfg); err != nil {
- return parsedCfg, fmt.Errorf("while unmarshalling: %w", err)
- }
- //fmt.Printf("--- parsedCfg:\n%+v\n\n", parsedCfg)
-
- return parsedCfg, nil
-}
-
-func appTarget(target []string, app string) []string {
- switch {
- case len(target) == 0 && app == "":
- return []string{}
- case len(target) == 0:
- return []string{app}
- case app == "":
- return target
- default:
- return append(target, app)
- }
-}
-
-// Parse the group structure and populate the `Target` fields in the feeds
-func buildFeeds(cfg []configGroupFeed, target []string, feeds Feeds) error {
- for idx := range cfg {
- f := &cfg[idx] // cannot use `_, f := range cfg` as it returns copies(!), but we need the originals
- target := appTarget(target, f.target())
- switch {
- case f.isFeed() && f.isGroup():
- return fmt.Errorf("Entry with Target %s is both a Feed and a group", target)
-
- case f.isFeed():
- name := f.Feed.Name
- if name == "" {
- return fmt.Errorf("Unnamed feed")
- }
-
- if _, ok := feeds[name]; ok {
- return fmt.Errorf("Duplicate Feed Name '%s'", name)
- }
- f.Feed.Target = target
- feeds[name] = &f.Feed
-
- case f.isGroup():
- if err := buildFeeds(f.Group.Feeds, target, feeds); err != nil {
- return err
- }
- }
- }
-
- return nil
-}
diff --git a/internal/config/yaml_test.go b/internal/config/yaml_test.go
deleted file mode 100644
index 1e77700..0000000
--- a/internal/config/yaml_test.go
+++ /dev/null
@@ -1,255 +0,0 @@
-package config
-
-import (
- "reflect"
- "strings"
- "testing"
-)
-
-func s(s string) *string { return &s }
-func b(b bool) *bool { return &b }
-func t(s string) []string {
- if s == "" {
- return []string{}
- }
- return strings.Split(s, ".")
-}
-
-func TestBuildFeeds(tst *testing.T) {
- tests := []struct {
- name string
- wantErr bool
- target string
- feeds []configGroupFeed
- result Feeds
- }{
- {name: "Empty input", wantErr: false, target: "", feeds: nil, result: Feeds{}},
- {name: "Empty Feed", wantErr: true, target: "",
- feeds: []configGroupFeed{
- {Target: s("foo"), Feed: Feed{Url: "google.de"}},
- }, result: Feeds{}},
- {name: "Empty Feed", wantErr: true, target: "",
- feeds: []configGroupFeed{
- {Target: nil, Feed: Feed{Url: "google.de"}},
- }, result: Feeds{}},
- {name: "Duplicate Feed Name", wantErr: true, target: "",
- feeds: []configGroupFeed{
- {Target: nil, Feed: Feed{Name: "Dup"}},
- {Target: nil, Feed: Feed{Name: "Dup"}},
- }, result: Feeds{}},
- {name: "Simple", wantErr: false, target: "",
- feeds: []configGroupFeed{
- {Target: s("foo"), Feed: Feed{Name: "muh"}},
- },
- result: Feeds{"muh": &Feed{Name: "muh", Target: t("foo")}},
- },
- {name: "Simple With Target", wantErr: false, target: "moep",
- feeds: []configGroupFeed{
- {Target: s("foo"), Feed: Feed{Name: "muh"}},
- },
- result: Feeds{"muh": &Feed{Name: "muh", Target: t("moep.foo")}},
- },
- {name: "Simple With Nil Target", wantErr: false, target: "moep",
- feeds: []configGroupFeed{
- {Target: nil, Feed: Feed{Name: "muh"}},
- },
- result: Feeds{"muh": &Feed{Name: "muh", Target: t("moep.muh")}},
- },
- {name: "Simple With Empty Target", wantErr: false, target: "moep",
- feeds: []configGroupFeed{
- {Target: s(""), Feed: Feed{Name: "muh"}},
- },
- result: Feeds{"muh": &Feed{Name: "muh", Target: t("moep")}},
- },
- {name: "Multiple Feeds", wantErr: false, target: "moep",
- feeds: []configGroupFeed{
- {Target: s("foo"), Feed: Feed{Name: "muh"}},
- {Target: nil, Feed: Feed{Name: "bar"}},
- },
- result: Feeds{
- "muh": &Feed{Name: "muh", Target: t("moep.foo")},
- "bar": &Feed{Name: "bar", Target: t("moep.bar")},
- },
- },
- {name: "Empty Group", wantErr: false, target: "",
- feeds: []configGroupFeed{
- {Target: nil, Group: Group{Group: "G1"}},
- },
- result: Feeds{},
- },
- {name: "Simple Group", wantErr: false, target: "",
- feeds: []configGroupFeed{
- {Target: nil, Group: Group{Group: "G1", Feeds: []configGroupFeed{
- {Target: s("bar"), Feed: Feed{Name: "F1"}},
- {Target: s(""), Feed: Feed{Name: "F2"}},
- {Target: nil, Feed: Feed{Name: "F3"}},
- }}},
- },
- result: Feeds{
- "F1": &Feed{Name: "F1", Target: t("G1.bar")},
- "F2": &Feed{Name: "F2", Target: t("G1")},
- "F3": &Feed{Name: "F3", Target: t("G1.F3")},
- },
- },
- {name: "Nested Groups", wantErr: false, target: "",
- feeds: []configGroupFeed{
- {Target: nil, Group: Group{Group: "G1", Feeds: []configGroupFeed{
- {Target: nil, Feed: Feed{Name: "F0"}},
- {Target: s("bar"), Group: Group{Group: "G2",
- Feeds: []configGroupFeed{{Target: nil, Feed: Feed{Name: "F1"}}}}},
- {Target: s(""), Group: Group{Group: "G3",
- Feeds: []configGroupFeed{{Target: s("baz"), Feed: Feed{Name: "F2"}}}}},
- {Target: nil, Group: Group{Group: "G4",
- Feeds: []configGroupFeed{{Target: nil, Feed: Feed{Name: "F3"}}}}},
- }}},
- },
- result: Feeds{
- "F0": &Feed{Name: "F0", Target: t("G1.F0")},
- "F1": &Feed{Name: "F1", Target: t("G1.bar.F1")},
- "F2": &Feed{Name: "F2", Target: t("G1.baz")},
- "F3": &Feed{Name: "F3", Target: t("G1.G4.F3")},
- },
- },
- }
- for _, tt := range tests {
- tst.Run(tt.name, func(tst *testing.T) {
- var feeds Feeds = Feeds{}
- err := buildFeeds(tt.feeds, t(tt.target), feeds)
- if (err != nil) != tt.wantErr {
- tst.Errorf("buildFeeds() error = %v, wantErr %v", err, tt.wantErr)
- return
- }
- if !tt.wantErr && !reflect.DeepEqual(feeds, tt.result) {
- tst.Errorf("buildFeeds() got = %v, want %v", feeds, tt.result)
- }
- })
- }
-}
-
-//noinspection GoNilness,GoNilness
-func TestParse(tst *testing.T) {
- tests := []struct {
- name string
- inp string
- wantErr bool
- feeds []configGroupFeed
- globalConfig Map
- }{
- {name: "Empty",
- inp: "", wantErr: false, feeds: nil, globalConfig: nil},
- {name: "Trash", inp: "Something", wantErr: true},
- {name: "Simple config",
- inp: "something: 1\nsomething_else: 2", wantErr: false, feeds: nil, globalConfig: Map{"something": 1, "something_else": 2}},
- {name: "Config with feed",
- inp: `
-something: 1
-feeds:
- - name: Foo
- url: whatever
- target: bar
- include-images: true
- unknown-option: foo
-`,
- wantErr: false,
- globalConfig: Map{"something": 1},
- feeds: []configGroupFeed{
- {Target: s("bar"), Feed: Feed{
- Name: "Foo",
- Target: nil,
- Url: "whatever",
- MinFreq: 0,
- InclImages: b(true),
- }}}},
-
- {name: "Feeds",
- inp: `
-feeds:
- - name: Foo
- url: whatever
- min-frequency: 2
- - name: Shrubbery
- url: google.de
- target: bla
- include-images: false
-`,
- wantErr: false,
- feeds: []configGroupFeed{
- {Target: nil, Feed: Feed{
- Name: "Foo",
- Url: "whatever",
- MinFreq: 2,
- InclImages: nil,
- }},
- {Target: s("bla"), Feed: Feed{
- Name: "Shrubbery",
- Url: "google.de",
- MinFreq: 0,
- InclImages: b(false),
- }},
- },
- },
- {name: "Empty Group",
- inp: `
-feeds:
- - group: Foo
- target: bla
-`,
- wantErr: false,
- feeds: []configGroupFeed{{Target: s("bla"), Group: Group{"Foo", nil}}},
- },
- {name: "Feeds and Groups",
- inp: `
-feeds:
- - name: Foo
- url: whatever
- - group: G1
- target: target
- feeds:
- - group: G2
- target: ""
- feeds:
- - name: F1
- url: google.de
- - name: F2
- - group: G3
-`,
- wantErr: false,
- feeds: []configGroupFeed{
- {Target: nil, Feed: Feed{
- Name: "Foo",
- Url: "whatever",
- }},
- {Target: s("target"), Group: Group{
- Group: "G1",
- Feeds: []configGroupFeed{
- {Target: s(""), Group: Group{
- Group: "G2",
- Feeds: []configGroupFeed{
- {Target: nil, Feed: Feed{Name: "F1", Url: "google.de"}},
- }},
- },
- {Target: nil, Feed: Feed{Name: "F2"}},
- {Target: nil, Group: Group{Group: "G3"}},
- }},
- },
- },
- },
- }
-
- for _, tt := range tests {
- tst.Run(tt.name, func(tst *testing.T) {
- var buf = []byte(tt.inp)
- got, err := parse(buf)
- if (err != nil) != tt.wantErr {
- tst.Errorf("parse() error = %v, wantErr %v", err, tt.wantErr)
- return
- }
- if !reflect.DeepEqual(got.Feeds, tt.feeds) {
- tst.Errorf("parse() got = %v, want %v", got.Feeds, tt.feeds)
- }
- if !reflect.DeepEqual(got.GlobalConfig, tt.globalConfig) {
- tst.Errorf("parse() got = %v, want %v", got.GlobalConfig, tt.globalConfig)
- }
- })
- }
-}
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-01 19:35:44 +0000