From 431a8ddb0c18b0781cba1d01eda3645b361f1b94 Mon Sep 17 00:00:00 2001
From: René 'Necoro' Neumann <necoro@necoro.eu>
Date: Sun, 19 Apr 2020 23:46:08 +0200
Subject: Restructure

---
 internal/config/config.go | 63 +----------------------------------------------
 1 file changed, 1 insertion(+), 62 deletions(-)

(limited to 'internal/config/config.go')

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
-}
-- 
cgit v1.2.3-54-g00ecf