From 75278be9b54e96d69668214de968a4517f4ab6e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Sun, 21 Feb 2021 14:18:14 +0100 Subject: Slight restructuring --- internal/feed/feed.go | 12 ++++++++++++ internal/feed/state.go | 13 ++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) (limited to 'internal') diff --git a/internal/feed/feed.go b/internal/feed/feed.go index 4e84443..de28ef8 100644 --- a/internal/feed/feed.go +++ b/internal/feed/feed.go @@ -1,6 +1,7 @@ package feed import ( + "fmt" "strings" "time" @@ -58,3 +59,14 @@ func (feed *Feed) MarkSuccess() { feed.cached.Commit() } } + +func Create(parsedFeed *config.Feed, global config.GlobalOptions) (*Feed, error) { + var itemFilter *filter.Filter + var err error + if parsedFeed.ItemFilter != "" { + if itemFilter, err = filter.New(parsedFeed.ItemFilter); err != nil { + return nil, fmt.Errorf("Feed %s: Parsing item-filter: %w", parsedFeed.Name, err) + } + } + return &Feed{Feed: parsedFeed, Global: global, filter: itemFilter}, nil +} diff --git a/internal/feed/state.go b/internal/feed/state.go index 41d8751..364616f 100644 --- a/internal/feed/state.go +++ b/internal/feed/state.go @@ -2,12 +2,10 @@ package feed import ( "encoding/json" - "fmt" "sync" "github.com/mmcdole/gofeed" - "github.com/Necoro/feed2imap-go/internal/feed/filter" "github.com/Necoro/feed2imap-go/pkg/config" "github.com/Necoro/feed2imap-go/pkg/log" ) @@ -163,14 +161,11 @@ func NewState(cfg *config.Config) (*State, error) { } for name, parsedFeed := range cfg.Feeds { - var itemFilter *filter.Filter - var err error - if parsedFeed.ItemFilter != "" { - if itemFilter, err = filter.New(parsedFeed.ItemFilter); err != nil { - return nil, fmt.Errorf("Feed %s: Parsing item-filter: %w", parsedFeed.Name, err) - } + feed, err := Create(parsedFeed, cfg.GlobalOptions) + if err != nil { + return nil, err } - state.feeds[name] = &Feed{Feed: parsedFeed, Global: cfg.GlobalOptions, filter: itemFilter} + state.feeds[name] = feed } return &state, nil -- cgit v1.2.3