From 6eddfc2daeaa92667e26a93e61f91ee4aa77e834 Mon Sep 17 00:00:00 2001 From: Nick Dumas Date: Fri, 28 Apr 2023 17:17:38 -0400 Subject: [PATCH] Whoops, wrong interpolation variable --- attachments.go | 16 ++++++++++------ cmd/attachments/main.go | 3 +++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/attachments.go b/attachments.go index d58f9bd..fda483f 100644 --- a/attachments.go +++ b/attachments.go @@ -24,7 +24,7 @@ func NewAttachmentMover() *AttachmentMover { type AttachmentMover struct { Source, Target string - Attachments map[string]bool + Attachments map[string]string Notes, Posts []string L *zap.Logger BlogDir, AttachmentsDir string @@ -36,17 +36,17 @@ func (am *AttachmentMover) Walk() error { err := fs.WalkDir(notesRoot, ".", am.findAttachments) if err != nil { - return fmt.Errorf("error scanning for attachments: %q", err) + return fmt.Errorf("error scanning for attachments: %w", err) } err = fs.WalkDir(notesRoot, ".", am.findNotes) if err != nil { - return fmt.Errorf("error scanning vault for posts: %q", err) + return fmt.Errorf("error scanning vault for posts: %w", err) } err = fs.WalkDir(blogRoot, ".", am.findPosts) if err != nil { - return fmt.Errorf("error scanning blog for posts: %q", err) + return fmt.Errorf("error scanning blog for posts: %w", err) } return nil } @@ -80,7 +80,11 @@ func (am *AttachmentMover) findAttachments(path string, d fs.DirEntry, err error if strings.Contains(path, am.AttachmentsDir) { walkLogger.Info("found attachment file, adding to index") - am.Attachments[path] = true + absPath, err := filepath.Abs(filepath.Join(am.Source, path)) + if err != nil { + return fmt.Errorf("error generating absolute path for attachment %q: %w", err) + } + am.Attachments[filename] = absPath } return nil } @@ -139,7 +143,7 @@ func extractAttachments(post string, l *zap.Logger) ([]string, error) { attachments := make([]string, 0) postBody, err := ioutil.ReadFile(post) if err != nil { - return attachments, fmt.Errorf("error opening post to scan for attachment links: %q", err) + return attachments, fmt.Errorf("error opening post to scan for attachment links: %w", err) } for _, att := range pat.FindAllSubmatch(postBody, -1) { diff --git a/cmd/attachments/main.go b/cmd/attachments/main.go index b811a3f..504f565 100644 --- a/cmd/attachments/main.go +++ b/cmd/attachments/main.go @@ -2,6 +2,7 @@ package main import ( "flag" + "fmt" "go.uber.org/zap" @@ -42,4 +43,6 @@ func main() { if err != nil { am.L.Fatal("error moving notes", zap.Error(err)) } + + fmt.Printf("%#+v\n", am.Attachments) }