better err

master
Bel LaPointe 2025-01-14 21:12:11 -07:00
parent 45b2060083
commit 44488aec2d
3 changed files with 8 additions and 7 deletions

BIN
.DS_Store vendored Normal file

Binary file not shown.

View File

@ -2,6 +2,7 @@ package main
import ( import (
"bytes" "bytes"
"fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"log" "log"
@ -59,7 +60,7 @@ func dedupe(config *config) error {
var base pttodo.Root var base pttodo.Root
if err := yaml.Unmarshal(baseB, &base); err != nil { 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 { do := func(todos []pttodo.Todo) []pttodo.Todo {
@ -120,10 +121,10 @@ func archive(config *config) error {
var base, archive pttodo.Root var base, archive pttodo.Root
if err := yaml.Unmarshal(baseB, &base); err != nil { 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 { 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...) archive.Done = append(archive.Done, base.Done...)
@ -174,10 +175,10 @@ func merge(config *config) error {
var base, merging pttodo.Root var base, merging pttodo.Root
if err := yaml.Unmarshal(baseB, &base); err != nil { 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 { 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) { slurp := func(dst, src *[]pttodo.Todo) {
@ -242,10 +243,10 @@ func _merge(filepath string, mergeTargetFilePath string) error {
var base, merging pttodo.Root var base, merging pttodo.Root
if err := yaml.Unmarshal(baseB, &base); err != nil { 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 { 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) base.MergeIn(merging)

BIN
pttodoer/.DS_Store vendored Normal file

Binary file not shown.