fix typo

.github/ISSUE_TEMPLATE/note_to_self.md

@@ -5,4 +5,3 @@ title: "[bug-report]"
 labels: bug
 assignees: TLINDEN
 
----

.github/dependabot.yml

@@ -1,10 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "gomod"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-        interval: "monthly"

.github/workflows/ci.yaml

@@ -10,13 +10,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v3
       with:
         go-version: ${{ matrix.version }}
       id: go
 
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
 
     - name: build
       run: go build
@@ -39,9 +39,9 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v3
         with:
           go-version: 1.21
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v3

.github/workflows/pushimage.yaml

@@ -15,20 +15,20 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Log in to the Container registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
         with:
           registry: https://ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
         with:
           push: true
           tags: ghcr.io/tlinden/kleingebaeck:${{ github.ref_name}}
 
       - name: Build and push latest Docker image
-        uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
         with:
           push: true
           tags: ghcr.io/tlinden/kleingebaeck:latest

.github/workflows/release.yaml

@@ -1,87 +0,0 @@
-name: build-release
-on:
-  push:
-    tags:
-      - "v*.*.*"
-
-jobs:
-  release:
-    name: Build Release Assets
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.22.11
-
-      - name: Build the executables
-        run: ./mkrel.sh kleingebaeck ${{ github.ref_name}}
-
-      - name: List the executables
-        run: ls -l ./releases
-
-      - name: Upload the binaries
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.ref_name }}
-          file: ./releases/*
-          file_glob: true
-
-      - name: Build Changelog
-        id: github_release
-        uses: mikepenz/release-changelog-builder-action@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          mode: "PR"
-          configurationJson: |
-            {
-              "template": "#{{CHANGELOG}}\n\n**Full Changelog**: #{{RELEASE_DIFF}}",
-              "pr_template": "- #{{TITLE}} (##{{NUMBER}}) by #{{AUTHOR}}\n#{{BODY}}",
-              "empty_template": "- no changes",
-              "categories": [
-                {
-                    "title": "## New Features",
-                    "labels": ["add", "feature"]
-                },
-                {
-                    "title": "## Bug Fixes",
-                    "labels": ["fix", "bug", "revert"]
-                },
-                {
-                    "title": "## Documentation Enhancements",
-                    "labels": ["doc"]
-                },
-                {
-                    "title": "## Refactoring Efforts",
-                    "labels": ["refactor"]
-                },
-                {
-                    "title": "## Miscellaneus Changes",
-                    "labels": []
-                }
-              ],
-              "ignore_labels": [
-                 "duplicate", "good first issue", "help wanted", "invalid", "question", "wontfix"
-              ],
-              "label_extractor": [
-                 {
-                    "pattern": "(.) (.+)",
-                    "target": "$1"
-                 },
-                 {
-                    "pattern": "(.) (.+)",
-                    "target": "$1",
-                    "on_property": "title"
-                 }
-              ]
-            }
-    
-      - name: Create Release
-        uses: softprops/action-gh-release@v2
-        with:
-          body: ${{steps.github_release.outputs.changelog}}

CODE_OF_CONDUCT.md

@@ -1,114 +0,0 @@
-# No Code of Conduct
-
-*TL;DR:* This project  does **NOT** have a so called  Code of Conduct,
-nor will it ever have one.
-
-## The Rant
-
-The reasons are somewhat complicated and  I'll try my best to document
-them here.
-
-Ethical codes  or rules come  along like laws.  But how is  ethical or
-moral behavior defined? And who  defines which behavior is ethical and
-which is not? Certainly not me.
-
-Unless  you  live  in  a  dictatorship (and  more  than  half  of  the
-population on  planet earth  do as  of this  writing), laws  come into
-existence by democratic procedures. Laws  cover almost every aspect of
-live in  a society. Laws allow  and forbid behavior and  laws sanction
-infringements.
-
-A software project like  this one on the other hand  is not a society.
-There   are   not   enough   people  involved   to   form   democratic
-structures. And there will always be  a minority of users who have the
-right to commit or reject code. How could any maintainer of a software
-project dare to decree rules upon  others? Actually, am I, the current
-maintainer of this very project authorized to do so?
-
-I think the anser to this question clearly is NO.
-
-The  issue  is  being  complicated  by  the  fact,  that  open  source
-development these days  happens on a planetary scale.  And this planet
-houses hundreds if not  thousands of different cultures, philosophies,
-ideologies and worldviews.  The answer  to many ethical questions will
-in most cases be vague and nebulous.
-
-Ones joke will always be another ones insult.
-
-Then there  is the  problem of  language. I myself  am not  an english
-native, but I publish everyting using  the english language. I am able
-to communicate with  most people in the open  source community because
-of that.   But I am  certainly not  able to understand  everything and
-everyone. There  might be nuances to  a sentence I don't  sense, there
-might be  sarcastic connotations I  don't understand or  references to
-historical figures, events  or traditions I don't know  and never have
-heard of.
-
-Judging over other  peoples online behavior looks like  a titanic task
-to me. It is just not my job  to judge others, I am not legitimized or
-authorized to do so and I am not interested in this kind of business.
-
-Another huge  problem with ethical rules  is that you need  to outline
-and enforce sanctions  on those who violate the rules.  But since I am
-not an  elected authority  how would I  be able to  do this?   I don't
-know.  And  what happens if  someone complains about myself?   Shall I
-remove myself from my own project? Come on!
-
-Last but  not least there's  the law. So,  let's say someone  in india
-writes something  insulting to some  other developer in an  issue.  Of
-course  german law  does not  apply  to indian  people. Moreover,  the
-insult might actually not be an  insult in india.  In the end, nothing
-would   happen.   Under   normal   circumstances,  maintainers   would
-eventually delete the posting, ban  the user or remove push privileges
-etc.
-
-But then, is there a way for  the offending user to defend himself? Of
-course not, since neither indian or german law alone applies. I cannot
-go to  a german court  and sue the  guy and he  cannot do the  same in
-india. Or -  we possibly could but the judges  in both countries would
-just laugh and close the case.
-
-That  being said,  I  don't have  the  power nor  the  tools, nor  the
-authority to enforce serious sanctions  of any meaningful kind against
-others. Therefore I cannot outline any rules whatsoever.
-
-And let's not  even start talking about  these undemocratic "comitees"
-many projects are  forming to circumvent this  problem.  Some projects
-even  include  external entities  like  a  lawyer or  some  bureaucrat
-somewhere  just to  have the  ability  to complain  against a  comitee
-member. What a mess!
-
-
-
-## So, what are the ethical rules within this project then?
-
-Well, there are none.
-
-This project is  about code, not society. It doesn't  matter where you
-come from,  how you look,  how you think,  what you believe,  who your
-friends are, whay you  said or did sometime in the  past. I don't even
-care if you are a human being. You are an alien so bored that you need
-to submit code on github? Fine with me. You're a convicted criminal? I
-don't give a shit!
-
-**The only thing I am interested here is Code and only Code.**
-
-So if anyhing happens  here I don't like or I  am obliged by (german!)
-law to act on, I will decide on  a case to case basis what to do.  And
-unfortunately,  since this  is the  nature  of a  github project,  you
-cannot complain, object or protest. I am very sorry!
-
-If you will, let's at least  outline these:
-
-- Please - just please -  behave towards others as you'd expect others
-  to behave towards yourself.
-
-- Don't judge others for any reason.
-
-- Only judge the code.
-
-But these are not rules, only a  friendly appeal to you as a developer
-and user.
-
-
-Thanks a lot!

CONTRIBUTING.md

@@ -1,93 +0,0 @@
-## Project Goals
-
-The goal  of this  project is  to build  a small  tool which  helps in
-maintaining backups of the german  ad site kleinanzeigen.de. It should
-be  small,  fast and  easy  to  understand.
-
-There will be no GUI, no web interface, no public API of some sort, no
-builtin interpreter.
-
-The  programming  language  used  for  this  project  will  always  be
-[GOLANG](https://go.dev/)  with  the  exception of  the  documentation
-([Perl POD](https://perldoc.perl.org/perlpod)) and the Makefile.
-
-# Contributing
-
-You can contribute to this project in various ways:
-
-## Open an issue
-
-If you encounter  a problem or don't understand how  the program works
-or if you think the documentation is unclear, please don't hesitate to
-open an issue.
-
-Please add as much information about the case as possible, such as:
-
-- Your environment (operating system etc)
-- kleingebaeck version (`kleingebaeck --version`)
-- Commandline used. Please replace sensitive information with mock data!
-- Repeat the command with debugging enabled (`-d` flag)
-- Actual program output, Please replace sensitive information with mock data!
-- Expected program output.
-- Error message - if any.
-
-Be aware  that I am  working on this (and  some others) project  in my
-spare  time which  is scarce.   Therefore  please don't  expect me  to
-respond to  your query within  hours or even  days. Be patient,  but I
-WILL respond.
-
-## Pull Requests
-
-Code and documentation help is  always much appreciated! Please follow
-thes guidelines to successfully contribute:
-
--  Every  pull   request  shall  be  based   on  latest  `development`
-  branch. `main` is only used for releases.
-  
-- Execute the  unit tests before committing: `make  test`. There shall
-  be no errors.
-  
-- Strive  to be  backwards compatible  so that  users who  are already
-  using the program  don't have to change their habits  - unless it is
-  really neccessary.
-
-- Try to add a unit test for your fix, addition or modification.
-
-- Don't ever change existing unit tests!
-
-- Add a meaningful and comprehensive rationale about your contribution:
-  - Why do you think it might be useful for others?
-  - What did you actually change or add?
-  - Is there an open issue which  this PR fixes and if so, please link
-    to that issue.
-
-- [Re-]format your code with `gofmt -s`.
-
-- Avoid unneccesary dependencies, especially for very small functions.
-
-- **If** a  new dependency is being added, it  must be compatible with
-  our [license agreement](LICENSE).
-  
-- You  need to accept  that the  code or documentation  you contribute
-  will be redistributed under the  terms of said license agreement. If
-  your  contribution  is  considerably  large  or  if  you  contribute
-  regularly, then  feel free  to add  your name (and  if you want your
-  email    address)     to    the    *AUTHORS*    section    of    the
-  [manpage](kleingebaeck.pod).
-
-- Adhere to the above mentioned project goals.
-
-- If   you are  unsure if  your addition or  change will  be accepted,
-  better ask before starting coding. Open an issue about your proposal
-  and let's  discuss it! That way  we avoid doing unnessesary  work on
-  both sides.
-    
-Each pull  request will be  carefully reviewed and  if it is  a useful
-addition  it  will  be  accepted. However,  please  be  prepared  that
-sometimes a  PR will be  rejected.  The reasons  may vary and  will be
-documented.   Perhaps the  above guidelines  are not  matched, or  the
-addition seems  to be not so  useful from my perspective,  maybe there
-are  too  much  changes  or  there  might  be  changes  I  don't  even
-understand.
-
-But whatever happens: your contribution is always welcome!

Makefile

@@ -56,15 +56,6 @@ test: clean
 	mkdir -p t/out
 	go test ./... $(ARGS)
 
-testlint: test lint
-
-lint:
-	golangci-lint run
-
-lint-full:
-	golangci-lint run --enable-all --exclude-use-default --disable exhaustivestruct,exhaustruct,depguard,interfacer,deadcode,golint,structcheck,scopelint,varcheck,ifshort,maligned,nosnakecase,godot,funlen,gofumpt,cyclop,noctx,gochecknoglobals,paralleltest
-	gocritic check -enableAll *.go
-
 testfuzzy: clean
 	go test -fuzz ./... $(ARGS)
 
@@ -82,8 +73,8 @@ goupdate:
 buildall:
 	./mkrel.sh $(tool) $(VERSION)
 
-release:
+release: buildall
-	gh release create v$(VERSION) --generate-notes
+	gh release create v$(VERSION) --generate-notes releases/*
 
 show-versions: buildlocal
 	@echo "### kleingebaeck version:"
@@ -97,5 +88,5 @@ show-versions: buildlocal
 	@echo "### go version used for building:"
 	@grep -m 1 go go.mod
 
-# lint:
+lint:
-# 	golangci-lint run -p bugs -p unused
+	golangci-lint run -p bugs -p unused

README-de.md

@@ -17,15 +17,6 @@ Anzeige gespeichert werden. In dem Verzeichnis wird eine Datei
 `Adlisting.txt` erstellt, in der sich die Inhalte der Anzeige wie
 Titel, Preis, Text etc befinden. Bilder werden natürlich auch heruntergeladen.
 
-## ACHTUNG - SICHERHEITS-UPDATE
-
-Fertige vorcompilierte Programme älter als Version `v0.3.12` sind von
-Schwachstellen in der Behandlung von HTTP und Zertifikaten
-betroffen. Falls Du eine ältere Kleingebäck-Version im Einsatz hast,
-bitte update auf Version `v0.3.12` oder höher. Bitte lies auch die [Release Notes für
-v0.3.12](https://github.com/TLINDEN/kleingebaeck/releases/tag/v0.3.12)
-für mehr Details.
-
 ## Screenshots
 
 Das ist die Hauptseite meines kleinanzeigen.de Accounts:
@@ -231,49 +222,6 @@ Sowie alle Bilder.
 Das Format kann man mit der Variable `template` in der Konfiguration
 ändern. Die `example.conf` enthält ein Beispiel für das Standard Template.
 
-## Verhalten des Tools
-
-Es gibt einige Dinge über das Verhalten von kleingebäck, über die Du
-Bescheid wissen solltest:
-
-- alle HTML Seiten und Bilder werden immer heruntergeladen
-- es wird ein (konfigurierbarer) Useragent verwendet
-- HTTP Cookies werden beachtet
-- bei Fehlern wird dreimal mit unterschiedlichem Abstand erneut
-  versucht
-- Bilder Downloads laufen parallelisiert mit leicht unterschiedlichen
-  zeitlichen Abständen ab
-- Gleich aussehende Bilder werden nicht überschrieben
-
-Der letzte Punkt muss genauer erläutert werden:
-
-Wenn man bei Kleinanzeigen.de eine Anzeige einstellt und Bilder
-postet, werden diese dort in ihrer Grösse reduziert (durch Kompression
-und Verkleinerung der Bilder usw.). Diese reduzierten Bilder werden
-dann von kleingebäck heruntergeladen. Falls Du Deine original Bilder
-behalten hast, kannst Du diese danach in das Backupverzeichnis
-kopieren. Bei einem erneuten kleingebäck-Lauf werden diese Bilder dann
-nicht überschrieben.
-
-Wir verwenden dafür einen Algorythmus namens [distance
-hashing](https://github.com/corona10/goimagehash). Dieser Algorithmus
-prüft die Ähnlichkeit von Bildern. Diese können in ihrer Auflösung,
-Kompression, Farbtiefe und vielem mehr manipuliert worden sein und
-trotzdem als das "gleiche Bild" erkannt werden (wohlgemerkt nicht "das
-selbe": die Dateien sind durchaus unterschiedlich!). Bis zu einer
-Distance von 5 überschreiben wir keine Bilder, weil wir dann davon
-ausgehen, dass das lokal Vorhandene das Original ist.
-
-Bitte beachte aber, dass dies KEIN Cachingmechanismus ist: die Bilder
-werden trotzdem immer alle heruntergeladen. Das muss so sein, da wir
-uns nicht die Dateinamen anschauen können, da kleinanzeigen.de diese
-nämlich zu Zahlen umbenennt. Und die Dateinamen können sich auch
-ändern, wenn der User in der Anzeige die Bilder umarrangiert hat.
-
-Du kannst dieses Verhalten mit der Option **--force** ausschalten. Du
-kannst ausserdem mit der Option **--ignoreerrors** auch alle Fehler
-ignorieren, die beim Bilderdownload auftreten könnten.
-
 ## Documentation
 
 Die Dokumentation kann man

README.md

@@ -18,15 +18,6 @@ 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.
 
-## CAUTION - SECURITY UPDATE
-
-Binary releases prior to version `v0.3.11` are affected by
-vulnerabilities in HTTP and certificate handling. If you are using
-such a binary, please update to `v0.3.12` or higher. Please also refer
-to the [Release Notes of
-v0.3.12](https://github.com/TLINDEN/kleingebaeck/releases/tag/v0.3.12)
-for more details.
-
 ## Screenshots
 
 This is the index of my kleinanzeigen.de Account:
@@ -216,48 +207,6 @@ variable. The supplied sample config contains the default template.
 
 All images will be stored in the same directory.
 
-## Tool Behavior
-
-There are a bunch of things you might want to know about the behavior
-of the kleingebäck tool:
-
-- all HTML pages and IMAGEs are always being downloaded
-- we use a (customizable) user agent
-- we respect HTTP cookies
-- in the case of an error, the tool does 3 retries, the time it waits
-  between tries is longer for each retry
-- image download is parallized using small time differences to look
-  more natural
-- same images are not being overwritten on subsequent download
-
-
-The latter needs to be elaborated a bit more:
-
-If you publish an ad on kleinanzeigen.de and post images, those images
-will be reduced in size by the site (by compressing and down sizing
-them). This reduced images will be downloaded by kleingebäck. However,
-you may still own the original images and may want to put them into
-that backup directory so that you have all things for one ad together.
-
-You can easily do that, because kleingebäck won't overwrite those
-original images. It uses something called a distance hash using
-[goimagehash](https://github.com/corona10/goimagehash). This
-algorithmus checks the similarity of images. If an image has been
-resized it is still very similar to the original one. We accept a
-maximum of a distance of 5, everything above leads to overwrite.
-
-This works with resizes, cropped and otherwise manipulated images as
-long as the image still shows the original contents good enough.
-
-Also note, that this is NOT a caching mechanism: the images will be
-downloaded anyway during each run. We also can't look at the file
-names because kleinanzeigen.de renames all images to numbers. And
-those might even change if the user re-arranges the images.
-
-You can override this behavior using the **--force** option. Another
-option, **--ignoreerrors**, can be used to ignore all kinds of image
-errors. 
-
 ## Documentation
 
 You can read the documentation [online](https://github.com/TLINDEN/kleingebaeck/blob/main/kleingebaeck.pod) or locally once you have installed kleingebaeck with: `kleingebaeck --manual`.

SECURITY.md

@@ -1,17 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Only  the latest  release  is supported.  If you  find  an issue  (any
-issue!), please check with the latest release first.
-
-## Reporting a Vulnerability
-
-I don't agree with the "responsible disclosure" process most projects
-(and companies) work these days.
-
-So, if you find a vulnerability of any kind, please just open an
-[issue](https://github.com/TLINDEN/kleingebaeck/issues). Please add
-all details required to reproduce the vulnerability. You won't be chased.
-
-That's just all about it.

ad.go

@@ -1,5 +1,5 @@
 /*
-Copyright © 2023-2024 Thomas von Dein
+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
@@ -30,10 +30,8 @@ type Index struct {
 type Ad struct {
 	Title        string `goquery:"h1"`
 	Slug         string
-	ID           string
+	Id           string
-	Details      []string `goquery:".addetailslist--detail--value,text"`
+	Condition    string `goquery:".addetailslist--detail--value,text"`
-	Condition    string   // post processed from details
-	Type         string   // post processed from details
 	Category     string
 	CategoryTree []string `goquery:".breadcrump-link,text"`
 	Price        string   `goquery:"h2#viewad-price"`
@@ -48,7 +46,7 @@ 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.String("id", ad.Id),
 		slog.Int("imagecount", len(ad.Images)),
 		slog.Int("bodysize", len(ad.Text)),
 		slog.String("categorytree", strings.Join(ad.CategoryTree, "+")),
@@ -58,9 +56,6 @@ func (ad *Ad) LogValue() slog.Value {
 	)
 }
 
-// static set of conditions available, used for post processing details
-var CONDITIONS = []string{"Neu", "Gut", "Sehr Gut", "In Ordnung"}
-
 // check for  completeness.  I  erected these  fields to  be mandatory
 // (though I really don't know if  they really are). I consider images
 // and meta  optional. So,  if either  of the  checked fields  here is
@@ -78,10 +73,10 @@ func (ad *Ad) Incomplete() bool {
 }
 
 func (ad *Ad) CalculateExpire() {
-	if ad.Created != "" {
+	if len(ad.Created) > 0 {
 		ts, err := time.Parse("02.01.2006", ad.Created)
 		if err == nil {
-			ad.Expire = ts.AddDate(0, ExpireMonths, ExpireDays).Format("02.01.2006")
+			ad.Expire = ts.AddDate(0, 2, 1).Format("02.01.2006")
 		}
 	}
 }

config.go

@@ -17,6 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"os"
@@ -34,41 +35,21 @@ import (
 )
 
 const (
-	VERSION    string = "0.3.14"
+	VERSION         string = "0.3.0"
-	Baseuri    string = "https://www.kleinanzeigen.de"
+	Baseuri         string = "https://www.kleinanzeigen.de"
-	Listuri    string = "/s-bestandsliste.html"
+	Listuri         string = "/s-bestandsliste.html"
-	Defaultdir string = "."
+	Defaultdir      string = "."
-
+	DefaultTemplate string = "Title: {{.Title}}\nPrice: {{.Price}}\nId: {{.Id}}\n" +
-	DefaultTemplate string = "Title: {{.Title}}\nPrice: {{.Price}}\nId: {{.ID}}\n" +
+		"Category: {{.Category}}\nCondition: {{.Condition}}\n" +
-		"Category: {{.Category}}\nCondition: {{.Condition}}\nType: {{.Type}}\n" +
 		"Created: {{.Created}}\nExpire: {{.Expire}}\n\n{{.Text}}\n"
-
+	DefaultTemplateWin string = "Title: {{.Title}}\r\nPrice: {{.Price}}\r\nId: {{.Id}}\r\n" +
-	DefaultTemplateWin string = "Title: {{.Title}}\r\nPrice: {{.Price}}\r\nId: {{.ID}}\r\n" +
+		"Category: {{.Category}}\r\nCondition: {{.Condition}}\r\n" +
-		"Category: {{.Category}}\r\nCondition: {{.Condition}}\r\nType: {{.Type}}\r\n" +
 		"Created: {{.Created}}\r\nExpires: {{.Expire}}\r\n\r\n{{.Text}}\r\n"
-
+	Useragent string = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " +
-	DefaultUserAgent string = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " +
 		"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
-
 	DefaultAdNameTemplate string = "{{.Slug}}"
-
-	DefaultOutdirTemplate string = "."
-
-	// for image download throttling
-	MinThrottle int = 2
-	MaxThrottle int = 20
-
-	// we extract the slug from the uri
-	SlugURIPartNum int = 6
-
-	ExpireMonths int = 2
-	ExpireDays   int = 1
-
-	WIN string = "windows"
 )
 
-var DirsVisited map[string]int
-
 const Usage string = `This is kleingebaeck, the kleinanzeigen.de backup tool.
 
 Usage: kleingebaeck [-dvVhmoclu] [<ad-listing-url>,...]
@@ -81,7 +62,7 @@ Options:
 -l --limit   <num>      Limit the ads to download to <num>, default: load all.
 -c --config  <file>     Use config file <file> (default: ~/.kleingebaeck).
    --ignoreerrors       Ignore HTTP errors, may lead to incomplete ad backup.
--f --force              Overwrite images and ads even if the already exist.
+-f --force              Download images even if they already exist.
 -m --manual             Show manual.
 -h --help               Show usage.
 -V --version            Show program version.
@@ -103,7 +84,6 @@ type Config struct {
 	Limit            int    `koanf:"limit"`
 	IgnoreErrors     bool   `koanf:"ignoreerrors"`
 	ForceDownload    bool   `koanf:"force"`
-	UserAgent        string `koanf:"useragent"` // conf only
 	Adlinks          []string
 	StatsCountAds    int
 	StatsCountImages int
@@ -118,58 +98,54 @@ func (c *Config) IncrImgs(num int) {
 }
 
 // load commandline flags and config file
-func InitConfig(output io.Writer) (*Config, error) {
+func InitConfig(w io.Writer) (*Config, error) {
-	var kloader = koanf.New(".")
+	var k = koanf.New(".")
 
 	// determine template based on os
 	template := DefaultTemplate
-	if runtime.GOOS == WIN {
+	if runtime.GOOS == "windows" {
 		template = DefaultTemplateWin
 	}
 
 	// Load default values using the confmap provider.
-	if err := kloader.Load(confmap.Provider(map[string]interface{}{
+	if err := k.Load(confmap.Provider(map[string]interface{}{
 		"template":       template,
-		"outdir":         DefaultOutdirTemplate,
+		"outdir":         ".",
 		"loglevel":       "notice",
 		"userid":         0,
 		"adnametemplate": DefaultAdNameTemplate,
-		"useragent":      DefaultUserAgent,
 	}, "."), nil); err != nil {
-		return nil, fmt.Errorf("failed to load default values into koanf: %w", err)
+		return nil, err
 	}
 
 	// setup custom usage
-	flagset := flag.NewFlagSet("config", flag.ContinueOnError)
+	f := flag.NewFlagSet("config", flag.ContinueOnError)
-	flagset.Usage = func() {
+	f.Usage = func() {
-		fmt.Fprintln(output, Usage)
+		fmt.Fprintln(w, Usage)
 		os.Exit(0)
 	}
 
 	// parse commandline flags
-	flagset.StringP("config", "c", "", "config file")
+	f.StringP("config", "c", "", "config file")
-	flagset.StringP("outdir", "o", "", "directory where to store ads")
+	f.StringP("outdir", "o", "", "directory where to store ads")
-	flagset.IntP("user", "u", 0, "user id")
+	f.IntP("user", "u", 0, "user id")
-	flagset.IntP("limit", "l", 0, "limit ads to be downloaded (default 0, unlimited)")
+	f.IntP("limit", "l", 0, "limit ads to be downloaded (default 0, unlimited)")
-	flagset.BoolP("verbose", "v", false, "be verbose")
+	f.BoolP("verbose", "v", false, "be verbose")
-	flagset.BoolP("debug", "d", false, "enable debug log")
+	f.BoolP("debug", "d", false, "enable debug log")
-	flagset.BoolP("version", "V", false, "show program version")
+	f.BoolP("version", "V", false, "show program version")
-	flagset.BoolP("help", "h", false, "show usage")
+	f.BoolP("help", "h", false, "show usage")
-	flagset.BoolP("manual", "m", false, "show manual")
+	f.BoolP("manual", "m", false, "show manual")
-	flagset.BoolP("force", "f", false, "force")
+	f.BoolP("force", "f", false, "force")
-	flagset.BoolP("ignoreerrors", "", false, "ignore image download HTTP errors")
 
-	if err := flagset.Parse(os.Args[1:]); err != nil {
+	if err := f.Parse(os.Args[1:]); err != nil {
-		return nil, fmt.Errorf("failed to parse program arguments: %w", err)
+		return nil, err
 	}
 
 	// 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")
-	configfile, _ := flagset.GetString("config")
 	home, _ := os.UserHomeDir()
-
 	if configfile != "" {
 		configfiles = []string{configfile}
 	} else {
@@ -183,41 +159,33 @@ func InitConfig(output io.Writer) (*Config, error) {
 
 	// Load the config file[s]
 	for _, cfgfile := range configfiles {
-		path, err := os.Stat(cfgfile)
+		if path, err := os.Stat(cfgfile); !os.IsNotExist(err) {
-
+			if !path.IsDir() {
-		if err != nil {
+				if err := k.Load(file.Provider(cfgfile), toml.Parser()); err != nil {
-			// ignore non-existent files, but bail out on any other errors
+					return nil, errors.New("error loading config file: " + err.Error())
-			if !os.IsNotExist(err) {
+				}
-				return nil, fmt.Errorf("failed to stat config file: %w", err)
-			}
-
-			continue
-		}
-
-		if !path.IsDir() {
-			if err := kloader.Load(file.Provider(cfgfile), toml.Parser()); err != nil {
-				return nil, fmt.Errorf("error loading config file: %w", err)
 			}
 		}
+		// else: we ignore the file if it doesn't exists
 	}
 
 	// env overrides config file
-	if err := kloader.Load(env.Provider("KLEINGEBAECK_", ".", func(s string) string {
+	if err := k.Load(env.Provider("KLEINGEBAECK_", ".", func(s string) string {
-		return strings.ReplaceAll(strings.ToLower(
+		return strings.Replace(strings.ToLower(
-			strings.TrimPrefix(s, "KLEINGEBAECK_")), "_", ".")
+			strings.TrimPrefix(s, "KLEINGEBAECK_")), "_", ".", -1)
 	}), nil); err != nil {
-		return nil, fmt.Errorf("error loading environment: %w", err)
+		return nil, errors.New("error loading environment: " + err.Error())
 	}
 
 	// command line overrides env
-	if err := kloader.Load(posflag.Provider(flagset, ".", kloader), nil); err != nil {
+	if err := k.Load(posflag.Provider(f, ".", k), nil); err != nil {
-		return nil, fmt.Errorf("error loading flags: %w", err)
+		return nil, errors.New("error loading flags: " + err.Error())
 	}
 
 	// fetch values
 	conf := &Config{}
-	if err := kloader.Unmarshal("", &conf); err != nil {
+	if err := k.Unmarshal("", &conf); err != nil {
-		return nil, fmt.Errorf("error unmarshalling: %w", err)
+		return nil, errors.New("error unmarshalling: " + err.Error())
 	}
 
 	// adjust loglevel
@@ -229,7 +197,7 @@ func InitConfig(output io.Writer) (*Config, error) {
 	}
 
 	// are there any args left on commandline? if so threat them as adlinks
-	conf.Adlinks = flagset.Args()
+	conf.Adlinks = f.Args()
 
 	return conf, nil
 }

example.conf

@@ -23,7 +23,6 @@ outdir = "test"
 #Id: {{.Id}}
 #Category: {{.Category}}
 #Condition: {{.Condition}}
-#Type: {{.Type}}
 #Created: {{.Created}}
 
 #{{.Text}}

fetch.go

@@ -19,84 +19,55 @@ package main
 
 import (
 	"errors"
-	"fmt"
 	"io"
 	"log/slog"
 	"net/http"
-	"net/http/cookiejar"
-	"net/url"
 )
 
 // convenient wrapper to fetch some web content
 type Fetcher struct {
-	Config  *Config
+	Config    *Config
-	Client  *http.Client
+	Client    *http.Client
-	Cookies []*http.Cookie
+	Useragent string // FIXME: make configurable
 }
 
-func NewFetcher(conf *Config) (*Fetcher, error) {
+func NewFetcher(c *Config) *Fetcher {
-	jar, err := cookiejar.New(nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create a cookie jar obj: %w", err)
-	}
-
 	return &Fetcher{
-			Client: &http.Client{
+		Client:    &http.Client{Transport: &loggingTransport{}}, // implemented in http.go
-				Transport: &loggingTransport{}, // implemented in http.go
+		Useragent: Useragent,                                    // default in config.go
-				Jar:       jar,
+		Config:    c,
-			},
+	}
-			Config:  conf,
-			Cookies: []*http.Cookie{},
-		},
-		nil
 }
 
 func (f *Fetcher) Get(uri string) (io.ReadCloser, error) {
-	req, err := http.NewRequest(http.MethodGet, uri, http.NoBody)
+	req, err := http.NewRequest("GET", uri, nil)
 	if err != nil {
-		return nil, fmt.Errorf("failed to create a new HTTP request obj: %w", err)
+		return nil, err
 	}
 
-	req.Header.Set("User-Agent", f.Config.UserAgent)
+	req.Header.Set("User-Agent", f.Useragent)
-
-	if len(f.Cookies) > 0 {
-		uriobj, _ := url.Parse(Baseuri)
-
-		slog.Debug("have cookies, sending them",
-			"sample-cookie-name", f.Cookies[0].Name,
-			"sample-cookie-expire", f.Cookies[0].Expires,
-		)
-
-		f.Client.Jar.SetCookies(uriobj, f.Cookies)
-	}
 
 	res, err := f.Client.Do(req)
 	if err != nil {
-		return nil, fmt.Errorf("failed to initiate HTTP request to %s: %w", uri, err)
+		return nil, err
 	}
 
-	if res.StatusCode != http.StatusOK {
+	if res.StatusCode != 200 {
 		return nil, errors.New("could not get page via HTTP")
 	}
 
-	slog.Debug("got cookies?", "cookies", res.Cookies())
-	f.Cookies = res.Cookies()
-
 	return res.Body, nil
 }
 
 // fetch an image
 func (f *Fetcher) Getimage(uri string) (io.ReadCloser, error) {
 	slog.Debug("fetching ad image", "uri", uri)
-
 	body, err := f.Get(uri)
 	if err != nil {
 		if f.Config.IgnoreErrors {
 			slog.Info("Failed to download image, error ignored", "error", err.Error())
-
 			return nil, nil
 		}
-
 		return nil, err
 	}
 

go.mod

@@ -4,38 +4,35 @@ go 1.21
 
 require (
 	astuart.co/goq v1.0.0
-	github.com/corona10/goimagehash v1.1.0
-	github.com/inconshreveable/mousetrap v1.1.0
 	github.com/jarcoal/httpmock v1.3.1
 	github.com/knadh/koanf/parsers/toml v0.1.0
 	github.com/knadh/koanf/providers/confmap v0.1.0
-	github.com/knadh/koanf/providers/env v1.0.0
+	github.com/knadh/koanf/providers/env v0.1.0
-	github.com/knadh/koanf/providers/file v1.1.2
+	github.com/knadh/koanf/providers/file v0.1.0
 	github.com/knadh/koanf/providers/posflag v0.1.0
-	github.com/knadh/koanf/v2 v2.1.2
+	github.com/knadh/koanf/v2 v2.0.1
-	github.com/lmittmann/tint v1.0.7
+	github.com/lmittmann/tint v1.0.4
 	github.com/mattn/go-isatty v0.0.20
-	github.com/spf13/pflag v1.0.6
+	github.com/spf13/pflag v1.0.5
-	github.com/tlinden/yadu v0.1.3
+	github.com/tlinden/yadu v0.1.1
-	golang.org/x/image v0.23.0
+	golang.org/x/sync v0.5.0
-	golang.org/x/sync v0.10.0
 )
 
 require (
 	github.com/PuerkitoBio/goquery v1.5.1 // indirect
-	github.com/alecthomas/repr v0.4.0 // indirect
 	github.com/andybalholm/cascadia v1.1.0 // indirect
+	github.com/corona10/goimagehash v1.1.0 // indirect
 	github.com/fatih/color v1.16.0 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
-	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-colorable v0.1.13 // 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/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
-	golang.org/x/net v0.23.0 // indirect
+	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
-	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/sys v0.14.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 
 )

go.sum

@@ -3,8 +3,6 @@ astuart.co/goq v1.0.0/go.mod h1:+fokcnFrO8Pw2fj8drdStJvzoMFebJH69rw8IC21rno=
 github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg=
 github.com/PuerkitoBio/goquery v1.5.1 h1:PSPBGne8NIUWw+/7vFBV+kG2J/5MOjbzc7154OaKCSE=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
-github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
-github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/andybalholm/cascadia v1.1.0 h1:BuuO6sSfQNFRu1LppgbD25Hr2vLYW25JvxHs5zzsLTo=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
@@ -15,12 +13,8 @@ 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/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
 github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
-github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
-github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
-github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
-github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
-github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jarcoal/httpmock v1.3.1 h1:iUx3whfZWVf3jT01hQTO/Eo5sAYtB2/rqaUuOtpInww=
 github.com/jarcoal/httpmock v1.3.1/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg=
 github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
@@ -29,24 +23,18 @@ github.com/knadh/koanf/parsers/toml v0.1.0 h1:S2hLqS4TgWZYj4/7mI5m1CQQcWurxUz6OD
 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/env v1.0.0 h1:ufePaI9BnWH+ajuxGGiJ8pdTG0uLEUWC7/HDDPGLah0=
+github.com/knadh/koanf/providers/env v0.1.0 h1:LqKteXqfOWyx5Ab9VfGHmjY9BvRXi+clwyZozgVRiKg=
-github.com/knadh/koanf/providers/env v1.0.0/go.mod h1:mzFyRZueYhb37oPmC1HAv/oGEEuyvJDA98r3XAa8Gak=
+github.com/knadh/koanf/providers/env v0.1.0/go.mod h1:RE8K9GbACJkeEnkl8L/Qcj8p4ZyPXZIQ191HJi44ZaQ=
-github.com/knadh/koanf/providers/file v1.1.2 h1:aCC36YGOgV5lTtAFz2qkgtWdeQsgfxUkxDOe+2nQY3w=
+github.com/knadh/koanf/providers/file v0.1.0 h1:fs6U7nrV58d3CFAFh8VTde8TM262ObYf3ODrc//Lp+c=
-github.com/knadh/koanf/providers/file v1.1.2/go.mod h1:/faSBcv2mxPVjFrXck95qeoyoZ5myJ6uxN8OOVNJJCI=
+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.1.2 h1:I2rtLRqXRy1p01m/utEtpZSSA6dcJbgGVuE27kW2PzQ=
+github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g=
-github.com/knadh/koanf/v2 v2.1.2/go.mod h1:Gphfaen0q1Fc1HTgJgSTC4oRX9R2R5ErYMZJy8fLJBo=
+github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLNvY1Dus=
-github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/lmittmann/tint v1.0.4 h1:LeYihpJ9hyGvE0w+K2okPTGUdVLfng1+nDNVR4vWISc=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/lmittmann/tint v1.0.4/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lmittmann/tint v1.0.7 h1:D/0OqWZ0YOGZ6AyC+5Y2kD8PBEzBk6rFHVSfOqCkF9Y=
-github.com/lmittmann/tint v1.0.7/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
-github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 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=
@@ -54,6 +42,8 @@ github.com/maxatome/go-testdeep v1.12.0 h1:Ql7Go8Tg0C1D/uMMX59LAoYK7LffeJQ6X2T04
 github.com/maxatome/go-testdeep v1.12.0/go.mod h1:lPZc/HAcJMP92l7yI6TRz1aZN5URwUBUAfUNvrclaNM=
 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/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
@@ -62,35 +52,35 @@ github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3v
 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.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+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.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/tlinden/yadu v0.1.3 h1:5cRCUmj+l5yvlM2irtpFBIJwVV2DPEgYSaWvF19FtcY=
+github.com/tlinden/yadu v0.0.0-20240118202225-ec3f0b7fc355 h1:EmgK+IGUz2m42bFKteLY5SYJLn/CyBrz6nkgS22K8Bk=
-github.com/tlinden/yadu v0.1.3/go.mod h1:l3bRmHKL9zGAR6pnBHY2HRPxBecf7L74BoBgOOpTcUA=
+github.com/tlinden/yadu v0.0.0-20240118202225-ec3f0b7fc355/go.mod h1:l3bRmHKL9zGAR6pnBHY2HRPxBecf7L74BoBgOOpTcUA=
+github.com/tlinden/yadu v0.1.0 h1:qtCi1jxg392qVRLFyrJ2LYu6/PiKSp1LT02EX+mNLME=
+github.com/tlinden/yadu v0.1.0/go.mod h1:l3bRmHKL9zGAR6pnBHY2HRPxBecf7L74BoBgOOpTcUA=
+github.com/tlinden/yadu v0.1.1 h1:116oEUy9b4PcMF5wLL2dCFA/sn/praYutOnao07MROw=
+github.com/tlinden/yadu v0.1.1/go.mod h1:l3bRmHKL9zGAR6pnBHY2HRPxBecf7L74BoBgOOpTcUA=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/image v0.23.0 h1:HseQ7c2OpPKTPVzNjG5fwJsOTCiiwS4QdsYi5XU6H68=
-golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY=
 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/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
-golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+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-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

http.go

@@ -19,7 +19,6 @@ package main
 
 import (
 	"bytes"
-	"fmt"
 	"io"
 	"log/slog"
 	"math"
@@ -33,20 +32,17 @@ import (
 // easier associated in debug output
 var letters = []rune("ABCDEF0123456789")
 
-const IDLEN int = 8
-
-// retry after HTTP 50x errors or err!=nil
-const RetryCount = 3
-
 func getid() string {
-	b := make([]rune, IDLEN)
+	b := make([]rune, 8)
 	for i := range b {
 		b[i] = letters[rand.Intn(len(letters))]
 	}
-
 	return string(b)
 }
 
+// retry after HTTP 50x errors or err!=nil
+const RetryCount = 3
+
 // used to inject debug log and implement retries
 type loggingTransport struct{}
 
@@ -79,7 +75,6 @@ func drainBody(resp *http.Response) {
 				// unable to copy data? uff!
 				panic(err)
 			}
-
 			resp.Body.Close()
 		}
 	}
@@ -87,8 +82,8 @@ func drainBody(resp *http.Response) {
 
 // the actual logging transport with retries
 func (t *loggingTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	// just required for debugging
+	// just requred for debugging
-	requestid := getid()
+	id := getid()
 
 	// clone the request body, put into request on retry
 	var bodyBytes []byte
@@ -97,16 +92,16 @@ func (t *loggingTransport) RoundTrip(req *http.Request) (*http.Response, error)
 		req.Body = io.NopCloser(bytes.NewBuffer(bodyBytes))
 	}
 
-	slog.Debug("REQUEST", "id", requestid, "uri", req.URL, "host", req.Host)
+	slog.Debug("REQUEST", "id", id, "uri", req.URL, "host", req.Host)
 
 	// first try
 	resp, err := http.DefaultTransport.RoundTrip(req)
 	if err == nil {
-		slog.Debug("RESPONSE", "id", requestid, "status", resp.StatusCode,
+		slog.Debug("RESPONSE", "id", id, "status", resp.StatusCode,
 			"contentlength", resp.ContentLength)
 	}
 
-	// enter retry check and loop, if first req were successful, leave loop immediately
+	// enter retry check and loop, if first req were successfull, leave loop immediately
 	retries := 0
 	for shouldRetry(err, resp) && retries < RetryCount {
 		time.Sleep(backoff(retries))
@@ -123,16 +118,12 @@ func (t *loggingTransport) RoundTrip(req *http.Request) (*http.Response, error)
 		resp, err = http.DefaultTransport.RoundTrip(req)
 
 		if err == nil {
-			slog.Debug("RESPONSE", "id", requestid, "status", resp.StatusCode,
+			slog.Debug("RESPONSE", "id", id, "status", resp.StatusCode,
 				"contentlength", resp.ContentLength, "retry", retries)
 		}
 
 		retries++
 	}
 
-	if err != nil {
+	return resp, err
-		return resp, fmt.Errorf("failed to get HTTP response for %s: %w", req.URL, err)
-	}
-
-	return resp, nil
 }

image.go

@@ -19,17 +19,11 @@ package main
 
 import (
 	"bytes"
-	"fmt"
+	"image/jpeg"
-	"image"
-	_ "image/gif"
-	_ "image/jpeg"
-	_ "image/png"
 	"log/slog"
 	"os"
 	"path/filepath"
 
-	_ "golang.org/x/image/webp"
-
 	"github.com/corona10/goimagehash"
 )
 
@@ -38,16 +32,15 @@ const MaxDistance = 3
 type Image struct {
 	Filename string
 	Hash     *goimagehash.ImageHash
-	Data     *bytes.Reader
+	Data     *bytes.Buffer
-	URI      string
+	Uri      string
-	Mime     string
 }
 
 // used for logging to avoid printing Data
 func (img *Image) LogValue() slog.Value {
 	return slog.GroupValue(
 		slog.String("filename", img.Filename),
-		slog.String("uri", img.URI),
+		slog.String("uri", img.Uri),
 		slog.String("hash", img.Hash.ToString()),
 	)
 }
@@ -55,57 +48,26 @@ func (img *Image) LogValue() slog.Value {
 // holds all images of an ad
 type Cache []*goimagehash.ImageHash
 
-// filename comes from the scraper, it contains directory/base w/o suffix
+func NewImage(buf *bytes.Buffer, filename string, uri string) *Image {
-func NewImage(buf *bytes.Reader, filename, uri string) (*Image, error) {
-	_, imgconfig, err := image.DecodeConfig(buf)
-	if err != nil {
-		return nil, fmt.Errorf("failed to decode image: %w", err)
-	}
-
-	_, err = buf.Seek(0, 0)
-	if err != nil {
-		return nil, fmt.Errorf("failed to seek(0) on image buffer: %w", err)
-	}
-
-	if imgconfig == "jpeg" {
-		// we're  using the  format as file  extension, but  have used
-		// "jpg" in the past, so to be backwards compatible, stay with
-		// it.
-		imgconfig = "jpg"
-	}
-
-	if imgconfig == "" {
-		return nil, fmt.Errorf("failed to process image: unknown or unsupported image format (supported: jpg,png,gif,webp)")
-	}
-
-	filename += "." + imgconfig
-
 	img := &Image{
 		Filename: filename,
-		URI:      uri,
+		Uri:      uri,
 		Data:     buf,
-		Mime:     imgconfig,
 	}
 
-	slog.Debug("image MIME", "mime", img.Mime)
+	return img
-
-	return img, nil
 }
 
 // Calculate diff hash of the image
 func (img *Image) CalcHash() error {
-	jpgdata, format, err := image.Decode(img.Data)
+	jpgdata, err := jpeg.Decode(img.Data)
 	if err != nil {
-		return fmt.Errorf("failed to decode image: %w", err)
+		return err
-	}
-
-	if format == "" {
-		return fmt.Errorf("failed to decode image: unknown or unsupported image format (supported: jpg,png,gif,webp)")
 	}
 
 	hash1, err := goimagehash.DifferenceHash(jpgdata)
 	if err != nil {
-		return fmt.Errorf("failed to calculate diff hash of image: %w", err)
+		return err
 	}
 
 	img.Hash = hash1
@@ -118,18 +80,16 @@ func (img *Image) Similar(hash *goimagehash.ImageHash) bool {
 	distance, err := img.Hash.Distance(hash)
 	if err != nil {
 		slog.Debug("failed to compute diff hash distance", "error", err)
-
 		return false
 	}
 
 	if distance < MaxDistance {
 		slog.Debug("distance computation", "image-A", img.Hash.ToString(),
 			"image-B", hash.ToString(), "distance", distance)
-
 		return true
+	} else {
+		return false
 	}
-
-	return false
 }
 
 // check current image against all known hashes.
@@ -148,7 +108,7 @@ func (img *Image) SimilarExists(cache Cache) bool {
 func ReadImages(addir string, dont bool) (Cache, error) {
 	files, err := os.ReadDir(addir)
 	if err != nil {
-		return nil, fmt.Errorf("failed to read ad directory contents: %w", err)
+		return nil, err
 	}
 
 	cache := Cache{}
@@ -162,30 +122,21 @@ func ReadImages(addir string, dont bool) (Cache, error) {
 		ext := filepath.Ext(file.Name())
 		if !file.IsDir() && (ext == ".jpg" || ext == ".jpeg" || ext == ".JPG" || ext == ".JPEG") {
 			filename := filepath.Join(addir, file.Name())
-
 			data, err := ReadImage(filename)
 			if err != nil {
 				return nil, err
 			}
 
-			reader := bytes.NewReader(data.Bytes())
+			img := NewImage(data, filename, "")
-
+			if err = img.CalcHash(); err != nil {
-			img, err := NewImage(reader, filename, "")
-			if err != nil {
 				return nil, err
 			}
 
-			if err := img.CalcHash(); err != nil {
+			slog.Debug("Caching image from file system", "image", img, "hash", img.Hash.ToString())
-				return nil, err
-			}
-
-			if img.Hash != nil {
-				slog.Debug("Caching image from file system", "image", img, "hash", img.Hash.ToString())
-			}
-
 			cache = append(cache, img.Hash)
 		}
 	}
 
+	//return nil, errors.New("ende")
 	return cache, nil
 }

kleingebaeck.1

@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "KLEINGEBAECK 1"
-.TH KLEINGEBAECK 1 "2025-02-06" "1" "User Commands"
+.TH KLEINGEBAECK 1 "2024-01-22" "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
@@ -152,7 +152,7 @@ kleingebaeck \- kleinanzeigen.de backup tool
 \&    \-l \-\-limit   <num>      Limit the ads to download to <num>, default: load all.
 \&    \-c \-\-config  <file>     Use config file <file> (default: ~/.kleingebaeck).
 \&       \-\-ignoreerrors       Ignore HTTP errors, may lead to incomplete ad backup.
-\&    \-f \-\-force              Overwrite images and ads even if the already exist.
+\&    \-f \-\-force              Download images even if they already exist.
 \&    \-m \-\-manual             Show manual.
 \&    \-h \-\-help               Show usage.
 \&    \-V \-\-version            Show program version.
@@ -174,29 +174,27 @@ well.   We    use   \s-1TOML\s0   as   our    configuration   language.   See
 .PP
 Format is pretty simple:
 .PP
-.Vb 12
+.Vb 10
 \&    user = 1010101
 \&    loglevel = verbose
 \&    outdir = "test"
-\&    useragent = "Mozilla/5.0"
 \&    template = """
 \&    Title: {{.Title}}
 \&    Price: {{.Price}}
-\&    Id: {{.ID}}
+\&    Id: {{.Id}}
 \&    Category: {{.Category}}
 \&    Condition: {{.Condition}}
-\&    Type: {{.Type}}
 \&    Created: {{.Created}}
 \&
 \&    {{.Text}}
 \&    """
 .Ve
 .PP
-Be careful  if you want  to change the  template.  The variable  is a
+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. Also read the \s-1TEMPLATES\s0 section below.
+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
@@ -205,95 +203,6 @@ chars like this:
 .Vb 1
 \&    outdir = \*(AqC:\eData\eAds\*(Aq
 .Ve
-.SH "TEMPLATES"
-.IX Header "TEMPLATES"
-Various parts  of the configuration  can be modified  using templates:
-the output directory, the ad directory and the ad listing itself.
-.SS "\s-1OUTPUT DIR TEMPLATE\s0"
-.IX Subsection "OUTPUT DIR TEMPLATE"
-The config varialbe \f(CW\*(C`outdir\*(C'\fR or the command line parameter \f(CW\*(C`\-o\*(C'\fR take a
-template which may contain:
-.ie n .IP """{{.Year}}""" 4
-.el .IP "\f(CW{{.Year}}\fR" 4
-.IX Item "{{.Year}}"
-.PD 0
-.ie n .IP """{{.Month}}""" 4
-.el .IP "\f(CW{{.Month}}\fR" 4
-.IX Item "{{.Month}}"
-.ie n .IP """{{.Day}}""" 4
-.el .IP "\f(CW{{.Day}}\fR" 4
-.IX Item "{{.Day}}"
-.PD
-.PP
-That way you can create a new output directory for every backup
-run. For example:
-.PP
-.Vb 1
-\&    outdir = "/home/backups/ads\-{{.Year}}\-{{.Month}}\-{{.Day}}"
-.Ve
-.PP
-Or using the command line flag:
-.PP
-.Vb 1
-\&    \-o "/home/backups/ads\-{{.Year}}\-{{.Month}}\-{{.Day}}"
-.Ve
-.PP
-The default value is \f(CW\*(C`.\*(C'\fR \- the current directory.
-.SS "\s-1AD DIRECTORY TEMPLATE\s0"
-.IX Subsection "AD DIRECTORY TEMPLATE"
-The ad directory name can be modified using the following ad values:
-.IP "{{.Price}}" 4
-.IX Item "{{.Price}}"
-.PD 0
-.IP "{{.ID}}" 4
-.IX Item "{{.ID}}"
-.IP "{{.Category}}" 4
-.IX Item "{{.Category}}"
-.IP "{{.Condition}}" 4
-.IX Item "{{.Condition}}"
-.IP "{{.Created}}" 4
-.IX Item "{{.Created}}"
-.IP "{{.Slug}}" 4
-.IX Item "{{.Slug}}"
-.IP "{{.Text}}" 4
-.IX Item "{{.Text}}"
-.PD
-.PP
-It can only be configured in the config file. By default only
-\&\f(CW\*(C`{{.Slug}}\*(C'\fR is being used, this is the title of the ad in url format.
-.SS "\s-1AD TEMPLATE\s0"
-.IX Subsection "AD TEMPLATE"
-The ad listing itself can be modified as well, using the same
-variables as the ad name template above.
-.PP
-This is the default template:
-.PP
-.Vb 8
-\&    Title: {{.Title}}
-\&    Price: {{.Price}}
-\&    Id: {{.ID}}
-\&    Category: {{.Category}}
-\&    Condition: {{.Condition}}
-\&    Type: {{.Type}}
-\&    Created: {{.Created}}
-\&    Expire: {{.Expire}}
-\&    
-\&    {{.Text}}
-.Ve
-.PP
-The config parameter to modify is \f(CW\*(C`template\*(C'\fR. See example.conf in the
-source repository. Please take care, since this is a multiline
-string. This is how it shall look if you modify it:
-.PP
-.Vb 2
-\&    template="""
-\&    Title: {{.Title}}
-\&    
-\&    {{.Text}}
-\&    """
-.Ve
-.PP
-That is, the content between the two \f(CW"""\fR chars is the template.
 .SH "SETUP"
 .IX Header "SETUP"
 To setup the tool, you need to lookup your userid on

kleingebaeck.go

@@ -14,7 +14,7 @@ SYNOPSYS
         -l --limit   <num>      Limit the ads to download to <num>, default: load all.
         -c --config  <file>     Use config file <file> (default: ~/.kleingebaeck).
            --ignoreerrors       Ignore HTTP errors, may lead to incomplete ad backup.
-        -f --force              Overwrite images and ads even if the already exist.
+        -f --force              Download images even if they already exist.
         -m --manual             Show manual.
         -h --help               Show usage.
         -V --version            Show program version.
@@ -39,24 +39,21 @@ CONFIGURATION
         user = 1010101
         loglevel = verbose
         outdir = "test"
-        useragent = "Mozilla/5.0"
         template = """
         Title: {{.Title}}
         Price: {{.Price}}
-        Id: {{.ID}}
+        Id: {{.Id}}
         Category: {{.Category}}
         Condition: {{.Condition}}
-        Type: {{.Type}}
         Created: {{.Created}}
 
         {{.Text}}
         """
 
-    Be careful if you want to change the template. The variable is a
+    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.
-    Also read the TEMPLATES section below.
 
     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
@@ -64,72 +61,6 @@ CONFIGURATION
 
         outdir = 'C:\Data\Ads'
 
-TEMPLATES
-    Various parts of the configuration can be modified using templates: the
-    output directory, the ad directory and the ad listing itself.
-
-  OUTPUT DIR TEMPLATE
-    The config varialbe "outdir" or the command line parameter "-o" take a
-    template which may contain:
-
-    "{{.Year}}"
-    "{{.Month}}"
-    "{{.Day}}"
-
-    That way you can create a new output directory for every backup run. For
-    example:
-
-        outdir = "/home/backups/ads-{{.Year}}-{{.Month}}-{{.Day}}"
-
-    Or using the command line flag:
-
-        -o "/home/backups/ads-{{.Year}}-{{.Month}}-{{.Day}}"
-
-    The default value is "." - the current directory.
-
-  AD DIRECTORY TEMPLATE
-    The ad directory name can be modified using the following ad values:
-
-    {{.Price}}
-    {{.ID}}
-    {{.Category}}
-    {{.Condition}}
-    {{.Created}}
-    {{.Slug}}
-    {{.Text}}
-
-    It can only be configured in the config file. By default only
-    "{{.Slug}}" is being used, this is the title of the ad in url format.
-
-  AD TEMPLATE
-    The ad listing itself can be modified as well, using the same variables
-    as the ad name template above.
-
-    This is the default template:
-
-        Title: {{.Title}}
-        Price: {{.Price}}
-        Id: {{.ID}}
-        Category: {{.Category}}
-        Condition: {{.Condition}}
-        Type: {{.Type}}
-        Created: {{.Created}}
-        Expire: {{.Expire}}
-    
-        {{.Text}}
-
-    The config parameter to modify is "template". See example.conf in the
-    source repository. Please take care, since this is a multiline string.
-    This is how it shall look if you modify it:
-
-        template="""
-        Title: {{.Title}}
-    
-        {{.Text}}
-        """
-
-    That is, the content between the two """ chars is the template.
-
 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:

kleingebaeck.pod

@@ -13,7 +13,7 @@ kleingebaeck - kleinanzeigen.de backup tool
     -l --limit   <num>      Limit the ads to download to <num>, default: load all.
     -c --config  <file>     Use config file <file> (default: ~/.kleingebaeck).
        --ignoreerrors       Ignore HTTP errors, may lead to incomplete ad backup.
-    -f --force              Overwrite images and ads even if the already exist.
+    -f --force              Download images even if they already exist.
     -m --manual             Show manual.
     -h --help               Show usage.
     -V --version            Show program version.
@@ -39,24 +39,22 @@ Format is pretty simple:
     user = 1010101
     loglevel = verbose
     outdir = "test"
-    useragent = "Mozilla/5.0"
     template = """
     Title: {{.Title}}
     Price: {{.Price}}
-    Id: {{.ID}}
+    Id: {{.Id}}
     Category: {{.Category}}
     Condition: {{.Condition}}
-    Type: {{.Type}}
     Created: {{.Created}}
 
     {{.Text}}
     """
 
-Be careful  if you want  to change the  template.  The variable  is a
+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. Also read the TEMPLATES section below.
+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
@@ -64,92 +62,6 @@ chars like this:
 
     outdir = 'C:\Data\Ads'
 
-=head1 TEMPLATES
-
-Various parts  of the configuration  can be modified  using templates:
-the output directory, the ad directory and the ad listing itself.
-
-=head2 OUTPUT DIR TEMPLATE
-
-The config varialbe C<outdir> or the command line parameter C<-o> take a
-template which may contain:
-
-=over
-
-=item C<{{.Year}}>
-
-=item C<{{.Month}}>
-
-=item C<{{.Day}}>
-
-=back
-
-That way you can create a new output directory for every backup
-run. For example:
-
-    outdir = "/home/backups/ads-{{.Year}}-{{.Month}}-{{.Day}}"
-
-Or using the command line flag:
-
-    -o "/home/backups/ads-{{.Year}}-{{.Month}}-{{.Day}}"
-
-The default value is C<.> - the current directory.
-
-=head2 AD DIRECTORY TEMPLATE
-
-The ad directory name can be modified using the following ad values:
-
-=over
-
-=item {{.Price}}
-
-=item {{.ID}}
-
-=item {{.Category}}
-
-=item {{.Condition}}
-
-=item {{.Created}}
-
-=item {{.Slug}}
-
-=item {{.Text}}
-
-=back
-
-It can only be configured in the config file. By default only
-C<{{.Slug}}> is being used, this is the title of the ad in url format.
-
-=head2 AD TEMPLATE
-
-The ad listing itself can be modified as well, using the same
-variables as the ad name template above.
-
-This is the default template:
-
-    Title: {{.Title}}
-    Price: {{.Price}}
-    Id: {{.ID}}
-    Category: {{.Category}}
-    Condition: {{.Condition}}
-    Type: {{.Type}}
-    Created: {{.Created}}
-    Expire: {{.Expire}}
-    
-    {{.Text}}
-
-The config parameter to modify is C<template>. See example.conf in the
-source repository. Please take care, since this is a multiline
-string. This is how it shall look if you modify it:
-
-    template="""
-    Title: {{.Title}}
-    
-    {{.Text}}
-    """
-
-That is, the content between the two C<"""> chars is the template.
-
 =head1 SETUP
 
 To setup the tool, you need to lookup your userid on

main.go

@@ -18,16 +18,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-	"bufio"
 	"errors"
 	"fmt"
 	"io"
 	"log/slog"
 	"os"
-	"runtime"
 	"runtime/debug"
 
-	"github.com/inconshreveable/mousetrap"
 	"github.com/lmittmann/tint"
 	"github.com/tlinden/yadu"
 )
@@ -38,62 +35,38 @@ func main() {
 	os.Exit(Main(os.Stdout))
 }
 
-func init() {
+func Main(w io.Writer) int {
-	// if we're running on Windows  AND if the user double clicked the
-	// exe  file from explorer, we  tell them and then  wait until any
-	// key has been hit, which  will make the cmd window disappear and
-	// thus give the user time to read it.
-	if runtime.GOOS == "windows" {
-		if mousetrap.StartedByExplorer() {
-			fmt.Println("Do no double click kleingebaeck.exe!")
-			fmt.Println("Please open a command shell and run it from there.")
-			fmt.Println()
-			fmt.Print("Press any key to quit: ")
-			_, err := bufio.NewReader(os.Stdin).ReadString('\n')
-			if err != nil {
-				panic(err)
-			}
-		}
-	}
-}
-
-func Main(output io.Writer) int {
 	logLevel := &slog.LevelVar{}
 	opts := &tint.Options{
 		Level:     logLevel,
 		AddSource: false,
-		ReplaceAttr: func(groups []string, attr slog.Attr) slog.Attr {
+		ReplaceAttr: func(groups []string, a slog.Attr) slog.Attr {
 			// Remove time from the output
-			if attr.Key == slog.TimeKey {
+			if a.Key == slog.TimeKey {
 				return slog.Attr{}
 			}
-
+			return a
-			return attr
 		},
 		NoColor: IsNoTty(),
 	}
 
 	logLevel.Set(LevelNotice)
-
+	handler := tint.NewHandler(w, opts)
-	handler := tint.NewHandler(output, opts)
 	logger := slog.New(handler)
-
 	slog.SetDefault(logger)
 
-	conf, err := InitConfig(output)
+	conf, err := InitConfig(w)
 	if err != nil {
 		return Die(err)
 	}
 
 	if conf.Showversion {
-		fmt.Fprintf(output, "This is kleingebaeck version %s\n", VERSION)
+		fmt.Fprintf(w, "This is kleingebaeck version %s\n", VERSION)
-
 		return 0
 	}
 
 	if conf.Showhelp {
-		fmt.Fprintln(output, Usage)
+		fmt.Fprintln(w, Usage)
-
 		return 0
 	}
 
@@ -102,7 +75,6 @@ func Main(output io.Writer) int {
 		if err != nil {
 			return Die(err)
 		}
-
 		return 0
 	}
 
@@ -120,8 +92,7 @@ func Main(output io.Writer) int {
 		}
 
 		logLevel.Set(slog.LevelDebug)
-
+		handler := yadu.NewHandler(w, opts)
-		handler := yadu.NewHandler(output, opts)
 		debuglogger := slog.New(handler).With(
 			slog.Group("program_info",
 				slog.Int("pid", os.Getpid()),
@@ -134,23 +105,15 @@ func Main(output io.Writer) int {
 	slog.Debug("config", "conf", conf)
 
 	// prepare output dir
-	outdir, err := OutDirName(conf)
+	err = Mkdir(conf.Outdir)
 	if err != nil {
 		return Die(err)
 	}
-	conf.Outdir = outdir
 
 	// used for all HTTP requests
-	fetch, err := NewFetcher(conf)
+	fetch := NewFetcher(conf)
-	if err != nil {
-		return Die(err)
-	}
 
-	// setup ad dir registry, needed to check for duplicates
+	if len(conf.Adlinks) >= 1 {
-	DirsVisited = make(map[string]int)
-
-	switch {
-	case len(conf.Adlinks) >= 1:
 		// directly backup ad listing[s]
 		for _, uri := range conf.Adlinks {
 			err := ScrapeAd(fetch, uri)
@@ -158,27 +121,25 @@ func Main(output io.Writer) int {
 				return Die(err)
 			}
 		}
-	case conf.User > 0:
+	} else if conf.User > 0 {
 		// backup all ads of the given user (via config or cmdline)
 		err := ScrapeUser(fetch)
 		if err != nil {
 			return Die(err)
 		}
-	default:
+	} else {
 		return Die(errors.New("invalid or no user id or no ad link specified"))
 	}
 
 	if conf.StatsCountAds > 0 {
 		adstr := "ads"
-
 		if conf.StatsCountAds == 1 {
 			adstr = "ad"
 		}
-
+		fmt.Fprintf(w, "Successfully downloaded %d %s with %d images to %s.\n",
-		fmt.Fprintf(output, "Successfully downloaded %d %s with %d images to %s.\n",
 			conf.StatsCountAds, adstr, conf.StatsCountImages, conf.Outdir)
 	} else {
-		fmt.Fprintf(output, "No ads found.")
+		fmt.Fprintf(w, "No ads found.")
 	}
 
 	return 0
@@ -186,6 +147,5 @@ func Main(output io.Writer) int {
 
 func Die(err error) int {
 	slog.Error("Failure", "error", err.Error())
-
 	return 1
 }

main_test.go

@@ -21,7 +21,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"net/http"
 	"os"
 	"strings"
 	"testing"
@@ -43,7 +42,7 @@ const LISTTPL string = `<!DOCTYPE html>
 {{ range . }}
      <h2 class="text-module-begin">
         <a class="ellipsis"
-           href="/s-anzeige/{{ .Slug }}/{{ .ID }}">{{ .Title }}</a>
+           href="/s-anzeige/{{ .Slug }}/{{ .Id }}">{{ .Title }}</a>
      </h2>
 {{ end }}
   </body>
@@ -182,13 +181,13 @@ var tests = []Tests{
 	{
 		name:     "download-all-ads",
 		args:     base + " -o t/out -u 1",
-		expect:   "Successfully downloaded 7 ads with 16 images to t/out",
+		expect:   "Successfully downloaded 6 ads with 12 images to t/out",
 		exitcode: 0,
 	},
 	{
 		name:     "download-all-ads-using-config",
 		args:     "kleingebaeck -c t/fullconfig.conf",
-		expect:   "Successfully downloaded 7 ads with 16 images to t/out",
+		expect:   "Successfully downloaded 6 ads with 12 images to t/out",
 		exitcode: 0,
 	},
 }
@@ -247,7 +246,7 @@ var invalidtests = []Tests{
 type AdConfig struct {
 	Title     string
 	Slug      string
-	ID        string
+	Id        string
 	Price     string
 	Category  string
 	Condition string
@@ -256,83 +255,71 @@ type AdConfig struct {
 	Images    []string // files in ./t/
 }
 
-// used to generate ad listings returned by httpmock using templates
 var adsrc = []AdConfig{
 	{
 		Title: "First Ad",
-		ID:    "1", Price: "5€",
+		Id:    "1", Price: "5€",
 		Category:  "Klimbim",
 		Text:      "Thing to sale",
 		Slug:      "first-ad",
-		Condition: "Sehr Gut",
+		Condition: "works",
 		Created:   "Yesterday",
 		Images:    []string{"t/1.jpg", "t/2.jpg"},
 	},
 	{
 		Title: "Secnd Ad",
-		ID:    "2", Price: "5€",
+		Id:    "2", Price: "5€",
 		Category:  "Kram",
 		Text:      "Thing to sale",
 		Slug:      "second-ad",
-		Condition: "Gut",
+		Condition: "works",
 		Created:   "Yesterday",
 		Images:    []string{"t/1.jpg", "t/2.jpg"},
 	},
 	{
 		Title:     "Third Ad",
-		ID:        "3",
+		Id:        "3",
 		Price:     "5€",
 		Category:  "Kuddelmuddel",
 		Text:      "Thing to sale",
 		Slug:      "third-ad",
-		Condition: "In Ordnung",
+		Condition: "works",
 		Created:   "Yesterday",
 		Images:    []string{"t/1.jpg", "t/2.jpg"},
 	},
 	{
 		Title:     "Forth Ad",
-		ID:        "4",
+		Id:        "4",
 		Price:     "5€",
 		Category:  "Krempel",
 		Text:      "Thing to sale",
 		Slug:      "fourth-ad",
-		Condition: "Neu",
+		Condition: "works",
 		Created:   "Yesterday",
 		Images:    []string{"t/1.jpg", "t/2.jpg"},
 	},
 	{
 		Title:     "Fifth Ad",
-		ID:        "5",
+		Id:        "5",
 		Price:     "5€",
 		Category:  "Kladderadatsch",
 		Text:      "Thing to sale",
 		Slug:      "fifth-ad",
-		Condition: "Sehr Gut",
+		Condition: "works",
 		Created:   "Yesterday",
 		Images:    []string{"t/1.jpg", "t/2.jpg"},
 	},
 	{
 		Title:     "Sixth Ad",
-		ID:        "6",
+		Id:        "6",
 		Price:     "5€",
 		Category:  "Klunker",
 		Text:      "Thing to sale",
 		Slug:      "sixth-ad",
-		Condition: "Sehr Gut",
+		Condition: "works",
 		Created:   "Yesterday",
 		Images:    []string{"t/1.jpg", "t/2.jpg"},
 	},
-	{
-		Title:     "Ad with multiple img formats",
-		ID:        "7",
-		Price:     "5€",
-		Category:  "Klunker",
-		Text:      "Thing to sale",
-		Slug:      "seventh-ad",
-		Condition: "Sehr Gut",
-		Created:   "Yesterday",
-		Images:    []string{"t/1.png", "t/1.gif", "t/1.webp", "t/1.jpg"},
-	},
 }
 
 // An  Adsource  is used  to  construct  a  httpmock responder  for  a
@@ -346,17 +333,17 @@ type Adsource struct {
 }
 
 // Render a HTML template for an adlisting or an ad
-func GetTemplate(adconfigs []AdConfig, adconfig *AdConfig, htmltemplate string) string {
+func GetTemplate(l []AdConfig, a AdConfig, htmltemplate string) string {
 	tmpl, err := tpl.New("template").Parse(htmltemplate)
 	if err != nil {
 		panic(err)
 	}
 
 	var out bytes.Buffer
-	if adconfig.ID == "" {
+	if len(a.Id) == 0 {
-		err = tmpl.Execute(&out, adconfigs)
+		err = tmpl.Execute(&out, l)
 	} else {
-		err = tmpl.Execute(&out, adconfig)
+		err = tmpl.Execute(&out, a)
 	}
 
 	if err != nil {
@@ -375,7 +362,7 @@ func InitValidSources() []Adsource {
 
 	// valid ad listing page 2
 	list2 := []AdConfig{
-		adsrc[3], adsrc[4], adsrc[5], adsrc[6],
+		adsrc[3], adsrc[4], adsrc[5],
 	}
 
 	// valid ad listing page 3, which is empty
@@ -388,24 +375,25 @@ func InitValidSources() []Adsource {
 	ads := []Adsource{
 		{
 			uri:     fmt.Sprintf("%s%s?userId=1", Baseuri, Listuri),
-			content: GetTemplate(list1, &empty, LISTTPL),
+			content: GetTemplate(list1, empty, LISTTPL),
 		},
 		{
 			uri:     fmt.Sprintf("%s%s?userId=1&pageNum=2", Baseuri, Listuri),
-			content: GetTemplate(list2, &empty, LISTTPL),
+			content: GetTemplate(list2, empty, LISTTPL),
 		},
 		{
 			uri:     fmt.Sprintf("%s%s?userId=1&pageNum=3", Baseuri, Listuri),
-			content: GetTemplate(list3, &empty, LISTTPL),
+			content: GetTemplate(list3, empty, LISTTPL),
 		},
 	}
 
 	// prepare urls for the ads
 	for _, ad := range adsrc {
 		ads = append(ads, Adsource{
-			uri:     fmt.Sprintf("%s/s-anzeige/%s/%s", Baseuri, ad.Slug, ad.ID),
+			uri:     fmt.Sprintf("%s/s-anzeige/%s/%s", Baseuri, ad.Slug, ad.Id),
-			content: GetTemplate(nil, &ad, ADTPL),
+			content: GetTemplate(nil, ad, ADTPL),
 		})
+		//panic(GetTemplate(nil, ad, ADTPL))
 	}
 
 	return ads
@@ -417,28 +405,28 @@ func InitInvalidSources() []Adsource {
 		{
 			// valid ad page but without content
 			uri:     fmt.Sprintf("%s/s-anzeige/empty/1", Baseuri),
-			content: GetTemplate(nil, &empty, EMPTYPAGE),
+			content: GetTemplate(nil, empty, EMPTYPAGE),
 		},
 		{
 			// some random foreign webpage
 			uri:     INVALIDURI,
-			content: GetTemplate(nil, &empty, "<html>foo</html>"),
+			content: GetTemplate(nil, empty, "<html>foo</html>"),
 		},
 		{
 			// some invalid page path
 			uri:     fmt.Sprintf("%s/anzeige/name/1", Baseuri),
-			content: GetTemplate(nil, &empty, "<html></html>"),
+			content: GetTemplate(nil, empty, "<html></html>"),
 		},
 		{
 			// some none-ad page
 			uri:     fmt.Sprintf("%s/anzeige/name/1/foo/bar", Baseuri),
-			content: GetTemplate(nil, &empty, "<html>HTTP 404: /eine-anzeige/ does not exist!</html>"),
+			content: GetTemplate(nil, empty, "<html>HTTP 404: /eine-anzeige/ does not exist!</html>"),
 			status:  404,
 		},
 		{
 			// valid ad page but 503
 			uri:     fmt.Sprintf("%s/s-anzeige/503/1", Baseuri),
-			content: GetTemplate(nil, &empty, "<html>HTTP 503: service unavailable</html>"),
+			content: GetTemplate(nil, empty, "<html>HTTP 503: service unavailable</html>"),
 			status:  503,
 		},
 	}
@@ -458,48 +446,43 @@ func GetImage(path string) []byte {
 
 // setup httpmock
 func SetIntercept(ads []Adsource) {
-	headers := http.Header{}
+	for _, ad := range ads {
-	headers.Add("Set-Cookie", "session=permanent")
+		if ad.status == 0 {
-
+			ad.status = 200
-	for _, advertisement := range ads {
-		if advertisement.status == 0 {
-			advertisement.status = 200
 		}
 
-		httpmock.RegisterResponder("GET", advertisement.uri,
+		httpmock.RegisterResponder("GET", ad.uri,
-			httpmock.NewStringResponder(advertisement.status, advertisement.content).HeaderAdd(headers))
+			httpmock.NewStringResponder(ad.status, ad.content))
 	}
 
 	// we just use 2 images, put this here
-	for _, image := range []string{"t/1.jpg", "t/2.jpg", "t/1.png", "t/1.gif", "t/1.webp"} {
+	for _, image := range []string{"t/1.jpg", "t/2.jpg"} {
 		httpmock.RegisterResponder("GET", image,
-			httpmock.NewBytesResponder(200, GetImage(image)).HeaderAdd(headers))
+			httpmock.NewBytesResponder(200, GetImage(image)))
 	}
+
 }
 
-func VerifyAd(advertisement *AdConfig) error {
+func VerifyAd(ad AdConfig) error {
-	body := advertisement.Title + advertisement.Price + advertisement.ID + "Kleinanzeigen => " +
+	body := ad.Title + ad.Price + ad.Id + "Kleinanzeigen => " +
-		advertisement.Category + advertisement.Condition + advertisement.Created
+		ad.Category + ad.Condition + ad.Created
 
 	// prepare ad dir name using DefaultAdNameTemplate
 	c := Config{Adnametemplate: "{{ .Slug }}"}
-	adstruct := Ad{Slug: advertisement.Slug, ID: advertisement.ID}
+	adstruct := Ad{Slug: ad.Slug, Id: ad.Id}
-
 	addir, err := AdDirName(&c, &adstruct)
 	if err != nil {
 		return err
 	}
 
 	file := fmt.Sprintf("t/out/%s/Adlisting.txt", addir)
-
 	content, err := os.ReadFile(file)
 	if err != nil {
-		return fmt.Errorf("unable to read adlisting file: %w", err)
+		return err
 	}
 
 	if body != strings.TrimSpace(string(content)) {
 		msg := fmt.Sprintf("ad content doesn't match.\nExpect: %s\n   Got: %s\n", body, content)
-
 		return errors.New(msg)
 	}
 
@@ -517,28 +500,27 @@ func TestMain(t *testing.T) {
 	SetIntercept(InitValidSources())
 
 	// run commandline tests
-	for _, test := range tests {
+	for _, tt := range tests {
 		var buf bytes.Buffer
-
+		os.Args = strings.Split(tt.args, " ")
-		os.Args = strings.Split(test.args, " ")
 
 		ret := Main(&buf)
 
-		if ret != test.exitcode {
+		if ret != tt.exitcode {
 			t.Errorf("%s with cmd <%s> did not exit with %d but %d",
-				test.name, test.args, test.exitcode, ret)
+				tt.name, tt.args, tt.exitcode, ret)
 		}
 
-		if !strings.Contains(buf.String(), test.expect) {
+		if !strings.Contains(buf.String(), tt.expect) {
 			t.Errorf("%s with cmd <%s> output did not match.\nExpect: %s\n   Got: %s\n",
-				test.name, test.args, test.expect, buf.String())
+				tt.name, tt.args, tt.expect, buf.String())
 		}
 	}
 
 	// verify if downloaded ads match
 	for _, ad := range adsrc {
-		if err := VerifyAd(&ad); err != nil {
+		if err := VerifyAd(ad); err != nil {
-			t.Error(err.Error())
+			t.Errorf(err.Error())
 		}
 	}
 }
@@ -554,21 +536,20 @@ func TestMainInvalids(t *testing.T) {
 	SetIntercept(InitInvalidSources())
 
 	// run commandline tests
-	for _, test := range invalidtests {
+	for _, tt := range invalidtests {
 		var buf bytes.Buffer
-
+		os.Args = strings.Split(tt.args, " ")
-		os.Args = strings.Split(test.args, " ")
 
 		ret := Main(&buf)
 
-		if ret != test.exitcode {
+		if ret != tt.exitcode {
 			t.Errorf("%s with cmd <%s> did not exit with %d but %d",
-				test.name, test.args, test.exitcode, ret)
+				tt.name, tt.args, tt.exitcode, ret)
 		}
 
-		if !strings.Contains(buf.String(), test.expect) {
+		if !strings.Contains(buf.String(), tt.expect) {
 			t.Errorf("%s with cmd <%s> output did not match.\nExpect: %s\n   Got: %s\n",
-				test.name, test.args, test.expect, buf.String())
+				tt.name, tt.args, tt.expect, buf.String())
 		}
 	}
 }

mkrel.sh

@@ -22,12 +22,7 @@ freebsd/amd64
 linux/amd64
 netbsd/amd64
 openbsd/amd64
-windows/amd64
+windows/amd64"
-freebsd/arm64
-linux/arm64
-netbsd/arm64
-openbsd/arm64
-windows/arm64"
 
 tool="$1"
 version="$2"

scrape.go

@@ -19,13 +19,11 @@ package main
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"log/slog"
 	"path/filepath"
-	"slices"
-	"strconv"
 	"strings"
-	"time"
 
 	"astuart.co/goq"
 	"golang.org/x/sync/errgroup"
@@ -44,9 +42,7 @@ func ScrapeUser(fetch *Fetcher) error {
 
 	for {
 		var index Index
-
 		slog.Debug("fetching page", "uri", uri)
-
 		body, err := fetch.Get(uri)
 		if err != nil {
 			return err
@@ -55,7 +51,7 @@ func ScrapeUser(fetch *Fetcher) error {
 
 		err = goq.NewDecoder(body).Decode(&index)
 		if err != nil {
-			return fmt.Errorf("failed to goquery decode HTML index body: %w", err)
+			return err
 		}
 
 		if len(index.Links) == 0 {
@@ -70,16 +66,16 @@ func ScrapeUser(fetch *Fetcher) error {
 		}
 
 		page++
-		uri = baseuri + "&pageNum=" + strconv.Itoa(page)
+		uri = baseuri + "&pageNum=" + fmt.Sprintf("%d", page)
 	}
 
-	for index, adlink := range adlinks {
+	for i, adlink := range adlinks {
 		err := ScrapeAd(fetch, Baseuri+adlink)
 		if err != nil {
 			return err
 		}
 
-		if fetch.Config.Limit > 0 && index == fetch.Config.Limit-1 {
+		if fetch.Config.Limit > 0 && i == fetch.Config.Limit-1 {
 			break
 		}
 	}
@@ -89,20 +85,18 @@ func ScrapeUser(fetch *Fetcher) error {
 
 // scrape an ad. uri is the full uri of the ad, dir is the basedir
 func ScrapeAd(fetch *Fetcher, uri string) error {
-	advertisement := &Ad{}
+	ad := &Ad{}
 
 	// extract slug and id from uri
 	uriparts := strings.Split(uri, "/")
-	if len(uriparts) < SlugURIPartNum {
+	if len(uriparts) < 6 {
-		return fmt.Errorf("invalid uri: %s", uri)
+		return errors.New("invalid uri: " + uri)
 	}
-
+	ad.Slug = uriparts[4]
-	advertisement.Slug = uriparts[4]
+	ad.Id = uriparts[5]
-	advertisement.ID = uriparts[5]
 
 	// get the ad
 	slog.Debug("fetching ad page", "uri", uri)
-
 	body, err := fetch.Get(uri)
 	if err != nil {
 		return err
@@ -110,62 +104,36 @@ func ScrapeAd(fetch *Fetcher, uri string) error {
 	defer body.Close()
 
 	// extract ad contents with goquery/goq
-	err = goq.NewDecoder(body).Decode(&advertisement)
+	err = goq.NewDecoder(body).Decode(&ad)
-	if err != nil {
-		return fmt.Errorf("failed to goquery decode HTML ad body: %w", err)
-	}
-
-	if len(advertisement.CategoryTree) > 0 {
-		advertisement.Category = strings.Join(advertisement.CategoryTree, " => ")
-	}
-
-	if advertisement.Incomplete() {
-		slog.Debug("got ad", "ad", advertisement)
-
-		return fmt.Errorf("could not extract ad data from page, got empty struct")
-	}
-
-	for _, detail := range advertisement.Details {
-		if slices.Contains(CONDITIONS, detail) {
-			advertisement.Condition = detail
-		} else {
-			advertisement.Type = detail
-		}
-
-	}
-
-	advertisement.CalculateExpire()
-
-	// prepare ad dir name
-	addir, err := AdDirName(fetch.Config, advertisement)
 	if err != nil {
 		return err
 	}
 
-	proceed := CheckAdVisited(fetch.Config, addir)
+	if len(ad.CategoryTree) > 0 {
-	if !proceed {
+		ad.Category = strings.Join(ad.CategoryTree, " => ")
-		return nil
 	}
 
+	if ad.Incomplete() {
+		slog.Debug("got ad", "ad", ad)
+		return errors.New("could not extract ad data from page, got empty struct")
+	}
+
+	ad.CalculateExpire()
+
 	// write listing
-	err = WriteAd(fetch.Config, advertisement, addir)
+	addir, err := WriteAd(fetch.Config, ad)
 	if err != nil {
 		return err
 	}
 
-	// tell the user
+	slog.Debug("extracted ad listing", "ad", ad)
-	slog.Debug("extracted ad listing", "ad", advertisement)
 
-	// stats
 	fetch.Config.IncrAds()
 
-	// register for later checks
+	return ScrapeImages(fetch, ad, addir)
-	DirsVisited[addir] = 1
-
-	return ScrapeImages(fetch, advertisement, addir)
 }
 
-func ScrapeImages(fetch *Fetcher, advertisement *Ad, addir string) error {
+func ScrapeImages(fetch *Fetcher, ad *Ad, addir string) error {
 	// fetch images
 	img := 1
 	adpath := filepath.Join(fetch.Config.Outdir, addir)
@@ -176,39 +144,26 @@ func ScrapeImages(fetch *Fetcher, advertisement *Ad, addir string) error {
 		return err
 	}
 
-	egroup := new(errgroup.Group)
+	g := new(errgroup.Group)
 
-	for _, imguri := range advertisement.Images {
+	for _, imguri := range ad.Images {
 		imguri := imguri
-
+		file := filepath.Join(adpath, fmt.Sprintf("%d.jpg", img))
-		// we append the suffix later in NewImage() based on image format
+		g.Go(func() error {
-		basefilename := filepath.Join(adpath, fmt.Sprintf("%d", img))
-
-		egroup.Go(func() error {
-			// wait a little
-
-			throttle := GetThrottleTime()
-			time.Sleep(throttle)
-
 			body, err := fetch.Getimage(imguri)
 			if err != nil {
 				return err
 			}
 
 			buf := new(bytes.Buffer)
-
 			_, err = buf.ReadFrom(body)
-			if err != nil {
-				return fmt.Errorf("failed to read from image buffer: %w", err)
-			}
-
-			reader := bytes.NewReader(buf.Bytes())
-
-			image, err := NewImage(reader, basefilename, imguri)
 			if err != nil {
 				return err
 			}
 
+			buf2 := buf.Bytes() // needed for image writing
+
+			image := NewImage(buf, "", imguri)
 			err = image.CalcHash()
 			if err != nil {
 				return err
@@ -216,34 +171,27 @@ func ScrapeImages(fetch *Fetcher, advertisement *Ad, addir string) error {
 
 			if !fetch.Config.ForceDownload {
 				if image.SimilarExists(cache) {
-					slog.Debug("similar image exists, not written", "uri", image.URI)
+					slog.Debug("similar image exists, not written", "uri", image.Uri)
-
 					return nil
 				}
 			}
 
-			_, err = reader.Seek(0, 0)
+			err = WriteImage(file, buf2)
-			if err != nil {
-				return fmt.Errorf("failed to seek(0) on image reader: %w", err)
-			}
-
-			err = WriteImage(image.Filename, reader)
 			if err != nil {
 				return err
 			}
 
-			slog.Debug("wrote image", "image", image, "size", buf.Len(), "throttle", throttle)
+			slog.Debug("wrote image", "image", image, "size", len(buf2))
-
 			return nil
 		})
 		img++
 	}
 
-	if err := egroup.Wait(); err != nil {
+	if err := g.Wait(); err != nil {
-		return fmt.Errorf("failed to finalize error waitgroup: %w", err)
+		return err
 	}
 
-	fetch.Config.IncrImgs(len(advertisement.Images))
+	fetch.Config.IncrImgs(len(ad.Images))
 
 	return nil
 }

store.go

@@ -26,102 +26,77 @@ import (
 	"runtime"
 	"strings"
 	tpl "text/template"
-	"time"
 )
 
-type OutdirData struct {
+func AdDirName(c *Config, ad *Ad) (string, error) {
-	Year, Day, Month string
+	tmpl, err := tpl.New("adname").Parse(c.Adnametemplate)
-}
-
-func OutDirName(conf *Config) (string, error) {
-	tmpl, err := tpl.New("outdir").Parse(conf.Outdir)
 	if err != nil {
-		return "", fmt.Errorf("failed to parse outdir template: %w", err)
+		return "", err
 	}
 
 	buf := bytes.Buffer{}
-
+	err = tmpl.Execute(&buf, ad)
-	now := time.Now()
-	data := OutdirData{
-		Year:  now.Format("2006"),
-		Month: now.Format("02"),
-		Day:   now.Format("01"),
-	}
-
-	err = tmpl.Execute(&buf, data)
 	if err != nil {
-		return "", fmt.Errorf("failed to execute outdir template: %w", err)
+		return "", err
 	}
 
 	return buf.String(), nil
 }
 
-func AdDirName(conf *Config, advertisement *Ad) (string, error) {
+func WriteAd(c *Config, ad *Ad) (string, error) {
-	tmpl, err := tpl.New("adname").Parse(conf.Adnametemplate)
+	// prepare ad dir name
+	addir, err := AdDirName(c, ad)
 	if err != nil {
-		return "", fmt.Errorf("failed to parse adname template: %w", err)
+		return "", err
 	}
 
-	buf := bytes.Buffer{}
-
-	err = tmpl.Execute(&buf, advertisement)
-	if err != nil {
-		return "", fmt.Errorf("failed to execute adname template: %w", err)
-	}
-
-	return buf.String(), nil
-}
-
-func WriteAd(conf *Config, advertisement *Ad, addir string) error {
 	// prepare output dir
-	dir := filepath.Join(conf.Outdir, addir)
+	dir := filepath.Join(c.Outdir, addir)
-
+	err = Mkdir(dir)
-	err := Mkdir(dir)
 	if err != nil {
-		return err
+		return "", err
 	}
 
 	// write ad file
 	listingfile := filepath.Join(dir, "Adlisting.txt")
-
+	f, err := os.Create(listingfile)
-	listingfd, err := os.Create(listingfile)
 	if err != nil {
-		return fmt.Errorf("failed to create Adlisting.txt: %w", err)
+		return "", err
 	}
-	defer listingfd.Close()
+	defer f.Close()
 
-	if runtime.GOOS == WIN {
+	if runtime.GOOS == "windows" {
-		advertisement.Text = strings.ReplaceAll(advertisement.Text, "<br/>", "\r\n")
+		ad.Text = strings.ReplaceAll(ad.Text, "<br/>", "\r\n")
 	} else {
-		advertisement.Text = strings.ReplaceAll(advertisement.Text, "<br/>", "\n")
+		ad.Text = strings.ReplaceAll(ad.Text, "<br/>", "\n")
 	}
 
-	tmpl, err := tpl.New("adlisting").Parse(conf.Template)
+	tmpl, err := tpl.New("adlisting").Parse(c.Template)
 	if err != nil {
-		return fmt.Errorf("failed to parse adlisting template: %w", err)
+		return "", err
 	}
 
-	err = tmpl.Execute(listingfd, advertisement)
+	err = tmpl.Execute(f, ad)
 	if err != nil {
-		return fmt.Errorf("failed to execute adlisting template: %w", err)
+		return "", err
 	}
 
 	slog.Info("wrote ad listing", "listingfile", listingfile)
 
-	return nil
+	return addir, nil
 }
 
-func WriteImage(filename string, reader *bytes.Reader) error {
+func WriteImage(filename string, buf []byte) error {
 	file, err := os.Create(filename)
 	if err != nil {
-		return fmt.Errorf("failed to open image file: %w", err)
+		return err
 	}
 	defer file.Close()
 
-	_, err = reader.WriteTo(file)
+	_, err = file.Write(buf)
 
 	if err != nil {
-		return fmt.Errorf("failed to write to image file: %w", err)
+		return err
 	}
 
 	return nil
@@ -136,12 +111,12 @@ func ReadImage(filename string) (*bytes.Buffer, error) {
 
 	data, err := os.ReadFile(filename)
 	if err != nil {
-		return nil, fmt.Errorf("failed to read image file: %w", err)
+		return nil, err
 	}
 
 	_, err = buf.Write(data)
 	if err != nil {
-		return nil, fmt.Errorf("failed to write image into buffer: %w", err)
+		return nil, err
 	}
 
 	return &buf, nil
@@ -149,29 +124,8 @@ func ReadImage(filename string) (*bytes.Buffer, error) {
 
 func fileExists(filename string) bool {
 	info, err := os.Stat(filename)
-
+	if os.IsNotExist(err) {
-	if err != nil {
-		// return false on any error
 		return false
 	}
-
 	return !info.IsDir()
 }
-
-// check if  an addir has  already been  processed by current  run and
-// decide what to do
-func CheckAdVisited(conf *Config, adname string) bool {
-	if Exists(DirsVisited, adname) {
-		if conf.ForceDownload {
-			slog.Warn("an ad with the same name has already been downloaded, overwriting", "addir", adname)
-			return true
-		}
-
-		// don't overwrite
-		slog.Warn("an ad with the same name has already been downloaded, skipping (use -f to overwrite)", "addir", adname)
-		return false
-	}
-
-	// overwrite
-	return true
-}

store_test.go

@@ -1,39 +0,0 @@
-/*
-Copyright © 2023-2024 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"
-	"testing"
-)
-
-// this is  a weird thing.  WriteImage() is being called  in scrape.go
-// which is  being tested by  TestMain() in main_test.go.  However, it
-// doesn't  show up  in the  coverage report  for unknown  reasons, so
-// here's a single test for it
-func TestWriteImage(t *testing.T) {
-	t.Parallel()
-
-	reader := bytes.NewReader([]byte{1, 2, 3, 4, 5, 6, 7, 8})
-	file := "t/out/t.jpg"
-
-	err := WriteImage(file, reader)
-	if err != nil {
-		t.Errorf("Could not write mock image to %s: %s", file, err.Error())
-	}
-}

t/config-empty.conf

@@ -1,6 +1,6 @@
 # empty config for Main() unit tests to force unit tests NOT to use an
 # eventually existing ~/.kleingebaeck!
 template="""
-{{.Title}}{{.Price}}{{.ID}}{{.Category}}{{.Condition}}{{.Created}}
+{{.Title}}{{.Price}}{{.Id}}{{.Category}}{{.Condition}}{{.Created}}
 """
 

t/fullconfig.conf

@@ -2,5 +2,5 @@ user = 1
 loglevel = "verbose"
 outdir = "t/out"
 template="""
-{{.Title}}{{.Price}}{{.ID}}{{.Category}}{{.Condition}}{{.Created}}
+{{.Title}}{{.Price}}{{.Id}}{{.Category}}{{.Condition}}{{.Created}}
 """

t/httproot/templates/render.sh

@@ -1,7 +1,5 @@
 #!/bin/sh -x
 base="../kleinanzeigen"
-
-rm -rf $base
 mkdir -p $base
 
 echo "Generating /s-bestandsliste.html"

util.go

@@ -1,5 +1,5 @@
 /*
-Copyright © 2023-2024 Thomas von Dein
+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
@@ -20,21 +20,18 @@ package main
 import (
 	"bytes"
 	"errors"
-	"fmt"
-	"math/rand"
 	"os"
 	"os/exec"
 	"runtime"
-	"time"
 
 	"github.com/mattn/go-isatty"
 )
 
 func Mkdir(dir string) error {
 	if _, err := os.Stat(dir); errors.Is(err, os.ErrNotExist) {
-		err := os.MkdirAll(dir, os.ModePerm)
+		err := os.Mkdir(dir, os.ModePerm)
 		if err != nil {
-			return fmt.Errorf("failed to create directory %s: %w", dir, err)
+			return err
 		}
 	}
 
@@ -45,8 +42,7 @@ func man() error {
 	man := exec.Command("less", "-")
 
 	var b bytes.Buffer
-
+	b.Write([]byte(manpage))
-	b.WriteString(manpage)
 
 	man.Stdout = os.Stdout
 	man.Stdin = &b
@@ -55,7 +51,7 @@ func man() error {
 	err := man.Run()
 
 	if err != nil {
-		return fmt.Errorf("failed to execute 'less': %w", err)
+		return err
 	}
 
 	return nil
@@ -63,23 +59,10 @@ func man() error {
 
 // returns TRUE if stdout is NOT a tty or windows
 func IsNoTty() bool {
-	if runtime.GOOS == WIN || !isatty.IsTerminal(os.Stdout.Fd()) {
+	if runtime.GOOS == "windows" || !isatty.IsTerminal(os.Stdout.Fd()) {
 		return true
 	}
 
 	// it is a tty
 	return false
 }
-
-func GetThrottleTime() time.Duration {
-	return time.Duration(rand.Intn(MaxThrottle-MinThrottle+1)+MinThrottle) * time.Millisecond
-}
-
-// look if a key in a map exists, generic variant
-func Exists[K comparable, V any](m map[K]V, v K) bool {
-	if _, ok := m[v]; ok {
-		return true
-	}
-
-	return false
-}