fix invalid mod load (#14)

Co-authored-by: Thomas von Dein <tom@vondein.org>

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
@@ -86,3 +86,6 @@ show-versions: buildlocal
 	@echo
 	@echo "### go version used for building:"
 	@grep -m 1 go go.mod
+
+lint:
+	golangci-lint run -p bugs -p unused

README.md

@@ -1,24 +1,155 @@
-## kleinanzeigen.de Backup
+## Kleingebäck - kleinanzeigen.de Backup
+
+![Kleingebaeck Logo](https://github.com/TLINDEN/kleingebaeck/blob/main/.github/assets/kleingebaecklogo-small.png)
 
 [![License](https://img.shields.io/badge/license-GPL-blue.svg)](https://github.com/tlinden/kleingebaeck/blob/master/LICENSE)
 [![Go Report Card](https://goreportcard.com/badge/github.com/tlinden/kleingebaeck)](https://goreportcard.com/report/github.com/tlinden/kleingebaeck) 
+![GitHub License](https://img.shields.io/github/license/tlinden/kleingebaeck)
+[![GitHub release](https://img.shields.io/github/v/release/tlinden/kleingebaeck?color=%2300a719)](https://github.com/TLINDEN/kleingebaeck/releases/latest)
 
-Mit    diesem   kleinen    aber   feinen    Tool   kann    man   seine
-[https://kleinanzeigen.de](Anzeigen bei kleinanzeigen.de) sichern. Das
-Problem ist  ja bekanntlich,  dass Kleinanzeigen  nach einer  Weile (2
-Monate?) automatisch  gelöscht werden.  Wenn man  keine Sicherung hat,
-wird es schwierig,  die erneut einzustellen. Mit dem  Tool braucht man
-sich  keine  Texte  zu  merken.   Man  kann  auch  einfach  Änderungen
-(z.B. Preis  runter) durchführen oder  den Text anpassen und  dann ein
-neues Backup anfertigen.
 
-Es  wird  pro   Anzeige  ein  Verzeichnis  erstellt.    In  der  Datei
+This tool can be used to backup ads on the german ad page https://kleinanzeigen.de
-`Anzeige.txt`  wird  der  Titel,  die  Beschreibung  sowie  der  Preis
-eingetragen. Ausserdem werden alle Bilder heruntergeladen.
 
-## Copyright und Lizenz
+It downloads all (or  only the specified ones) ads of  one user into a
+directory, each ad into its own subdirectory. The backup will contain
+a textfile `Adlisting.txt` which contains the ad contents as the
+title, body, price etc. All images will be downloaded as well.
 
-Lizensiert unter der GNU GENERAL PUBLIC LICENSE version 3.
+## Installation
+
+The   tool  doesn't   need   authentication  and   doesn't  have   any
+dependencies.  Just  download the  binary for  your platform  from the
+releases page and you're good to go.
+
+### Installation using a pre-compiled binary
+
+Go            to             the            [latest            release
+page](https://github.com/TLINDEN/kleingebaeck/releases/latest)     and
+look for your OS and platform. There are two options to install the binary:
+
+1.    Directly   download    the    binary    for   your    platoform,
+   e.g. `kleingebaeck-linux-amd64-0.0.5`, rename  it to `kleingebaeck`
+   (or  whatever  you  like  more!)  and put  it  into  your  bin  dir
+   (e.g. `$HOME/bin` or as root to `/usr/local/bin`).
+
+Be sure to verify the signature of the binary file. For this also download the matching `kleingebaeck-linux-amd64-0.0.5.sha256` file and:
+
+```shell
+cat kleingebaeck-linux-amd64-0.0.5.sha25 && sha256sum kleingebaeck-linux-amd64-0.0.5
+```
+You should see the same SHA256 hash.
+
+2.  You  may  also  download  a  binary  tarball  for  your  platform,
+   e.g.  `kleingebaeck-linux-amd64-0.0.5.tar.gz`,  unpack and  install
+   it. GNU Make is required for this:
+   
+```shell
+tar xvfz kleingebaeck-linux-amd64-0.0.5.tar.gz
+cd kleingebaeck-linux-amd64-0.0.5
+sudo make install
+```
+
+### Installation from source
+
+You will need the Golang toolchain  in order to build from source. GNU
+Make will also help but is not strictly neccessary.
+
+If you want to compile the tool yourself, use `git clone` to clone the
+repository.   Then   execute   `go    mod   tidy`   to   install   all
+dependencies. Then  just enter `go  build` or -  if you have  GNU Make
+installed - `make`.
+
+To install after building either copy the binary or execute `sudo make install`.
+
+## Commandline options:
+
+```
+Usage: kleingebaeck [-dvVhmoc] [<ad-listing-url>,...]
+Options:
+--user    -u <uid>      Backup ads from user with uid <uid>.
+--debug   -d            Enable debug output.
+--verbose -v            Enable verbose output.
+--outdir  -o <dir>      Set output dir (default: current directory)
+--limit   -l <num>      Limit the ads to download to <num>, default: load all.
+--config  -c <file>     Use config file <file> (default: ~/.kleingebaeck).
+--manual  -m            Show manual.
+--help    -h            Show usage.
+
+If one  or more <ad-listing-url>'s  are specified, only  backup those,
+otherwise backup all ads of the given user.
+```
+
+## Configfile
+
+You can create a config file to save typing. By default
+`~/.kleingebaeck` is being used but you can specify one with
+`-c` as well.
+
+Format is simple:
+
+```
+user = 1010101
+loglevel = verbose
+outdir = "test"
+```
+
+## Usage
+
+To setup the tool, you need to lookup your userid on
+kleinanzeigen.de. Go to your ad overview page while NOT being logged
+in:
+
+https://www.kleinanzeigen.de/s-bestandsliste.html?userId=XXXXXX
+
+The `XXXXX` part is your userid.
+
+Put it into the configfile as outlined above. Also specify an output
+directory. Then just execute `kleingebaeck`.
+
+Inside the output directory you'll find a new subdirectory for each
+ad. Every directory contains a file `Adlisting.txt`, which will look
+somewhat like this:
+
+```default
+Title: A book I sell
+Price: 99 € VB
+Id: 1919191919
+Category: Sachbücher
+Condition: Sehr Gut
+Created: 10.12.2023
+
+This is the description text.
+
+Pay with paypal.
+```
+
+You can change the formatting using the `template` config
+variable. The supplied sample config contains the default template.
+
+All images will be stored in the same directory.
+
+## Kleingebäck?
+
+The name is derived from "kleinanzeigen backup": "klein" (german for
+small) and "back". In german "bäck" is spelled the same as the english
+"back" so "kleinbäck" was short enough, but it's not a valid german
+word. "Kleingebäck" however is: it means "Cookies" in english :)
+
+## Getting help
+
+Although I'm happy  to hear from kleingebaeck users  in private email,
+that's the best way for me to forget to do something.
+
+In order to report a bug,  unexpected behavior, feature requests or to
+submit    a    patch,    please    open   an    issue    on    github:
+https://github.com/TLINDEN/kleingebaeck/issues.
+
+Please repeat the failing command with debugging enabled `-d` and
+include the output in the issue.
+
+## Copyright und License
+
+Licensed under the GNU GENERAL PUBLIC LICENSE version 3.
 
 ## Author
 

config.go

@@ -0,0 +1,178 @@
+/*
+Copyright © 2023 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+package main
+
+import (
+	"errors"
+	"fmt"
+	"os"
+	"path/filepath"
+	"runtime"
+
+	"github.com/knadh/koanf/parsers/toml"
+	"github.com/knadh/koanf/providers/confmap"
+	"github.com/knadh/koanf/providers/file"
+	"github.com/knadh/koanf/providers/posflag"
+	"github.com/knadh/koanf/v2"
+	flag "github.com/spf13/pflag"
+)
+
+const (
+	VERSION         string = "0.1.0"
+	Baseuri         string = "https://www.kleinanzeigen.de"
+	Listuri         string = "/s-bestandsliste.html"
+	Defaultdir      string = "."
+	DefaultTemplate string = "Title: {{.Title}}\nPrice: {{.Price}}\nId: {{.Id}}\n" +
+		"Category: {{.Category}}\nCondition: {{.Condition}}\nCreated: {{.Created}}\n\n{{.Text}}\n"
+	DefaultTemplateWin string = "Title: {{.Title}}\r\nPrice: {{.Price}}\r\nId: {{.Id}}\r\n" +
+		"Category: {{.Category}}\r\nCondition: {{.Condition}}\r\nCreated: {{.Created}}\r\n\r\n{{.Text}}\r\n"
+	Useragent string = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " +
+		"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+)
+
+const Usage string = `This is kleingebaeck, the kleinanzeigen.de backup tool.
+
+Usage: kleingebaeck [-dvVhmoclu] [<ad-listing-url>,...]
+
+Options:
+--user    -u <uid>      Backup ads from user with uid <uid>.
+--debug   -d            Enable debug output.
+--verbose -v            Enable verbose output.
+--outdir  -o <dir>      Set output dir (default: current directory)
+--limit   -l <num>      Limit the ads to download to <num>, default: load all.
+--config  -c <file>     Use config file <file> (default: ~/.kleingebaeck).
+--manual  -m            Show manual.
+--help    -h            Show usage.
+--version -V            Show program version.
+
+If one  or more ad listing url's  are specified, only  backup those,
+otherwise backup all ads of the given user.`
+
+type Config struct {
+	Verbose          bool   `koanf:"verbose"` // loglevel=info
+	Debug            bool   `koanf:"debug"`   // loglevel=debug
+	Showversion      bool   `koanf:"version"` // -v
+	Showhelp         bool   `koanf:"help"`    // -h
+	Showmanual       bool   `koanf:"manual"`  // -m
+	User             int    `koanf:"user"`
+	Outdir           string `koanf:"outdir"`
+	Template         string `koanf:"template"`
+	Loglevel         string `koanf:"loglevel"`
+	Limit            int    `koanf:"limit"`
+	Adlinks          []string
+	StatsCountAds    int
+	StatsCountImages int
+}
+
+func (c *Config) IncrAds() {
+	c.StatsCountAds++
+}
+
+func (c *Config) IncrImgs(num int) {
+	c.StatsCountImages += num
+}
+
+// load commandline flags and config file
+func InitConfig() (*Config, error) {
+	var k = koanf.New(".")
+
+	// determine template based on os
+	template := DefaultTemplate
+	if runtime.GOOS == "windows" {
+		template = DefaultTemplateWin
+	}
+
+	// Load default values using the confmap provider.
+	k.Load(confmap.Provider(map[string]interface{}{
+		"template": template,
+		"outdir":   ".",
+		"loglevel": "notice",
+		"userid":   0,
+	}, "."), nil)
+
+	// setup custom usage
+	f := flag.NewFlagSet("config", flag.ContinueOnError)
+	f.Usage = func() {
+		fmt.Println(Usage)
+		os.Exit(0)
+	}
+
+	// parse commandline flags
+	f.StringP("config", "c", "", "config file")
+	f.StringP("outdir", "o", "", "directory where to store ads")
+	f.IntP("user", "u", 0, "user id")
+	f.IntP("limit", "l", 0, "limit ads to be downloaded (default 0, unlimited)")
+	f.BoolP("verbose", "v", false, "be verbose")
+	f.BoolP("debug", "d", false, "enable debug log")
+	f.BoolP("version", "V", false, "show program version")
+	f.BoolP("help", "h", false, "show usage")
+	f.BoolP("manual", "m", false, "show manual")
+
+	f.Parse(os.Args[1:])
+
+	// generate a  list of config files to try  to load, including the
+	// one provided via -c, if any
+	var configfiles []string
+	configfile, _ := f.GetString("config")
+	home, _ := os.UserHomeDir()
+	if configfile != "" {
+		configfiles = []string{configfile}
+	} else {
+		configfiles = []string{
+			"/etc/kleingebaeck.conf", "/usr/local/etc/kleingebaeck.conf", // unix variants
+			filepath.Join(home, ".config", "kleingebaeck", "config"),
+			filepath.Join(home, ".kleingebaeck"),
+			"kleingebaeck.conf",
+		}
+	}
+
+	// Load the config file[s]
+	for _, cfgfile := range configfiles {
+		if path, err := os.Stat(cfgfile); !os.IsNotExist(err) {
+			if !path.IsDir() {
+				if err := k.Load(file.Provider(cfgfile), toml.Parser()); err != nil {
+					return nil, errors.New("error loading config file: " + err.Error())
+				}
+			}
+		}
+		// else: we ignore the file if it doesn't exists
+	}
+
+	// command line overrides config file
+	if err := k.Load(posflag.Provider(f, ".", k), nil); err != nil {
+		return nil, errors.New("error loading flags: " + err.Error())
+	}
+
+	// fetch values
+	conf := &Config{}
+	if err := k.Unmarshal("", &conf); err != nil {
+		return nil, errors.New("error unmarshalling: " + err.Error())
+	}
+
+	// adjust loglevel
+	switch conf.Loglevel {
+	case "verbose":
+		conf.Verbose = true
+	case "debug":
+		conf.Debug = true
+	}
+
+	// are there any args left on commandline? if so threat them as adlinks
+	conf.Adlinks = f.Args()
+
+	return conf, nil
+}

example.conf

@@ -0,0 +1,30 @@
+#
+# kleingebaeck sample configuration file.
+# put this to ~/.kleingebaeck.
+#
+# Comments start with the '#' character.
+
+# kleinanzeigen.de user-id. must be an unquoted number
+user = 00000000
+
+# enable verbose output (same as -v), may be true or false.
+# other values: notice or debug
+loglevel = "verbose"
+
+# directory where  to store downloaded  ads. kleingebaeck will  try to
+# create it. must be a quoted string.
+outdir = "test"
+
+# template for  stored adlistings.  To enable  it, remove  the comment
+# chars up until the last #"""
+#template="""
+#Title: {{.Title}}
+#Price: {{.Price}}
+#Id: {{.Id}}
+#Category: {{.Category}}
+#Condition: {{.Condition}}
+#Created: {{.Created}}
+
+#{{.Text}}
+# """
+

go.mod

@@ -1,12 +1,30 @@
 module kleingebaeck
 
-go 1.20
+go 1.21
+
+require (
+	astuart.co/goq v1.0.0
+	github.com/knadh/koanf/parsers/toml v0.1.0
+	github.com/knadh/koanf/providers/confmap v0.1.0
+	github.com/knadh/koanf/providers/file v0.1.0
+	github.com/knadh/koanf/providers/posflag v0.1.0
+	github.com/knadh/koanf/v2 v2.0.1
+	github.com/lmittmann/tint v1.0.3
+	github.com/mattn/go-isatty v0.0.20
+	github.com/spf13/pflag v1.0.5
+)
 
 require (
-	astuart.co/goq v1.0.0 // indirect
 	github.com/PuerkitoBio/goquery v1.5.0 // indirect
 	github.com/andybalholm/cascadia v1.0.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/knadh/koanf/maps v0.1.1 // indirect
+	github.com/mitchellh/copystructure v1.2.0 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
 	golang.org/x/net v0.0.0-20190606173856-1492cefac77f // indirect
+	golang.org/x/sync v0.5.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
 
 )

go.sum

@@ -5,15 +5,53 @@ github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8
 github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o=
 github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
+github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
+github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
+github.com/knadh/koanf/parsers/toml v0.1.0 h1:S2hLqS4TgWZYj4/7mI5m1CQQcWurxUz6ODgOub/6LCI=
+github.com/knadh/koanf/parsers/toml v0.1.0/go.mod h1:yUprhq6eo3GbyVXFFMdbfZSo928ksS+uo0FFqNMnO18=
+github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU=
+github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU=
+github.com/knadh/koanf/providers/file v0.1.0 h1:fs6U7nrV58d3CFAFh8VTde8TM262ObYf3ODrc//Lp+c=
+github.com/knadh/koanf/providers/file v0.1.0/go.mod h1:rjJ/nHQl64iYCtAW2QQnF0eSmDEX/YZ/eNFj5yR6BvA=
+github.com/knadh/koanf/providers/posflag v0.1.0 h1:mKJlLrKPcAP7Ootf4pBZWJ6J+4wHYujwipe7Ie3qW6U=
+github.com/knadh/koanf/providers/posflag v0.1.0/go.mod h1:SYg03v/t8ISBNrMBRMlojH8OsKowbkXV7giIbBVgbz0=
+github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g=
+github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLNvY1Dus=
+github.com/lmittmann/tint v1.0.3 h1:W5PHeA2D8bBJVvabNfQD/XW9HPLZK1XoPZH0cq8NouQ=
+github.com/lmittmann/tint v1.0.3/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
+github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
+github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
+github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
+github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
+github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
+github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190606173856-1492cefac77f h1:IWHgpgFqnL5AhBUBZSgBdjl2vkQUEzcY+JNKWfcgAU0=
 golang.org/x/net v0.0.0-20190606173856-1492cefac77f/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
+golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

kleingebaeck.1

@@ -133,11 +133,109 @@
 .\" ========================================================================
 .\"
 .IX Title "KLEINGEBAECK 1"
-.TH KLEINGEBAECK 1 "2023-12-14" "1" "User Commands"
+.TH KLEINGEBAECK 1 "2023-12-19" "1" "User Commands"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
-.SS "kleingebaeck"
+.SH "NAME"
-.IX Subsection "kleingebaeck"
+kleingebaeck \- kleinanzeigen.de backup tool
-Backup of kleinanzeigen.de
+.SH "SYNOPSYS"
+.IX Header "SYNOPSYS"
+.Vb 10
+\&    Usage: kleingebaeck [\-dvVhmoc] [<ad\-listing\-url>,...]
+\&    Options:
+\&    \-\-user    \-u <uid>      Backup ads from user with uid <uid>.
+\&    \-\-debug   \-d            Enable debug output.
+\&    \-\-verbose \-v            Enable verbose output.
+\&    \-\-outdir  \-o <dir>      Set output dir (default: current directory)
+\&    \-\-limit   \-l <num>      Limit the ads to download to <num>, default: load all.
+\&    \-\-config  \-c <file>     Use config file <file> (default: ~/.kleingebaeck).
+\&    \-\-manual  \-m            Show manual.
+\&    \-\-help    \-h            Show usage.
+.Ve
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+This tool can be used to backup ads on the german ad page <https://kleinanzeigen.de>.
+.PP
+It downloads all (or  only the specified ones) ads of  one user into a
+directory, each ad into its own subdirectory. The backup will contain
+a textfile \fBAdlisting.txt\fR which contains the ad contents such as
+title, body, price etc. All images will be downloaded as well.
+.SH "CONFIGURATION"
+.IX Header "CONFIGURATION"
+You   can  create   a  config   file  to   save  typing.   By  default
+\&\f(CW\*(C`~/.kleingebaeck\*(C'\fR is being used but you can specify one with \f(CW\*(C`\-c\*(C'\fR as
+well.   We    use   \s-1TOML\s0   as   our    configuration   language.   See
+<https://toml.io/en/>.
+.PP
+Format is pretty simple:
+.PP
+.Vb 10
+\&    user = 1010101
+\&    loglevel = verbose
+\&    outdir = "test"
+\&    template = """
+\&    Title: {{.Title}}
+\&    Price: {{.Price}}
+\&    Id: {{.Id}}
+\&    Category: {{.Category}}
+\&    Condition: {{.Condition}}
+\&    Created: {{.Created}}
+\&
+\&    {{.Text}}
+\&    """
+.Ve
+.PP
+Be carefull  if you want  to change the  template.  The variable  is a
+multiline string surrounded  by three double quotes. You  can left out
+certain   fields  and   use  any   formatting  you   like.  Refer   to
+<https://pkg.go.dev/text/template>  for   details  how  to   write  a
+template.
+.PP
+If you're on  windows and want to customize the  output directory, put
+it into single  quotes to avoid the backslashes  interpreted as escape
+chars like this:
+.PP
+.Vb 1
+\&    outdir = \*(AqC:\eData\eAds\*(Aq
+.Ve
+.SH "SETUP"
+.IX Header "SETUP"
+To setup the tool, you need to lookup your userid on
+kleinanzeigen.de. Go to your ad overview page while \s-1NOT\s0 being logged
+in:
+.PP
+.Vb 1
+\&    https://www.kleinanzeigen.de/s\-bestandsliste.html?userId=XXXXXX
+.Ve
+.PP
+The \fB\s-1XXXXX\s0\fR part is your userid.
+.PP
+Put it into the configfile as outlined above. Also specify an output
+directory. Then just execute \f(CW\*(C`kleingebaeck\*(C'\fR.
+.PP
+You can use the \fB\-v\fR option to  get verbose output or \fB\-d\fR to enable
+debugging.
+.SH "BUGS"
+.IX Header "BUGS"
+In order to report a bug, unexpected behavior, feature requests
+or to submit a patch, please open an issue on github:
+<https://github.com/TLINDEN/kleingebaeck/issues>.
+.PP
+Please repeat the failing command with debugging enabled \f(CW\*(C`\-d\*(C'\fR and
+include the output in the issue.
+.SH "LIMITATIONS"
+.IX Header "LIMITATIONS"
+The \f(CW\*(C`kleingebaeck\*(C'\fR doesn't currently check if it has downloaded a
+file already, so it downloads everything again every time you execute
+it. Be aware of it. This will change in the future.
+.PP
+Also there's currently no parallelization implemented. This will
+change in the future.
+.SH "LICENSE"
+.IX Header "LICENSE"
+Licensed under the \s-1GNU GENERAL PUBLIC LICENSE\s0 version 3.
+.SH "Author"
+.IX Header "Author"
+T.v.Dein <tom \s-1AT\s0 vondein \s-1DOT\s0 org>

kleingebaeck.go

@@ -1,7 +1,97 @@
 package main
 
 var manpage = `
-  kleingebaeck
+NAME
-    Backup of kleinanzeigen.de
+    kleingebaeck - kleinanzeigen.de backup tool
+
+SYNOPSYS
+        Usage: kleingebaeck [-dvVhmoc] [<ad-listing-url>,...]
+        Options:
+        --user    -u <uid>      Backup ads from user with uid <uid>.
+        --debug   -d            Enable debug output.
+        --verbose -v            Enable verbose output.
+        --outdir  -o <dir>      Set output dir (default: current directory)
+        --limit   -l <num>      Limit the ads to download to <num>, default: load all.
+        --config  -c <file>     Use config file <file> (default: ~/.kleingebaeck).
+        --manual  -m            Show manual.
+        --help    -h            Show usage.
+
+DESCRIPTION
+    This tool can be used to backup ads on the german ad page
+    <https://kleinanzeigen.de>.
+
+    It downloads all (or only the specified ones) ads of one user into a
+    directory, each ad into its own subdirectory. The backup will contain a
+    textfile Adlisting.txt which contains the ad contents such as title,
+    body, price etc. All images will be downloaded as well.
+
+CONFIGURATION
+    You can create a config file to save typing. By default
+    "~/.kleingebaeck" is being used but you can specify one with "-c" as
+    well. We use TOML as our configuration language. See
+    <https://toml.io/en/>.
+
+    Format is pretty simple:
+
+        user = 1010101
+        loglevel = verbose
+        outdir = "test"
+        template = """
+        Title: {{.Title}}
+        Price: {{.Price}}
+        Id: {{.Id}}
+        Category: {{.Category}}
+        Condition: {{.Condition}}
+        Created: {{.Created}}
+
+        {{.Text}}
+        """
+
+    Be carefull if you want to change the template. The variable is a
+    multiline string surrounded by three double quotes. You can left out
+    certain fields and use any formatting you like. Refer to
+    <https://pkg.go.dev/text/template> for details how to write a template.
+
+    If you're on windows and want to customize the output directory, put it
+    into single quotes to avoid the backslashes interpreted as escape chars
+    like this:
+
+        outdir = 'C:\Data\Ads'
+
+SETUP
+    To setup the tool, you need to lookup your userid on kleinanzeigen.de.
+    Go to your ad overview page while NOT being logged in:
+
+        https://www.kleinanzeigen.de/s-bestandsliste.html?userId=XXXXXX
+
+    The XXXXX part is your userid.
+
+    Put it into the configfile as outlined above. Also specify an output
+    directory. Then just execute "kleingebaeck".
+
+    You can use the -v option to get verbose output or -d to enable
+    debugging.
+
+BUGS
+    In order to report a bug, unexpected behavior, feature requests or to
+    submit a patch, please open an issue on github:
+    <https://github.com/TLINDEN/kleingebaeck/issues>.
+
+    Please repeat the failing command with debugging enabled "-d" and
+    include the output in the issue.
+
+LIMITATIONS
+    The "kleingebaeck" doesn't currently check if it has downloaded a file
+    already, so it downloads everything again every time you execute it. Be
+    aware of it. This will change in the future.
+
+    Also there's currently no parallelization implemented. This will change
+    in the future.
+
+LICENSE
+    Licensed under the GNU GENERAL PUBLIC LICENSE version 3.
+
+Author
+    T.v.Dein <tom AT vondein DOT org>
 
 `

kleingebaeck.pod

@@ -1,5 +1,107 @@
-=head2 kleingebaeck
+=head1 NAME
+
+kleingebaeck - kleinanzeigen.de backup tool
+
+=head1 SYNOPSYS
+    
+    Usage: kleingebaeck [-dvVhmoc] [<ad-listing-url>,...]
+    Options:
+    --user    -u <uid>      Backup ads from user with uid <uid>.
+    --debug   -d            Enable debug output.
+    --verbose -v            Enable verbose output.
+    --outdir  -o <dir>      Set output dir (default: current directory)
+    --limit   -l <num>      Limit the ads to download to <num>, default: load all.
+    --config  -c <file>     Use config file <file> (default: ~/.kleingebaeck).
+    --manual  -m            Show manual.
+    --help    -h            Show usage.
+    --version -V            Show program version.
+
+=head1 DESCRIPTION
+
+This tool can be used to backup ads on the german ad page L<https://kleinanzeigen.de>.
+
+It downloads all (or  only the specified ones) ads of  one user into a
+directory, each ad into its own subdirectory. The backup will contain
+a textfile B<Adlisting.txt> which contains the ad contents such as
+title, body, price etc. All images will be downloaded as well.
+
+=head1 CONFIGURATION
+
+You   can  create   a  config   file  to   save  typing.   By  default
+C<~/.kleingebaeck> is being used but you can specify one with C<-c> as
+well.   We    use   TOML   as   our    configuration   language.   See
+L<https://toml.io/en/>.
+
+Format is pretty simple:
+
+    user = 1010101
+    loglevel = verbose
+    outdir = "test"
+    template = """
+    Title: {{.Title}}
+    Price: {{.Price}}
+    Id: {{.Id}}
+    Category: {{.Category}}
+    Condition: {{.Condition}}
+    Created: {{.Created}}
+
+    {{.Text}}
+    """
+
+Be carefull  if you want  to change the  template.  The variable  is a
+multiline string surrounded  by three double quotes. You  can left out
+certain   fields  and   use  any   formatting  you   like.  Refer   to
+L<https://pkg.go.dev/text/template>  for   details  how  to   write  a
+template.
+
+If you're on  windows and want to customize the  output directory, put
+it into single  quotes to avoid the backslashes  interpreted as escape
+chars like this:
+
+    outdir = 'C:\Data\Ads'
+
+=head1 SETUP
+
+To setup the tool, you need to lookup your userid on
+kleinanzeigen.de. Go to your ad overview page while NOT being logged
+in:
+
+    https://www.kleinanzeigen.de/s-bestandsliste.html?userId=XXXXXX
+
+The B<XXXXX> part is your userid.
+
+Put it into the configfile as outlined above. Also specify an output
+directory. Then just execute C<kleingebaeck>.
+
+You can use the B<-v> option to  get verbose output or B<-d> to enable
+debugging.
+
+=head1 BUGS
+
+In order to report a bug, unexpected behavior, feature requests
+or to submit a patch, please open an issue on github:
+L<https://github.com/TLINDEN/kleingebaeck/issues>.
+
+Please repeat the failing command with debugging enabled C<-d> and
+include the output in the issue.
+
+=head1 LIMITATIONS
+
+The C<kleingebaeck> doesn't currently check if it has downloaded a
+file already, so it downloads everything again every time you execute
+it. Be aware of it. This will change in the future.
+
+Also there's currently no parallelization implemented. This will
+change in the future.
+
+=head1 LICENSE
+
+Licensed under the GNU GENERAL PUBLIC LICENSE version 3.
+
+=head1 Author
+
+T.v.Dein <tom AT vondein DOT org>
+
 
-Backup of kleinanzeigen.de
 
 =cut

main.go

@@ -20,77 +20,127 @@ package main
 import (
 	"errors"
 	"fmt"
+	"log/slog"
 	"os"
+	"runtime/debug"
 
-	flag "github.com/spf13/pflag"
+	"github.com/lmittmann/tint"
 )
 
-const VERSION string = "0.0.1"
+const LevelNotice = slog.Level(2)
-const Useragent string = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
-const Baseuri string = "https://www.kleinanzeigen.de"
-const Listuri string = "/s-bestandsliste.html"
-const Defaultdir string = "."
 
 func main() {
 	os.Exit(Main())
 }
 
 func Main() int {
-	showversion := false
+	logLevel := &slog.LevelVar{}
-	showhelp := false
+	opts := &tint.Options{
-	showmanual := false
+		Level:     logLevel,
-	enabledebug := false
+		AddSource: false,
-	configfile := ""
+		ReplaceAttr: func(groups []string, a slog.Attr) slog.Attr {
-	dir := Defaultdir
+			// Remove time from the output
+			if a.Key == slog.TimeKey {
+				return slog.Attr{}
+			}
+			return a
+		},
+		NoColor: IsNoTty(),
+	}
 
-	flag.BoolVarP(&enabledebug, "debug", "d", false, "debug mode")
+	logLevel.Set(LevelNotice)
-	flag.BoolVarP(&showversion, "version", "v", false, "show version")
+	var handler slog.Handler = tint.NewHandler(os.Stdout, opts)
-	flag.BoolVarP(&showhelp, "help", "h", false, "show usage")
+	logger := slog.New(handler)
-	flag.BoolVarP(&showmanual, "manual", "m", false, "show manual")
+	slog.SetDefault(logger)
-	flag.StringVarP(&dir, "output-dir", "o", dir, "where to store ads")
-	flag.StringVarP(&configfile, "config", "c",
-		os.Getenv("HOME")+"/.kleingebaeck", "config file")
 
-	flag.Parse()
+	conf, err := InitConfig()
+	if err != nil {
+		return Die(err)
+	}
 
-	if showversion {
+	if conf.Showversion {
 		fmt.Printf("This is kleingebaeck version %s\n", VERSION)
 		return 0
 	}
 
-	/*
+	if conf.Showhelp {
-
-		 if showhelp {
 		fmt.Println(Usage)
 		return 0
 	}
 
-		if enabledebug {
+	if conf.Showmanual {
-			calc.ToggleDebug()
+		err := man()
+		if err != nil {
+			return Die(err)
 		}
-
-		if showmanual {
-			man()
 		return 0
 	}
 
-	*/
+	if conf.Verbose {
+		logLevel.Set(slog.LevelInfo)
+	}
 
-	if _, err := os.Stat(dir); errors.Is(err, os.ErrNotExist) {
+	if conf.Debug {
-		err := os.Mkdir(dir, os.ModePerm)
+		// we're using a more verbose logger in debug mode
+		buildInfo, _ := debug.ReadBuildInfo()
+		opts := &tint.Options{
+			Level:     logLevel,
+			AddSource: true,
+			NoColor:   IsNoTty(),
+		}
+
+		logLevel.Set(slog.LevelDebug)
+		var handler slog.Handler = tint.NewHandler(os.Stdout, opts)
+		debuglogger := slog.New(handler).With(
+			slog.Group("program_info",
+				slog.Int("pid", os.Getpid()),
+				slog.String("go_version", buildInfo.GoVersion),
+			),
+		)
+		slog.SetDefault(debuglogger)
+	}
+
+	slog.Debug("config", "conf", conf)
+
+	// prepare output dir
+	err = Mkdir(conf.Outdir)
+	if err != nil {
+		return Die(err)
+	}
+
+	if len(conf.Adlinks) >= 1 {
+		// directly backup ad listing[s]
+		for _, uri := range conf.Adlinks {
+			err := Scrape(conf, uri)
 			if err != nil {
 				return Die(err)
 			}
 		}
+	} else if conf.User > 0 {
+		// backup all ads of the given user (via config or cmdline)
+		err := Start(conf)
+		if err != nil {
+			return Die(err)
+		}
+	} else {
+		return Die(errors.New("invalid or no user id or no ad link specified"))
+	}
 
-	if len(flag.Args()) == 1 {
+	if conf.StatsCountAds > 0 {
-		Start(flag.Args()[0], dir)
+		adstr := "ads"
+		if conf.StatsCountAds == 1 {
+			adstr = "ad"
+		}
+		fmt.Printf("Successfully downloaded %d %s with %d images to %s.\n",
+			conf.StatsCountAds, adstr, conf.StatsCountImages, conf.Outdir)
+	} else {
+		fmt.Printf("No ads found.")
 	}
 
 	return 0
 }
 
 func Die(err error) int {
-	fmt.Println(err)
+	slog.Error("Failure", "error", err.Error())
 	return 1
 }

mkrel.sh

@@ -40,13 +40,18 @@ 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
     GOOS=${os} GOARCH=${arch} go build -tags osusergo,netgo -ldflags "-extldflags=-static" -o ${binfile}
     mkdir -p ${tardir}
     cp ${binfile} README.md LICENSE ${tardir}/
-    echo 'tool = rpn
+    echo 'tool = kleingebaeck
 PREFIX = /usr/local
 UID    = root
 GID    = 0

scrape.go

@@ -21,18 +21,42 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"os"
+	"log/slog"
+	"net/http"
+	"path/filepath"
 	"strings"
 
-	"net/http"
-
 	"astuart.co/goq"
+	"golang.org/x/sync/errgroup"
 )
 
 type Index struct {
 	Links []string `goquery:".text-module-begin a,[href]"`
 }
 
+type Ad struct {
+	Title     string `goquery:"h1"`
+	Slug      string
+	Id        string
+	Condition string
+	Category  string
+	Price     string   `goquery:"h2#viewad-price"`
+	Created   string   `goquery:"#viewad-extra-info,text"`
+	Text      string   `goquery:"p#viewad-description-text,html"`
+	Images    []string `goquery:".galleryimage-element img,[src]"`
+	Meta      []string `goquery:".addetailslist--detail--value,text"`
+}
+
+func (ad *Ad) LogValue() slog.Value {
+	return slog.GroupValue(
+		slog.String("title", ad.Title),
+		slog.String("price", ad.Price),
+		slog.String("id", ad.Id),
+		slog.Int("imagecount", len(ad.Images)),
+		slog.Int("bodysize", len(ad.Text)),
+	)
+}
+
 // fetch some web page content
 func Get(uri string, client *http.Client) (io.ReadCloser, error) {
 	req, err := http.NewRequest("GET", uri, nil)
@@ -42,28 +66,32 @@ func Get(uri string, client *http.Client) (io.ReadCloser, error) {
 
 	req.Header.Set("User-Agent", Useragent)
 
-	// fmt.Println(uri)
-
 	res, err := client.Do(req)
 	if err != nil {
 		return nil, err
 	}
 
+	slog.Debug("response", "code", res.StatusCode, "status",
+		res.Status, "size", res.ContentLength)
+
 	return res.Body, nil
 }
 
 // extract links from  all ad listing pages (that  is: use pagination)
 // and scrape every page
-func Start(uid string, dir string) error {
+func Start(conf *Config) error {
 	client := &http.Client{}
-	ads := []string{}
+	adlinks := []string{}
 
-	baseuri := Baseuri + Listuri + "?userId=" + uid
+	baseuri := fmt.Sprintf("%s%s?userId=%d", Baseuri, Listuri, conf.User)
 	page := 1
 	uri := baseuri
 
+	slog.Info("fetching ad pages", "user", conf.User)
+
 	for {
 		var index Index
+		slog.Debug("fetching page", "uri", uri)
 		body, err := Get(uri, client)
 		if err != nil {
 			return err
@@ -79,77 +107,106 @@ func Start(uid string, dir string) error {
 			break
 		}
 
+		slog.Debug("extracted ad links", "count", len(index.Links))
+
 		for _, href := range index.Links {
-			ads = append(ads, href)
+			adlinks = append(adlinks, href)
-			fmt.Println(href)
+			slog.Debug("ad link", "href", href)
 		}
 
 		page++
 		uri = baseuri + "&pageNum=" + fmt.Sprintf("%d", page)
 	}
 
-	for _, ad := range ads {
+	for i, adlink := range adlinks {
-		err := Scrape(ad, dir)
+		err := Scrape(conf, Baseuri+adlink)
 		if err != nil {
 			return err
 		}
-		return nil
+
+		if conf.Limit > 0 && i == conf.Limit-1 {
+			break
+		}
 	}
 
 	return nil
 }
 
-type Ad struct {
+// scrape an ad. uri is the full uri of the ad, dir is the basedir
-	Title  string   `goquery:"h1"`
+func Scrape(c *Config, uri string) error {
-	Text   string   `goquery:"p#viewad-description-text,html"`
-	Images []string `goquery:".galleryimage-element img,[src]"`
-	Price  string   `goquery:"h2#viewad-price"`
-}
-
-func Scrape(link string, dir string) error {
 	client := &http.Client{}
-	uri := Baseuri + link
+	ad := &Ad{}
-	slurp := strings.Split(uri, "/")[1]
 
-	var ad Ad
+	// extract slug and id from uri
+	uriparts := strings.Split(uri, "/")
+	if len(uriparts) < 6 {
+		return errors.New("invalid uri")
+	}
+	ad.Slug = uriparts[4]
+	ad.Id = uriparts[5]
+
+	// get the ad
+	slog.Debug("fetching ad page", "uri", uri)
 	body, err := Get(uri, client)
 	if err != nil {
 		return err
 	}
 	defer body.Close()
 
+	// extract ad contents with goquery/goq
 	err = goq.NewDecoder(body).Decode(&ad)
 	if err != nil {
 		return err
 	}
+	if len(ad.Meta) == 2 {
+		ad.Category = ad.Meta[0]
+		ad.Condition = ad.Meta[1]
+	}
+	slog.Debug("extracted ad listing", "ad", ad)
 
-	f, err := os.Create(strings.Join([]string{dir, slurp, "Anzeige.txt"}, "/"))
+	// write listing
+	err = WriteAd(c.Outdir, ad, c.Template)
 	if err != nil {
 		return err
 	}
 
-	ad.Text = strings.ReplaceAll(ad.Text, "<br/>", "\n")
+	c.IncrAds()
-	_, err = fmt.Fprintf(f, "Title: %s\nPrice: %s\n\n%s", ad.Title, ad.Price, ad.Text)
+
-	if err != nil {
+	return ScrapeImages(c, ad)
-		return err
 }
 
+func ScrapeImages(c *Config, ad *Ad) error {
+	// fetch images
 	img := 1
+	g := new(errgroup.Group)
+
 	for _, imguri := range ad.Images {
-		file := fmt.Sprintf("%s/%d.jpg", dir, img)
+		imguri := imguri
+		file := filepath.Join(c.Outdir, ad.Slug, fmt.Sprintf("%d.jpg", img))
+		g.Go(func() error {
 			err := Getimage(imguri, file)
 			if err != nil {
 				return err
 			}
+			slog.Info("wrote ad image", "image", file)
 
+			return nil
+		})
 		img++
 	}
 
+	if err := g.Wait(); err != nil {
+		return err
+	}
+
+	c.IncrImgs(len(ad.Images))
+
 	return nil
 }
 
 // fetch an image
 func Getimage(uri, fileName string) error {
+	slog.Debug("fetching ad image", "uri", uri)
 	response, err := http.Get(uri)
 	if err != nil {
 		return err
@@ -160,13 +217,7 @@ func Getimage(uri, fileName string) error {
 		return errors.New("received non 200 response code")
 	}
 
-	file, err := os.Create(fileName)
+	err = WriteImage(fileName, response.Body)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
-	_, err = io.Copy(file, response.Body)
 	if err != nil {
 		return err
 	}

store.go

@@ -0,0 +1,78 @@
+/*
+Copyright © 2023 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package main
+
+import (
+	"io"
+	"log/slog"
+	"os"
+	"path/filepath"
+	"runtime"
+	"strings"
+	tpl "text/template"
+)
+
+func WriteAd(dir string, ad *Ad, template string) error {
+	// prepare output dir
+	dir = filepath.Join(dir, ad.Slug)
+	err := Mkdir(dir)
+	if err != nil {
+		return err
+	}
+
+	// write ad file
+	listingfile := filepath.Join(dir, "Adlisting.txt")
+	f, err := os.Create(listingfile)
+	if err != nil {
+		return err
+	}
+
+	if runtime.GOOS == "windows" {
+		ad.Text = strings.ReplaceAll(ad.Text, "<br/>", "\r\n")
+	} else {
+		ad.Text = strings.ReplaceAll(ad.Text, "<br/>", "\n")
+	}
+
+	tmpl, err := tpl.New("adlisting").Parse(template)
+	if err != nil {
+		return err
+	}
+	err = tmpl.Execute(f, ad)
+	if err != nil {
+		return err
+	}
+
+	slog.Info("wrote ad listing", "listingfile", listingfile)
+
+	return nil
+}
+
+func WriteImage(filename string, reader io.ReadCloser) error {
+	file, err := os.Create(filename)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+
+	_, err = io.Copy(file, reader)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

util.go

@@ -0,0 +1,68 @@
+/*
+Copyright © 2023 Thomas von Dein
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+package main
+
+import (
+	"bytes"
+	"errors"
+	"os"
+	"os/exec"
+	"runtime"
+
+	"github.com/mattn/go-isatty"
+)
+
+func Mkdir(dir string) error {
+	if _, err := os.Stat(dir); errors.Is(err, os.ErrNotExist) {
+		err := os.Mkdir(dir, os.ModePerm)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func man() error {
+	man := exec.Command("less", "-")
+
+	var b bytes.Buffer
+	b.Write([]byte(manpage))
+
+	man.Stdout = os.Stdout
+	man.Stdin = &b
+	man.Stderr = os.Stderr
+
+	err := man.Run()
+
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// returns TRUE if stdout is NOT a tty or windows
+func IsNoTty() bool {
+	if runtime.GOOS == "windows" || !isatty.IsTerminal(os.Stdout.Fd()) {
+		return true
+	}
+
+	// it is a tty
+	return false
+}