diff options
Diffstat (limited to 'config/config.go')
| -rw-r--r-- | config/config.go | 40 |
1 files changed, 5 insertions, 35 deletions
diff --git a/config/config.go b/config/config.go index 3a5920c..5f0e1fd 100644 --- a/config/config.go +++ b/config/config.go @@ -10,19 +10,14 @@ import ( "path" "strings" + "ricketyspace.net/fern/feed" "ricketyspace.net/fern/file" ) -type Feed struct { - Id string `json:"id"` - Source string `json:"source"` - Schema string `json:"schema"` -} - type FernConfig struct { - YDLPath string `json:"ydl-path"` - DumpDir string `json:"dump-dir"` - Feeds []Feed `json:"feeds"` + YDLPath string `json:"ydl-path"` + DumpDir string `json:"dump-dir"` + Feeds []feed.Feed `json:"feeds"` } func Read() (*FernConfig, error) { @@ -92,7 +87,7 @@ func (config *FernConfig) validate() error { return fmt.Errorf("'feeds' not set in config") } for _, feed := range config.Feeds { - err = feed.validate() + err = feed.Validate(config.DumpDir) if err != nil { return err } @@ -100,28 +95,3 @@ func (config *FernConfig) validate() error { return nil } - -func (feed *Feed) validate() error { - // Check 'id' - if len(feed.Id) == 0 { - return fmt.Errorf("'id' not set in a feed") - } - - // Check 'source' - if len(feed.Source) == 0 { - return fmt.Errorf("'source' not set in a feed '%s'", feed.Id) - } - - // Check 'schema' - schemaOK := false - for _, schema := range []string{"npr", "youtube"} { - if feed.Schema == schema { - schemaOK = true - } - } - if !schemaOK { - return fmt.Errorf("schema '%s' for feed '%s' is not valid", - feed.Schema, feed.Id) - } - return nil -} |