diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..b2f22bb Binary files /dev/null and b/.DS_Store differ diff --git a/cmd/main.go b/cmd/main.go index cd85b4e..9bdf51c 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -2,6 +2,7 @@ package main import ( "bytes" + "fmt" "io" "io/ioutil" "log" @@ -59,7 +60,7 @@ func dedupe(config *config) error { var base pttodo.Root if err := yaml.Unmarshal(baseB, &base); err != nil { - return err + return fmt.Errorf("failed to parse yaml in %s: %w", config.target, err) } do := func(todos []pttodo.Todo) []pttodo.Todo { @@ -120,10 +121,10 @@ func archive(config *config) error { var base, archive pttodo.Root if err := yaml.Unmarshal(baseB, &base); err != nil { - return err + return fmt.Errorf("failed to parse yaml in %s: %w", config.target, err) } if err := yaml.Unmarshal(archiveB, &archive); err != nil { - return err + return fmt.Errorf("failed to parse yaml in %s: %w", config.archive, err) } archive.Done = append(archive.Done, base.Done...) @@ -174,10 +175,10 @@ func merge(config *config) error { var base, merging pttodo.Root if err := yaml.Unmarshal(baseB, &base); err != nil { - return err + return fmt.Errorf("failed to parse yaml in %s: %w", config.target, err) } if err := yaml.Unmarshal(mergingB, &merging); err != nil { - return err + return fmt.Errorf("failed to parse yaml in %s: %w", config.target2, err) } slurp := func(dst, src *[]pttodo.Todo) { @@ -242,10 +243,10 @@ func _merge(filepath string, mergeTargetFilePath string) error { var base, merging pttodo.Root if err := yaml.Unmarshal(baseB, &base); err != nil { - return err + return fmt.Errorf("failed to parse yaml in %s: %w", filepath, err) } if err := yaml.Unmarshal(mergingB, &merging); err != nil { - return err + return fmt.Errorf("failed to parse yaml in %s: %w", mergeTargetFilePath, err) } base.MergeIn(merging) diff --git a/pttodoer/.DS_Store b/pttodoer/.DS_Store new file mode 100644 index 0000000..f3e4dde Binary files /dev/null and b/pttodoer/.DS_Store differ