From 44488aec2d7027913a5dff3830b3818ca7ee4c66 Mon Sep 17 00:00:00 2001
From: Bel LaPointe <153096461+breel-render@users.noreply.github.com>
Date: Tue, 14 Jan 2025 21:12:11 -0700
Subject: [PATCH] better err

---
 .DS_Store          | Bin 0 -> 6148 bytes
 cmd/main.go        |  15 ++++++++-------
 pttodoer/.DS_Store | Bin 0 -> 6148 bytes
 3 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 pttodoer/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b2f22bba88a9fe56ac22e715130c322f30dc9bc8
GIT binary patch
literal 6148
zcmeHKOG*SW5Up}%(ICPsT?X_5eS>z0d!a8NZHq2uNHaKsyIjBncoJ{mxqOwX5gW5`
zqli=u$*ZJ3Nk5n*MMS*bk1f%Ph#E9O7NsIGT{Rt<^AgA<$4H58X}7s+`%0p}I3;^;
zXrc%F5`EhLP1;Vf;j_p6OU-ASVjMPU5Zm*~>r))wF6w^cxBRC2wm+<SzPLgv7iYj3
za0Z+KXW&N|z@07994mV73^)VMzy||zJ_Izu&M+&MqXS(j0f6$1E&^R@35f}Yoncml
z1;QE%)KIn(gEbuU!TdVItf=9{R(!Cnd?;SHtd9JlxD$7Z-a7-%z?^}F4p(yjU*a!Q
zE%N6fK5_<}fq%vTFJm9q_$a$uzkHtDwE^uKO+@^%C=lqgM*s$Lj+_>w+Joru>kPA^
UWRdw24)ljWA;ddp;1?Kp2Y0eCkN^Mx

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..f3e4dde3d7d0ab4a2e9a1108aa84bd3b4d2eb9aa
GIT binary patch
literal 6148
zcmeHKOG*Pl5UtW61KDKhvO!nkCO2q9dxBg*$4FcxObE$BaM9QD0-noPAC*Z4+y#*;
z=zi7po0$jG-9<z^+b^a>6C!Fb1X+{;5%Zwy%!5Zj)*8>WTP>&ar*6F&DD)Ri^6nS3
zqet4(k`CVgYQMcX^sl>8+Ev%W-n`wuzn1pn?l@-gYs}{5ho@_<C=n721Ovf9Fc1u!
zgaMq{BF)$^=3pQg2nN0xko_TH2xiA>s9OgnZ2^FCjaGp!y@cc>$Lv@Q;eoKF0xgxj
z#b8T^J$YPqtcI3O?9B)JlfRl5)~BO>(s1Hz7;`WX4D=Z|x8+36|9kv0gH3)vC04;e
zF!0Y9;8B^E89vI-)}zmpvo>KoV2DUu6$JvlcL~5k_K{0<nm>t-xa?RBrHa@!9T*n@
MB_yU`-~<eO0{M0=nE(I)

literal 0
HcmV?d00001