From 4d4577c9f82e67265c93c4a0882a65b68e6c0c53 Mon Sep 17 00:00:00 2001 From: Thomas von Dein Date: Mon, 18 Dec 2023 09:21:26 +0100 Subject: [PATCH] fix #4, use filepath.Join to create portable path's --- scrape.go | 3 ++- store.go | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scrape.go b/scrape.go index fb83b80..5facc46 100644 --- a/scrape.go +++ b/scrape.go @@ -23,6 +23,7 @@ import ( "io" "log/slog" "net/http" + "path/filepath" "strings" "sync" @@ -176,7 +177,7 @@ func ScrapeImages(dir string, ad *Ad) error { failure := make(chan string) for _, imguri := range ad.Images { - file := fmt.Sprintf("%s/%d.jpg", dir, img) + file := filepath.Join(dir, ad.Slug, fmt.Sprintf("%d.jpg", img)) go func() { defer wg.Done() err := Getimage(imguri, file) diff --git a/store.go b/store.go index 17c25c9..7c4806f 100644 --- a/store.go +++ b/store.go @@ -21,20 +21,21 @@ import ( "io" "log/slog" "os" + "path/filepath" "strings" tpl "text/template" ) func WriteAd(dir string, ad *Ad, template string) error { // prepare output dir - dir = dir + "/" + ad.Slug + dir = filepath.Join(dir, ad.Slug) err := Mkdir(dir) if err != nil { return err } // write ad file - listingfile := strings.Join([]string{dir, "Adlisting.txt"}, "/") + listingfile := filepath.Join(dir, "Adlisting.txt") f, err := os.Create(listingfile) if err != nil { return err