aboutsummaryrefslogtreecommitdiff
path: root/pkg/config/yaml.go
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/config/yaml.go')
-rw-r--r--pkg/config/yaml.go11
1 files changed, 6 insertions, 5 deletions
diff --git a/pkg/config/yaml.go b/pkg/config/yaml.go
index 93f8c10..9711130 100644
--- a/pkg/config/yaml.go
+++ b/pkg/config/yaml.go
@@ -2,6 +2,7 @@ package config
import (
"fmt"
+ "io"
"reflect"
"strings"
@@ -62,24 +63,24 @@ func (grpFeed *configGroupFeed) target() string {
return grpFeed.Group.Group
}
-func unmarshal(buf []byte, cfg *Config) (config, error) {
+func unmarshal(in io.Reader, cfg *Config) (config, error) {
parsedCfg := config{Config: cfg}
- if err := yaml.Unmarshal(buf, &parsedCfg); err != nil {
+ d := yaml.NewDecoder(in)
+ if err := d.Decode(&parsedCfg); err != nil && err != io.EOF {
return config{}, err
}
- //fmt.Printf("--- parsedCfg:\n%+v\n\n", parsedCfg)
return parsedCfg, nil
}
-func (cfg *Config) parse(buf []byte) error {
+func (cfg *Config) parse(in io.Reader) error {
var (
err error
parsedCfg config
)
- if parsedCfg, err = unmarshal(buf, cfg); err != nil {
+ if parsedCfg, err = unmarshal(in, cfg); err != nil {
return fmt.Errorf("while unmarshalling: %w", err)
}
s='insertions'>+273 2020-05-13Publish docker images also at Docker Hub.René 'Necoro' Neumann3-4/+13 Closes #15. 2020-05-13Move app-data into /app in docker imagev0.3.1René 'Necoro' Neumann2-6/+7 2020-05-13Remove local names for docker images -- they are tried to push to docker.ioRené 'Necoro' Neumann1-2/+0 2020-05-12Release Workflow: Add docker loginRené 'Necoro' Neumann1-0/+7 2020-05-12Prepare v0.3.1René 'Necoro' Neumann2-2/+6 2020-05-12Docker SetupRené 'Necoro' Neumann4-31/+48 2020-05-12Fix README.md after mergeRené 'Necoro' Neumann1-2/+1 2020-05-12add docker stuffRuediger Küpper3-0/+44 2020-05-11Reorganize flag handlingRené 'Necoro' Neumann1-17/+30 2020-05-11Use stable version of gofeedRené 'Necoro' Neumann2-3/+3 2020-05-10Prepare release 0.3.0v0.3.0René 'Necoro' Neumann3-5/+6 2020-05-10Fixed linebreaks for Enclosures in text templateRené 'Necoro' Neumann1-5/+5 2020-05-10Upgrade html2textRené 'Necoro' Neumann2-5/+3 2020-05-10Switch to our own html2text fork for the time beingRené 'Necoro' Neumann3-5/+5 2020-05-10Text part in emailsRené 'Necoro' Neumann7-33/+115 2020-05-10Allow options on group level.René 'Necoro' Neumann3-5/+11 Closes #12. 2020-05-10Renamed feed template to html templateRené 'Necoro' Neumann2-2/+2 2020-05-10Release v0.2.0v0.2.0René 'Necoro' Neumann2-2/+6 2020-05-10Fix building cacheRené 'Necoro' Neumann1-1/+3 2020-05-10Update READMERené 'Necoro' Neumann1-5/+44 2020-05-10Ignore 'dist' folder and build productsRené 'Necoro' Neumann1-0/+2 2020-05-08Print item hashes in debug modeRené 'Necoro' Neumann1-1/+7 2020-05-07Improve html renderingRené 'Necoro' Neumann2-53/+32 2020-05-07Do not assume items to be new when their published date is newer than the ↵René 'Necoro' Neumann2-7/+1 last run 2020-05-07Updating some depsRené 'Necoro' Neumann2-2/+7 2020-05-07Better detection if a text starts with html or notRené 'Necoro' Neumann2-4/+13 2020-05-07go fmtRené 'Necoro' Neumann1-3/+2 2020-05-07Add header X-Feed2Imap-GUIDRené 'Necoro' Neumann3-1/+7 2020-05-07update changelogRené 'Necoro' Neumann1-0/+1 2020-05-07FixRené 'Necoro' Neumann1-1/+1 2020-05-07Unified publishedDate and updatedDate into one (just as the old feed2imap...)René 'Necoro' Neumann5-21/+32 2020-05-06Print version during startupRené 'Necoro' Neumann1-1/+1 2020-05-06Improve templateRené 'Necoro' Neumann3-20/+28 2020-05-05Fix pipelineRené 'Necoro' Neumann1-2/+5 2020-05-05Make changelog a part of the release pipeline (untested)René 'Necoro' Neumann2-0/+12