Merge pull request #6 from TLINDEN/dev

re-orgainzied code a little, using go templates instead format string

Makefile

@@ -17,7 +17,7 @@
 #
 # no need to modify anything below
 tool      = kleingebaeck
-VERSION   = $(shell grep VERSION main.go | head -1 | cut -d '"' -f2)
+VERSION   = $(shell grep VERSION config.go | head -1 | cut -d '"' -f2)
 archs     = darwin freebsd linux windows
 PREFIX    = /usr/local
 UID       = root

config.go

@@ -23,7 +23,7 @@ import (
 )
 
 const (
-	VERSION         string = "0.0.4"
+	VERSION         string = "0.0.5"
 	Baseuri         string = "https://www.kleinanzeigen.de"
 	Listuri         string = "/s-bestandsliste.html"
 	Defaultdir      string = "."

mkrel.sh

@@ -40,6 +40,11 @@ for D in $DIST; do
     os=${D/\/*/}
     arch=${D/*\//}
     binfile="releases/${tool}-${os}-${arch}-${version}"
+
+    if test "$os" = "windows"; then
+        binfile="${binfile}.exe"
+    fi
+    
     tardir="${tool}-${os}-${arch}-${version}"
     tarfile="releases/${tool}-${os}-${arch}-${version}.tar.gz"
     set -x

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)

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