added docker instructions

added HTTP retry and --ignoreerrors which ignores image download errors, fix #30

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,31 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: "[bug-report]"
-labels: bug
-assignees: TLINDEN
-
----
-
-**Description**
-<!-- Please provide a clear and concise description of the issue: -->
-
-
-**Steps To Reproduce**
-<!-- Please detail the steps to reproduce the behavior, execute kleingebaeck with the -d option: -->
-
-
-**Expected behavior**
-<!-- What do you expected to happen instead? -->
-
-
-**Version information**
-<!--
-Please provide as much version information as possible:
-- if you have just installed a binary, provide the output of: kleingebaeck --version
-- if you installed from source, provide the output of: make show-version
-- provide additional details: operating system and version and shell environment
--->
-
-
-**Additional informations**

.github/ISSUE_TEMPLATE/bug_report_de.md

@@ -1,32 +0,0 @@
----
-name: Bugreport Deutsch
-about: Erzeuge einen Bugreport
-title: "[bug-report-de]"
-labels: bug
-assignees: TLINDEN
-
----
-
-**Beschreibung**
-<!-- Bitte beschreibe den Fehler klar und möglichst präzise: -->
-
-
-**Schritte um den Fehler zu reproduzieren**
-<!-- Bitte gib detailiert an, welche konkreten Schritte zum Fehler
-     geführt haben, führe kleingebaeck mit der Option -d option aus: -->
-
-
-**Erwartetes Verhalten**
-<!-- Welches Verhalten hast Du ursprünglich erwartet? -->
-
-
-**Versionsinformation**
-<!--
-Bitte gib uns so viel Versionsinfos wie möglich:
-- wenn Du nur das Programm installiert hast: kleingebaeck --version
-- wenn Du von Source installiert hast: make show-version
-- bitte gib zusätzliche Details an: Betriebssystem + Version, Shellumgebung etc.
--->
-
-
-**Zusätzliche Informationen**

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,23 +0,0 @@
----
-name: Feature request
-about: Suggest a feature
-title: "[feature-request]"
-labels: feature-request
-assignees: TLINDEN
-
----
-
-**Description**
-<!-- Please provide a clear and concise description of the feature you desire: -->
-
-
-
-**Version information**
-<!--
-Just in case the feature is already present, please provide as
-much version information as possible:
-- if you have just installed a binary, provide the output of: tablizer --version
-- if you installed from source, provide the output of: make show-version
-- provide additional details: operating system and version and shell environment
--->
-

.github/ISSUE_TEMPLATE/feature_request_de.md

@@ -1,20 +0,0 @@
----
-name: Featurerequest Deutsch
-about: Empfehle ein neues Feature
-title: "[feature-request-de]"
-labels: feature-request
-assignees: TLINDEN
-
----
-
-**Beschreibung**
-<!-- Bitte beschreibe das gewünschte Feature klar und möglichst präzise: -->
-
-
-**Versionsinformation**
-<!--
-Bitte gib uns so viel Versionsinfos wie möglich:
-- wenn Du nur das Programm installiert hast: kleingebaeck --version
-- wenn Du von Source installiert hast: make show-version
-- bitte gib zusätzliche Details an: Betriebssystem + Version, Shellumgebung etc.
--->

.github/ISSUE_TEMPLATE/note_to_self.md

@@ -1,8 +0,0 @@
----
-name: Note to self
-about: Internal bugs and wishes
-title: "[bug-report]"
-labels: bug
-assignees: TLINDEN
-
----

.github/workflows/pushimage.yaml

@@ -26,9 +26,3 @@ jobs:
         with:
           push: true
           tags: ghcr.io/tlinden/kleingebaeck:${{ github.ref_name}}
-
-      - name: Build and push latest Docker image
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
-        with:
-          push: true
-          tags: ghcr.io/tlinden/kleingebaeck:latest

.gitignore

@@ -3,6 +3,3 @@ kleingebaeck
 releases
 t/out
 .bak
-t/httproot/out
-t/httproot/kleinanzeigen
-t/httproot/favicon.ico

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!

Dockerfile

@@ -16,6 +16,8 @@ RUN make
 FROM alpine:latest
 LABEL maintainer="Thomas von Dein <git@daemon.de>"
 
+#RUN install -o 1001 -g 1001 -d /data
+
 WORKDIR /app
 COPY --from=builder /work/kleingebaeck /app/kleingebaeck
 

Makefile

@@ -56,14 +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
-
 testfuzzy: clean
 	go test -fuzz ./... $(ARGS)
 
@@ -86,7 +78,7 @@ release: buildall
 
 show-versions: buildlocal
 	@echo "### kleingebaeck version:"
-	@./kleingebaeck -V
+	@./kleingebaeck -v
 
 	@echo
 	@echo "### go module versions:"
@@ -96,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

@@ -1,303 +0,0 @@
-## Kleingebäck - kleinanzeigen.de Backup
-
-![Kleingebaeck Logo](https://github.com/TLINDEN/kleingebaeck/blob/main/.github/assets/kleingebaecklogo-small.png)
-
-[![Go Report Card](https://goreportcard.com/badge/github.com/tlinden/kleingebaeck)](https://goreportcard.com/report/github.com/tlinden/kleingebaeck) 
-[![Actions](https://github.com/tlinden/kleingebaeck/actions/workflows/ci.yaml/badge.svg)](https://github.com/tlinden/kleingebaeck/actions)
-[![Go Coverage](https://github.com/tlinden/kleingebaeck/wiki/coverage.svg)](https://raw.githack.com/wiki/tlinden/kleingebaeck/coverage.html)
-![GitHub License](https://img.shields.io/github/license/tlinden/kleingebaeck)
-[![GitHub release](https://img.shields.io/github/v/release/tlinden/kleingebaeck?color=%2300a719)](https://github.com/TLINDEN/kleingebaeck/releases/latest)
-[![English](https://github.com/TLINDEN/kleingebaeck/blob/main/.github/assets/english.png)](https://github.com/tlinden/kleingebaeck/blob/main/README.md)
-
-Mit diesem Tool kann man seine Anzeigen bei https://kleinanzeigen.de sichern.
-
-Es kann alle Anzeigen eines Users (oder nur eine Ausgewählte)
-inklusive der Bilder herunterladen, die in einem Verzeichnis pro
-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.
-
-## Screenshots
-
-Das ist die Hauptseite meines kleinanzeigen.de Accounts:
-
-![Index](https://github.com/TLINDEN/kleingebaeck/blob/main/.github/assets/kleinanzeigen-index.png)
-
-Sichern ich meine Anzeigen:
-
-![Download](https://github.com/TLINDEN/kleingebaeck/blob/main/.github/assets/kleinanzeigen-download.png)
-
-Backupverzeichnis nach dem Download:
-
-![Download](https://github.com/TLINDEN/kleingebaeck/blob/main/.github/assets/kleinanzeigen-backup.png)
-
-Verzeichnis einer Anzeige:
-
-![Download](https://github.com/TLINDEN/kleingebaeck/blob/main/.github/assets/kleinanzeigen-ad.png)
-
-**Das gleiche unter Windows:**
-
-Anzeigen Sichern:
-
-![Download](https://github.com/TLINDEN/kleingebaeck/blob/main/.github/assets/cmd-windows.jpg)
-
-Backupverzeichnis nach dem Download
-
-![Download](https://github.com/TLINDEN/kleingebaeck/blob/main/.github/assets/liste-windows.jpg)
-
-Und eine Anzeige:
-
-![Download](https://github.com/TLINDEN/kleingebaeck/blob/main/.github/assets/adlisting-windows.jpg)
-
-## Installation
-
-Das Tool hat keine weiteren Abhängigkeiten und erfordert auch keine
-Anmeldung oder ähnliches. Man kädt sich einfach die ausführbare Datei
-für seine Plattform herunter und kann direkt loslegen.
-
-### Installation des vorcompilierten Programms
-
-Auf der Seite [des letzten Releases](https://github.com/TLINDEN/kleingebaeck/releases/latest) findet man das Program für sein Betriebssystem und die Plattform (z.b. Windows + Intel)
- 
-Es gibt 2 Varianten:
-
-1. Direkt das fertige Program für seine Plattform+OS herunterladen,
-   z.B. `kleingebaeck-linux-amd64-0.0.5`, nach `kleingebaeck`
-   umbenennen und in ein Verzeichnis kopieren, das im `PATH` ist,
-   (z.B. nach `$HOME/bin` oder als root nach `/usr/local/bin`).
-
-Um sicher zu gehen, dass an dem Program nicht verändert wurde, kann
-man die Signatur vergleichen. Für jeden Download gibt es eine dazu
-passende Signatur, in unserem Beispiel wäre das
-`kleingebaeck-linux-amd64-0.0.5.sha256`.
-
-Zum Verifizieren ausführen:
-
-```shell
-cat kleingebaeck-linux-amd64-0.0.5.sha25 && sha256sum kleingebaeck-linux-amd64-0.0.5
-```
-Man sollte zweimal den gleichen SHA256 Hash sehen.
-
-2. Man kann auch einen Tarball (tgz Dateiendung) herunterladen,
-   auspacken und mit GNU Make installieren:
-
-```shell
-tar xvfz kleingebaeck-linux-amd64-0.0.5.tar.gz
-cd kleingebaeck-linux-amd64-0.0.5
-sudo make install
-```
-
-### Installation aus dem Sourcecode
-
-Man muss eine funktionierende Go Buildumgebung in der Version 1.21
-installiert haben, um das Programm selber zu compilieren. GNU Make ist
-hilfreich, aber nicht unbedingt erforderlich.
-
-Um das Programm zu compilieren, muss man folgende Schritte ausführen:
-
-```shell
-git clone https://github.com/TLINDEN/kleingebaeck.git
-cd kleingebaeck
-go mod tidy
-make # (oder make)
-sudo make install
-```
-
-### Docker image benutzen
-
-Ein fertiges Dockerimage mit der aktuellen Programmversion ist immer
-verfügbar. Man kann damit z.B. das Tool testen, bevor man es dauerhaft
-benutzen möchte.
-
-Um das Image herunterzuladen:
-```
-docker pull ghcr.io/tlinden/kleingebaeck:latest
-```
-
-Um kleingebäck im Image auszuführen und Daten ins lokale Filesystem zu
-sichern, kann man so vorgehen:
-
-```shell
-mkdir anzeigen
-docker run -u `id -u $USER` -v ./anzeigen:/backup ghcr.io/tlinden/kleingebaeck:latest -u XXX -v
-ls -l anzeigen/ein-buch-mit-leeren-seiten
-total 792
-drwxr-xr-x 2 scip root   4096 Jan 23 12:58 ./
-drwxr-xr-x 3 scip scip   4096 Jan 23 12:58 ../
--rw-r--r-- 1 scip root 131650 Jan 23 12:58 1.jpg
--rw-r--r-- 1 scip root  81832 Jan 23 12:58 2.jpg
--rw-r--r-- 1 scip root 134050 Jan 23 12:58 3.jpg
--rw-r--r-- 1 scip root   1166 Jan 23 12:58 Adlisting.txt
-```
-
-Hier wird der aktuelle User auf den User im Image gemappt und das
-lokale Verzeichnis `anzeigen` nach `/backup` innerhalb des Images
-gemountet.
-
-Die Optionen `-u XXX -v` sind kleingebäck Optionen. Ersetze `XXX`
-durch Deine tatsächliche kleinanzeigen.de Userid.
-
-Eine Liste verfügbarer Images findet man [hier](https://github.com/tlinden/kleingebaeck/pkgs/container/kleingebaeck/versions?filters%5Bversion_type%5D=tagged)
-
-## Kommandozeilen Optionen:
-
-```
-Usage: kleingebaeck [-dvVhmoc] [<ad-listing-url>,...]
-Options:
--u --user    <uid>      Backup ads from user with uid <uid>.
--d --debug              Enable debug output.
--v --verbose            Enable verbose output.
--o --outdir  <dir>      Set output dir (default: current directory)
--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.
--m --manual             Show manual.
--h --help               Show usage.
--V --version            Show program version.
-
-If one  or more <ad-listing-url>'s  are specified, only  backup those,
-otherwise backup all ads of the given user.
-```
-
-## Konfiguration
-
-Man    kann    anstelle     von    Kommandlineoptionen    auch    eine
-Konfigurationsdatei  verwenden.  Sie  befindet  sich standardmäßig  in
-`~/.kleingebaeck`  aber man  kann  mit dem  Parameter  `-c` auch  eine
-andere Datei angeben.
-
-Das Format (TOML) ist einfach:
-
-```
-user = 1010101
-loglevel = verbose
-outdir = "test"
-```
-
-Im Source gibt es eine Beispieldatei `example.conf` mit Kommentaren.
-
-## Umgebungsvariablen
-
-Man kann darüber hinaus auch Umgebungsvariablen verwenden. Sie
-entsprechen den Konfigurationsoptionen, aber gross geschrieben mit dem
-Präfix `KLEINGEBAECK_`, z.B.
-
-```shell
-% KLEINGEBAECK_OUTDIR=/backup kleingebaeck -v
-```
-
-## Benutzung
-
-Um das Tool einsetzen zu können, muss man zunächst seine Userid bei
-kleinanzeigen.de herausfinden. Dazu ruft man am besten die Liste
-seiner Anzeigen auf, während man NICHT eingeloggt ist:
-
-https://www.kleinanzeigen.de/s-bestandsliste.html?userId=XXXXXX
-
-Der `XXXXX` Teil der URL ist die Userid.
-
-Trage diese Userid in der Konfigurationsdatei ein wie oben
-beschrieben. Gib ausserdem das Ausgabeverzeichnis an. Dann einfach nur
-`kleingebaeck` ausführen.
-
-Innerhalb des Ausgabeverzeichnisses wird sich dann pro Anzeige ein
-Unterverzeichnis befinden. Pro Anzeige gibt es eine Datei
-`Adlisting.txt`, die etwa so aussieht:
-
-```default
-Title: A book I sell
-Price: 99 € VB
-Id: 1919191919
-Category: Sachbücher
-Condition: Sehr Gut
-Created: 10.12.2023
-
-This is the description text.
-
-Pay with paypal.
-```
-
-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.
-
-## Documentation
-
-Die Dokumentation kann man
-[online](https://github.com/TLINDEN/kleingebaeck/blob/main/kleingebaeck.pod)
-oder lokal lesen mit: `kleingebaeck --manual`. Hat man das Tool mit
-dem Tarball installiert, funktioniert auch `man kleingebaeck`.
-
-## Kleingebäck?
-
-Der Name kommt von "kleinanzeigen backup", verkürzt "klein back", das
-englisch ausgesprochene "back" (deutsch bäck) führt dann zu "Kleingebäck".
-
-## Wo bekommt man Hilfe
-
-Obwohl ich gerne von kleingebäck Benutzern in privaten Mails höre, ist
-das doch der beste Weg, die Anfrage zu übersehen und zu vergessen.
-
-Um einen Fehler, ein unerwartetes Verhalten, eine Feature Request oder
-einen Patch zu übermitteln, eröffne daher bitte einen Issue unter:
-https://github.com/TLINDEN/kleingebaeck/issues. Danke!
-
-Bitte gebe den fehlgeschlagenen Befehl an, rufe es auch mit Debugging
-`-d` auf.
-
-## Ähnliche Projekte
-
-Ich konnte kein Projekt finden, das speziell dafür geeignet ist,
-Anzeigen bei kleinanzeigen.de zu sichern.
-
-Aber es gibt ein Projekt, mit dem man ebenfalls Backups erstellen
-kann:  [kleinanzeigen-bot](https://github.com/Second-Hand-Friends/kleinanzeigen-bot/).
-Aber Vorsicht: kleinanzeigen.de bekämpft Bots aktiv, mit diesem hier
-gibt es regelmäßige Probleme, z.B.: 
-[issue](https://github.com/Second-Hand-Friends/kleinanzeigen-bot/issues/219).
-Das Hauptproblem ist, dass diese Art von Bot sich mit Deinem Account
-aktiv einloggt und mit der Seite interagiert. Damit kann die Firma die
-Aktivitäten recht einfach Deinem User zuordnen und diesen **sperren**!
-Also sei bitte vorsichtig!
-
-**Kleingebäck** erfordert keinen Login, es verwendet lediglich die
-öffentlich verfügbare Webseite und ruft diese auf, wie ein normaler
-Browser. Tatsächlich gibt es meiner Meinung nach keinen Unterschied zu
-einem Browserclient: beide laufen auf Anwenderseite auf Initiative
-eines Benutzers. Und mit welchen Browser ich eine Webseite aufrufe,
-bleibt immer noch mir überlassen und muss mir nicht von irgendwem
-vorgeschrieben werden. Das schliesst die Verwendung von Kleingebäck
-mit ein.
-
-Hinzu kommt, dass dieses Tool nicht dazu gedacht ist, rund um die Uhr
-zu laufen. Man ruft es ab und zu mal auf, wenn man halt neue Anzeigen
-eingestellt hat, vielleicht einmal die Woche oder so. Man weiss ja
-selber, wann man was geändert hat. Man benötigt trotzdem den Zugriff
-mit dem Browser oder der mobilen App um Kleinanzeigen.de verwalten zu
-können.
-
-Meiner Ansicht nach ist das Risiko also sehr minimal, es handelt sich
-meiner Meinung nach auch nicht um eine Verletzung der AGBs dort. Aber
-das ist nur meine persönliche Meinung, bitte beachtet das. Am Ende
-müsst Ihr selbst einschätzen und beurteilen wie hoch Ihr das Risiko
-seht und ob Ohr es eingehen möchtet. Für eventuell auftretende
-Konsequenzen bin ich nicht verantwortlich. Siehe auch [GPL Lizenz](LICENSE).
-
-Es       gibt      noch       ein      weiteres       Tool      namens
-[kleinanzeigen-enhanded](https://kleinanzeigen-enhanced.de/).  Das ist
-eine    kostenpflichtige     vollständige    Anzeigenverwaltung    für
-Profinutzer. Man  muss eine  monatliche Abogebühr bezahlen.   Das Tool
-ist  als  Browsererweiterung  für  Google  Chrome  implementiert,  was
-erklärt,  warum sie  Anzeigen  erstellen, ändern  und löschen  können,
-obwohl es  gar keine  öffentliche API gibt.   Sieht nach  einer netten
-ausgereiften Lösung aus. Mit Backups.
- 
-## Copyright und License
-
-Lizensiert unter der GNU GENERAL PUBLIC LICENSE Version 3.
-
-## Autor
-
-T.v.Dein <tom AT vondein DOT org>
-

README.md

@@ -7,9 +7,7 @@
 [![Go Coverage](https://github.com/tlinden/kleingebaeck/wiki/coverage.svg)](https://raw.githack.com/wiki/tlinden/kleingebaeck/coverage.html)
 ![GitHub License](https://img.shields.io/github/license/tlinden/kleingebaeck)
 [![GitHub release](https://img.shields.io/github/v/release/tlinden/kleingebaeck?color=%2300a719)](https://github.com/TLINDEN/kleingebaeck/releases/latest)
-[![German](https://github.com/TLINDEN/kleingebaeck/blob/main/.github/assets/german.png)](https://github.com/tlinden/kleingebaeck/blob/main/README-de.md)
 
-[Die deutsche Version des READMEs findet Ihr hier](README-de.md).
 
 This tool can be used to backup ads on the german ad page https://kleinanzeigen.de
 
@@ -62,7 +60,7 @@ Go            to             the            [latest            release
 page](https://github.com/TLINDEN/kleingebaeck/releases/latest)     and
 look for your OS and platform. There are two options to install the binary:
 
-1.    Directly   download    the    binary    for   your    platform,
+1.    Directly   download    the    binary    for   your    platoform,
    e.g. `kleingebaeck-linux-amd64-0.0.5`, rename  it to `kleingebaeck`
    (or  whatever  you  like  more!)  and put  it  into  your  bin  dir
    (e.g. `$HOME/bin` or as root to `/usr/local/bin`).
@@ -99,37 +97,22 @@ To install after building either copy the binary or execute `sudo make install`.
 ### Using the docker image
 
 A pre-built docker  image is available, which you can  use to test the
-app without  installing it. To download:
+app without  installing it. You  need `docker-compose`. Copy  the file
+`docker-compose.yaml` to somewhere, cd to that directory and execute:
 
 ```shell
-docker pull ghcr.io/tlinden/kleingebaeck:latest
+mkdir kleinanzeigen-backup
+USER_ID=$(id -u) GROUP_ID=$(id -g) OUTDIR=./kleinanzeigen-backup docker-compose run kleingebaeck -u XXX -v
 ```
 
-To execute kleingebaeck  inside the image and download ads  to a local
+`USER_ID` and  `GROUP_ID` needs to  be specified  so that you  are the
-directory, do something like this:
+owner of the created backups. The backup directory must exist prior to
+the  execution,  otherwise  docker  will   create  it  as  root,  then
+kleingebaeck will fail.
 
-```shell
+You may of course also modify the `docker-compose.yaml` to suit your needs.
-mkdir myads
-docker run -u `id -u $USER` -v ./myads:/backup ghcr.io/tlinden/kleingebaeck:latest -u XXX -v
-ls -l myads/ein-buch-mit-leeren-seiten
-total 792
-drwxr-xr-x 2 scip root   4096 Jan 23 12:58 ./
-drwxr-xr-x 3 scip scip   4096 Jan 23 12:58 ../
--rw-r--r-- 1 scip root 131650 Jan 23 12:58 1.jpg
--rw-r--r-- 1 scip root  81832 Jan 23 12:58 2.jpg
--rw-r--r-- 1 scip root 134050 Jan 23 12:58 3.jpg
--rw-r--r-- 1 scip root   1166 Jan 23 12:58 Adlisting.txt
-```
 
-We map the local user to the one inside the image so the permission
+If you want to build the image yourself, use the supplied Dockerfile.
-will match. You'll need to create the directory first before executing
-docker run. And the local directory `myads` will be mapped to
-`/backup` inside the container.
-
-The options `-u XXX -v` are kleingebaeck options, replace `XXX` with
-your actual kleinanzeigen.de user id.
-
-A list of available images is  [here](https://github.com/tlinden/kleingebaeck/pkgs/container/kleingebaeck/versions?filters%5Bversion_type%5D=tagged)
 
 ## Commandline options:
 
@@ -256,9 +239,9 @@ daily basis. You cannot use it to view regular ads or maintain your
 own ads. You'll need to use the mobile app or the browser page with a
 login. So, in my point of view, the risk is very minimal.
 
-There is another Tool available named [kleinanzeigen-enhanced](https://kleinanzeigen-enhanced.de/). It is a complete Ad management system targeting primarily commercial users. You have to pay a monthly fee, perhaps there's also a free version available, but I haven't checked. The tool is implemented as a Chrome browser extension, which explains why it was possible to implement it without an API. It seems to be a nice solution for power users by the looks of it. And it includes backups.
+There is another Tool available named [kleinanzeigen-enhanded](https://kleinanzeigen-enhanced.de/). It is a complete Ad management system targeting primarily commercial users. You have to pay a monthly fee, perhaps there's also a free version available, but I haven't checked. The tool is implemented as a Chrome browser extension, which explains why it was possible to implement it without an API. It seems to be a nice solution for power users by the looks of it. And it includes backups.
 
-## Copyright and License
+## Copyright und License
 
 Licensed under the GNU GENERAL PUBLIC LICENSE version 3.
 

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
@@ -20,7 +20,6 @@ package main
 import (
 	"log/slog"
 	"strings"
-	"time"
 )
 
 type Index struct {
@@ -30,7 +29,7 @@ type Index struct {
 type Ad struct {
 	Title        string `goquery:"h1"`
 	Slug         string
-	ID           string
+	Id           string
 	Condition    string `goquery:".addetailslist--detail--value,text"`
 	Category     string
 	CategoryTree []string `goquery:".breadcrump-link,text"`
@@ -38,7 +37,6 @@ type Ad struct {
 	Created      string   `goquery:"#viewad-extra-info,text"`
 	Text         string   `goquery:"p#viewad-description-text,html"`
 	Images       []string `goquery:".galleryimage-element img,[src]"`
-	Expire       string
 }
 
 // Used by slog to pretty print an ad
@@ -46,13 +44,11 @@ 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, "+")),
 		slog.String("condition", ad.Condition),
-		slog.String("created", ad.Created),
-		slog.String("expire", ad.Expire),
 	)
 }
 
@@ -71,12 +67,3 @@ func (ad *Ad) Incomplete() bool {
 
 	return false
 }
-
-func (ad *Ad) CalculateExpire() {
-	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")
-		}
-	}
-}

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,19 @@ import (
 )
 
 const (
-	VERSION    string = "0.3.5"
+	VERSION         string = "0.1.2"
 	Baseuri         string = "https://www.kleinanzeigen.de"
 	Listuri         string = "/s-bestandsliste.html"
 	Defaultdir      string = "."
-
+	DefaultTemplate string = "Title: {{.Title}}\nPrice: {{.Price}}\nId: {{.Id}}\n" +
-	DefaultTemplate string = "Title: {{.Title}}\nPrice: {{.Price}}\nId: {{.ID}}\n" +
+		"Category: {{.Category}}\nCondition: {{.Condition}}\nCreated: {{.Created}}\n\n{{.Text}}\n"
-		"Category: {{.Category}}\nCondition: {{.Condition}}\n" +
+	DefaultTemplateWin string = "Title: {{.Title}}\r\nPrice: {{.Price}}\r\nId: {{.Id}}\r\n" +
-		"Created: {{.Created}}\nExpire: {{.Expire}}\n\n{{.Text}}\n"
+		"Category: {{.Category}}\r\nCondition: {{.Condition}}\r\nCreated: {{.Created}}\r\n\r\n{{.Text}}\r\n"
-
+	Useragent string = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " +
-	DefaultTemplateWin string = "Title: {{.Title}}\r\nPrice: {{.Price}}\r\nId: {{.ID}}\r\n" +
-		"Category: {{.Category}}\r\nCondition: {{.Condition}}\r\n" +
-		"Created: {{.Created}}\r\nExpires: {{.Expire}}\r\n\r\n{{.Text}}\r\n"
-
-	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 +60,6 @@ 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.
 -m --manual             Show manual.
 -h --help               Show usage.
 -V --version            Show program version.
@@ -102,8 +80,6 @@ type Config struct {
 	Loglevel         string `koanf:"loglevel"`
 	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 +94,53 @@ 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")
-	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 {
@@ -185,30 +156,31 @@ func InitConfig(output io.Writer) (*Config, error) {
 	for _, cfgfile := range configfiles {
 		if path, err := os.Stat(cfgfile); !os.IsNotExist(err) {
 			if !path.IsDir() {
-				if err := kloader.Load(file.Provider(cfgfile), toml.Parser()); err != nil {
+				if err := k.Load(file.Provider(cfgfile), toml.Parser()); err != nil {
-					return nil, fmt.Errorf("error loading config file: %w", err)
+					return nil, errors.New("error loading config file: " + err.Error())
 				}
 			}
-		} // else: we ignore the file if it doesn't exists
+		}
+		// 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
@@ -220,7 +192,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
 }

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
 	Client    *http.Client
-	Cookies []*http.Cookie
+	Useragent string // FIXME: make configurable
-}
-
-func NewFetcher(conf *Config) (*Fetcher, error) {
-	jar, err := cookiejar.New(nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create a cookie jar obj: %w", err)
 }
 
+func NewFetcher(c *Config) *Fetcher {
 	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, nil)
+	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

@@ -7,33 +7,26 @@ require (
 	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 v0.1.0
 	github.com/knadh/koanf/providers/file v0.1.0
 	github.com/knadh/koanf/providers/posflag v0.1.0
 	github.com/knadh/koanf/v2 v2.0.1
-	github.com/lmittmann/tint v1.0.4
+	github.com/lmittmann/tint v1.0.3
 	github.com/mattn/go-isatty v0.0.20
 	github.com/spf13/pflag v1.0.5
-	github.com/tlinden/yadu v0.1.2
 	golang.org/x/sync v0.5.0
 )
 
 require (
-	github.com/PuerkitoBio/goquery v1.5.1 // indirect
+	github.com/PuerkitoBio/goquery v1.5.0 // indirect
-	github.com/andybalholm/cascadia v1.1.0 // indirect
+	github.com/andybalholm/cascadia v1.0.0 // indirect
-	github.com/corona10/goimagehash v1.1.0 // indirect
-	github.com/fatih/color v1.16.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/knadh/koanf/providers/env v0.1.0 // 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
-	github.com/pkg/errors v0.9.1 // indirect
 	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
-	golang.org/x/sys v0.17.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 
 )

go.sum

@@ -1,18 +1,12 @@
 astuart.co/goq v1.0.0 h1:nnYIhu/Z/j0VaX9Dp+pmh2Uh7ldEz6XfgSg+bAY5Yrw=
 astuart.co/goq v1.0.0/go.mod h1:+fokcnFrO8Pw2fj8drdStJvzoMFebJH69rw8IC21rno=
+github.com/PuerkitoBio/goquery v1.5.0 h1:uGvmFXOA73IKluu/F84Xd1tt/z07GYm8X49XKHP7EJk=
 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/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o=
-github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 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=
-github.com/corona10/goimagehash v1.1.0 h1:teNMX/1e+Wn/AYSbLHX8mj+mF9r60R1kBeqE9MkoYwI=
-github.com/corona10/goimagehash v1.1.0/go.mod h1:VkvE0mLn84L4aF8vCb6mafVajEb6QYMHl2ZJLn0mOGI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/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.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/jarcoal/httpmock v1.3.1 h1:iUx3whfZWVf3jT01hQTO/Eo5sAYtB2/rqaUuOtpInww=
@@ -31,11 +25,8 @@ github.com/knadh/koanf/providers/posflag v0.1.0 h1:mKJlLrKPcAP7Ootf4pBZWJ6J+4wHY
 github.com/knadh/koanf/providers/posflag v0.1.0/go.mod h1:SYg03v/t8ISBNrMBRMlojH8OsKowbkXV7giIbBVgbz0=
 github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g=
 github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLNvY1Dus=
-github.com/lmittmann/tint v1.0.4 h1:LeYihpJ9hyGvE0w+K2okPTGUdVLfng1+nDNVR4vWISc=
+github.com/lmittmann/tint v1.0.3 h1:W5PHeA2D8bBJVvabNfQD/XW9HPLZK1XoPZH0cq8NouQ=
-github.com/lmittmann/tint v1.0.4/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE=
+github.com/lmittmann/tint v1.0.3/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-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=
 github.com/maxatome/go-testdeep v1.12.0 h1:Ql7Go8Tg0C1D/uMMX59LAoYK7LffeJQ6X2T04nTH68g=
@@ -46,12 +37,8 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
 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=
-github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
@@ -60,33 +47,18 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/tlinden/yadu v0.0.0-20240118202225-ec3f0b7fc355 h1:EmgK+IGUz2m42bFKteLY5SYJLn/CyBrz6nkgS22K8Bk=
-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=
-github.com/tlinden/yadu v0.1.2 h1:TYYVnUJwziRJ9YPbIbRf9ikmDw0Q8Ifixm+J/kBQFh8=
-github.com/tlinden/yadu v0.1.2/go.mod h1:l3bRmHKL9zGAR6pnBHY2HRPxBecf7L74BoBgOOpTcUA=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190606173856-1492cefac77f/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.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
 golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-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 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
-golang.org/x/sys v0.17.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/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

@@ -1,147 +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"
-	"fmt"
-	"image/jpeg"
-	"log/slog"
-	"os"
-	"path/filepath"
-
-	"github.com/corona10/goimagehash"
-)
-
-const MaxDistance = 3
-
-type Image struct {
-	Filename string
-	Hash     *goimagehash.ImageHash
-	Data     *bytes.Reader
-	URI      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("hash", img.Hash.ToString()),
-	)
-}
-
-// holds all images of an ad
-type Cache []*goimagehash.ImageHash
-
-func NewImage(buf *bytes.Reader, filename string, uri string) *Image {
-	img := &Image{
-		Filename: filename,
-		URI:      uri,
-		Data:     buf,
-	}
-
-	return img
-}
-
-// Calculate diff hash of the image
-func (img *Image) CalcHash() error {
-	jpgdata, err := jpeg.Decode(img.Data)
-	if err != nil {
-		return fmt.Errorf("failed to decode JPEG image: %w", err)
-	}
-
-	hash1, err := goimagehash.DifferenceHash(jpgdata)
-	if err != nil {
-		return fmt.Errorf("failed to calculate diff hash of image: %w", err)
-	}
-
-	img.Hash = hash1
-
-	return nil
-}
-
-// checks if 2 images are similar enough to be considered the same
-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
-	}
-
-	return false
-}
-
-// check current image against all known hashes.
-func (img *Image) SimilarExists(cache Cache) bool {
-	for _, otherimg := range cache {
-		if img.Similar(otherimg) {
-			return true
-		}
-	}
-
-	return false
-}
-
-// read all  JPG images  in a  ad directory,  compute diff  hashes and
-// store the results in the slice Images
-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)
-	}
-
-	cache := Cache{}
-
-	if dont {
-		// forced download, -f given
-		return cache, nil
-	}
-
-	for _, file := range files {
-		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(reader, filename, "")
-			if err = img.CalcHash(); err != nil {
-				return nil, err
-			}
-
-			slog.Debug("Caching image from file system", "image", img, "hash", img.Hash.ToString())
-			cache = append(cache, img.Hash)
-		}
-	}
-
-	return cache, nil
-}

kleingebaeck.1

@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "KLEINGEBAECK 1"
-.TH KLEINGEBAECK 1 "2024-02-10" "1" "User Commands"
+.TH KLEINGEBAECK 1 "2024-01-17" "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
@@ -142,7 +142,7 @@
 kleingebaeck \- kleinanzeigen.de backup tool
 .SH "SYNOPSYS"
 .IX Header "SYNOPSYS"
-.Vb 10
+.Vb 12
 \&    Usage: kleingebaeck [\-dvVhmoc] [<ad\-listing\-url>,...]
 \&    Options:
 \&    \-u \-\-user    <uid>      Backup ads from user with uid <uid>.
@@ -152,7 +152,6 @@ 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.
 \&    \-m \-\-manual             Show manual.
 \&    \-h \-\-help               Show usage.
 \&    \-V \-\-version            Show program version.
@@ -174,15 +173,14 @@ well.   We    use   \s-1TOML\s0   as   our    configuration   language.   See
 .PP
 Format is pretty simple:
 .PP
-.Vb 11
+.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}}
 \&    Created: {{.Created}}
@@ -191,11 +189,11 @@ Format is pretty simple:
 \&    """
 .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
@@ -204,94 +202,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 7
-\&    Title: {{.Title}}
-\&    Price: {{.Price}}
-\&    Id: {{.ID}}
-\&    Category: {{.Category}}
-\&    Condition: {{.Condition}}
-\&    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,6 @@ 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.
         -m --manual             Show manual.
         -h --help               Show usage.
         -V --version            Show program version.
@@ -39,11 +38,10 @@ CONFIGURATION
         user = 1010101
         loglevel = verbose
         outdir = "test"
-        useragent = "Mozilla/5.0"
         template = """
         Title: {{.Title}}
         Price: {{.Price}}
-        Id: {{.ID}}
+        Id: {{.Id}}
         Category: {{.Category}}
         Condition: {{.Condition}}
         Created: {{.Created}}
@@ -51,11 +49,10 @@ CONFIGURATION
         {{.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
@@ -63,71 +60,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}}
-        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,6 @@ 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.
     -m --manual             Show manual.
     -h --help               Show usage.
     -V --version            Show program version.
@@ -39,11 +38,10 @@ 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}}
     Created: {{.Created}}
@@ -51,11 +49,11 @@ Format is pretty simple:
     {{.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
@@ -63,91 +61,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}}
-    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

@@ -26,7 +26,6 @@ import (
 	"runtime/debug"
 
 	"github.com/lmittmann/tint"
-	"github.com/tlinden/yadu"
 )
 
 const LevelNotice = slog.Level(2)
@@ -35,43 +34,38 @@ func main() {
 	os.Exit(Main(os.Stdout))
 }
 
-func Main(output io.Writer) int {
+func Main(w 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
 	}
 
@@ -80,7 +74,6 @@ func Main(output io.Writer) int {
 		if err != nil {
 			return Die(err)
 		}
-
 		return 0
 	}
 
@@ -91,15 +84,14 @@ func Main(output io.Writer) int {
 	if conf.Debug {
 		// we're using a more verbose logger in debug mode
 		buildInfo, _ := debug.ReadBuildInfo()
-		opts := &yadu.Options{
+		opts := &tint.Options{
 			Level:     logLevel,
 			AddSource: true,
-			//NoColor:   IsNoTty(),
+			NoColor:   IsNoTty(),
 		}
 
 		logLevel.Set(slog.LevelDebug)
-
+		handler := tint.NewHandler(w, opts)
-		handler := yadu.NewHandler(output, opts)
 		debuglogger := slog.New(handler).With(
 			slog.Group("program_info",
 				slog.Int("pid", os.Getpid()),
@@ -112,23 +104,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)
@@ -136,27 +120,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
@@ -164,6 +146,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>
@@ -146,13 +145,7 @@ var tests = []Tests{
 	{
 		name:     "debug",
 		args:     base + " -d",
-		expect:   "error: invalid or no user id or no ad link specified",
+		expect:   "program_info",
-		exitcode: 1,
-	},
-	{
-		name:     "debug-check-programinfo",
-		args:     base + " -d",
-		expect:   "pid:",
 		exitcode: 1,
 	},
 	{
@@ -176,7 +169,7 @@ var tests = []Tests{
 	{
 		name:     "download-single-ad-debug",
 		args:     base + " -o t/out https://www.kleinanzeigen.de/s-anzeige/first-ad/1 -d",
-		expect:   "DEBUG: extracted ad listing",
+		expect:   "extracted ad listing program_info.pid=",
 		exitcode: 0,
 	},
 	{
@@ -247,7 +240,7 @@ var invalidtests = []Tests{
 type AdConfig struct {
 	Title     string
 	Slug      string
-	ID        string
+	Id        string
 	Price     string
 	Category  string
 	Condition string
@@ -259,7 +252,7 @@ type AdConfig struct {
 var adsrc = []AdConfig{
 	{
 		Title: "First Ad",
-		ID:    "1", Price: "5€",
+		Id:    "1", Price: "5€",
 		Category:  "Klimbim",
 		Text:      "Thing to sale",
 		Slug:      "first-ad",
@@ -269,7 +262,7 @@ var adsrc = []AdConfig{
 	},
 	{
 		Title: "Secnd Ad",
-		ID:    "2", Price: "5€",
+		Id:    "2", Price: "5€",
 		Category:  "Kram",
 		Text:      "Thing to sale",
 		Slug:      "second-ad",
@@ -279,7 +272,7 @@ var adsrc = []AdConfig{
 	},
 	{
 		Title:     "Third Ad",
-		ID:        "3",
+		Id:        "3",
 		Price:     "5€",
 		Category:  "Kuddelmuddel",
 		Text:      "Thing to sale",
@@ -290,7 +283,7 @@ var adsrc = []AdConfig{
 	},
 	{
 		Title:     "Forth Ad",
-		ID:        "4",
+		Id:        "4",
 		Price:     "5€",
 		Category:  "Krempel",
 		Text:      "Thing to sale",
@@ -301,7 +294,7 @@ var adsrc = []AdConfig{
 	},
 	{
 		Title:     "Fifth Ad",
-		ID:        "5",
+		Id:        "5",
 		Price:     "5€",
 		Category:  "Kladderadatsch",
 		Text:      "Thing to sale",
@@ -312,7 +305,7 @@ var adsrc = []AdConfig{
 	},
 	{
 		Title:     "Sixth Ad",
-		ID:        "6",
+		Id:        "6",
 		Price:     "5€",
 		Category:  "Klunker",
 		Text:      "Thing to sale",
@@ -334,17 +327,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 len(adconfig.ID) == 0 {
+	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 {
@@ -391,9 +384,10 @@ func InitValidSources() []Adsource {
 	// 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),
 		})
+		//panic(GetTemplate(nil, ad, ADTPL))
 	}
 
 	return ads
@@ -446,48 +440,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"} {
 		httpmock.RegisterResponder("GET", image,
-			httpmock.NewBytesResponder(200, GetImage(image)).HeaderAdd(headers))
+			httpmock.NewBytesResponder(200, GetImage(image)))
-	}
 	}
 
-func VerifyAd(advertisement AdConfig) error {
+}
-	body := advertisement.Title + advertisement.Price + advertisement.ID + "Kleinanzeigen => " +
+
-		advertisement.Category + advertisement.Condition + advertisement.Created
+func VerifyAd(ad AdConfig) error {
+	body := ad.Title + ad.Price + ad.Id + "Kleinanzeigen => " +
+		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)
 	}
 
@@ -505,21 +494,20 @@ 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())
 		}
 	}
 
@@ -542,21 +530,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

@@ -18,13 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-	"bytes"
+	"errors"
 	"fmt"
 	"log/slog"
 	"path/filepath"
-	"strconv"
 	"strings"
-	"time"
 
 	"astuart.co/goq"
 	"golang.org/x/sync/errgroup"
@@ -43,9 +41,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
@@ -54,7 +50,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 {
@@ -69,16 +65,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
 		}
 	}
@@ -88,20 +84,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
@@ -109,125 +103,62 @@ 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")
-	}
-
-	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")
+	}
+
+	slog.Debug("extracted ad listing", "ad", ad)
+
 	// 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", 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)
+	g := new(errgroup.Group)
 
-	// scan existing images, if any
+	for _, imguri := range ad.Images {
-	cache, err := ReadImages(adpath, fetch.Config.ForceDownload)
-	if err != nil {
-		return err
-	}
-
-	egroup := new(errgroup.Group)
-
-	for _, imguri := range advertisement.Images {
 		imguri := imguri
-		file := filepath.Join(adpath, fmt.Sprintf("%d.jpg", img))
+		file := filepath.Join(fetch.Config.Outdir, addir, fmt.Sprintf("%d.jpg", img))
-
+		g.Go(func() error {
-		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 = WriteImage(file, body)
-
-			_, err = buf.ReadFrom(body)
-			if err != nil {
-				return fmt.Errorf("failed to read from image buffer: %w", err)
-			}
-
-			reader := bytes.NewReader(buf.Bytes())
-
-			image := NewImage(reader, file, imguri)
-			err = image.CalcHash()
 			if err != nil {
 				return err
 			}
 
-			if !fetch.Config.ForceDownload {
-				if image.SimilarExists(cache) {
-					slog.Debug("similar image exists, not written", "uri", image.URI)
-
-					return nil
-				}
-			}
-
-			_, err = reader.Seek(0, 0)
-			if err != nil {
-				return fmt.Errorf("failed to seek(0) on image reader: %w", err)
-			}
-
-			err = WriteImage(file, reader)
-			if err != nil {
-				return err
-			}
-
-			slog.Debug("wrote image", "image", image, "size", buf.Len(), "throttle", throttle)
-
 			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

@@ -19,157 +19,84 @@ package main
 
 import (
 	"bytes"
-	"fmt"
+	"io"
 	"log/slog"
 	"os"
 	"path/filepath"
 	"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, reader io.ReadCloser) 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 = io.Copy(file, reader)
-
 	if err != nil {
-		return fmt.Errorf("failed to write to image file: %w", err)
+		return err
 	}
 
 	return nil
 }
-
-func ReadImage(filename string) (*bytes.Buffer, error) {
-	var buf bytes.Buffer
-
-	if !fileExists(filename) {
-		return nil, fmt.Errorf("image %s does not exist", filename)
-	}
-
-	data, err := os.ReadFile(filename)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read image file: %w", err)
-	}
-
-	_, err = buf.Write(data)
-	if err != nil {
-		return nil, fmt.Errorf("failed to write image into buffer: %w", err)
-	}
-
-	return &buf, nil
-}
-
-func fileExists(filename string) bool {
-	info, err := os.Stat(filename)
-	if os.IsNotExist(err) {
-		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/README.md

@@ -1,13 +0,0 @@
-# Mock http server
-
-Install ehfs from https://github.com/mjpclab/extra-http-file-server/.
-
-Install p2cli from https://github.com/wrouesnel/p2cli.
-
-Run `templates/render.sh` to build the file structure.
-
-Run `server.sh` to start the http server.
-
-To scrape an ad from it, use such a URL:
-
-http://localhost:8080/s-anzeige/first-ad/111-11-111

t/httproot/serve.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-ehfs -a :/s-anzeige:./kleinanzeigen \
-     -a :/api/v1/prod-ads/images/fc:./img \
-     -l localhost:8080 -I index.html

t/httproot/templates/ad.tpl

@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html lang="de">
-  <head>
-    <title>Ad Listing</title>
-  </head>
-  <body>
-
-    <div class="l-container-row">
-        <div id="vap-brdcrmb" class="breadcrump">
-            <a class="breadcrump-link" itemprop="url" href="/" title="Kleinanzeigen ">
-                <span itemprop="title">Kleinanzeigen </span>
-            </a>
-            <a class="breadcrump-link" itemprop="url" href="/egal">
-               <span itemprop="title">{{ category }}</span></a>
-            </div>
-    </div>
-
-    {% for image in images %}
-    <div class="galleryimage-element" data-ix="3">
-      <img src="http://localhost:8080/api/v1/prod-ads/images/fc/{{ image.id }}?rule=$_59.JPG"/>
-    </div>
-    {% endfor %}
-
-    <h1 id="viewad-title" class="boxedarticle--title" itemprop="name" data-soldlabel="Verkauft">
-      {{ title }}</h1>
-    <div class="boxedarticle--flex--container">
-      <h2 class="boxedarticle--price" id="viewad-price">
-        {{ price }}</h2>
-    </div>
-
-    <div id="viewad-extra-info" class="boxedarticle--details--full">
-      <div><i class="icon icon-small icon-calendar-gray-simple"></i><span>{{ created }}</span></div>
-    </div>
-
-    <div class="splitlinebox l-container-row" id="viewad-details">
-      <ul class="addetailslist">
-        <li class="addetailslist--detail">
-          Zustand<span class="addetailslist--detail--value" >
-          {{ condition }}</span>
-        </li>
-      </ul>
-    </div>
-
-    <div class="l-container last-paragraph-no-margin-bottom">
-      <p id="viewad-description-text" class="text-force-linebreak " itemprop="description">
-        {{ text }}
-      </p>
-    </div>
-  </body>
-</html>

t/httproot/templates/index.tpl

@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html lang="de" >
-  <head>
-    <title>Ads</title>
-  </head>
-  <body>
-    {% for ad in ads %}
-     <h2 class="text-module-begin">
-        <a class="ellipsis"
-           href="/s-anzeige/{{ ad.slug }}/{{ ad.id }}">{{ ad.title }}</a>
-     </h2>
-    {% endfor %}
-  </body>
-</html>
-

t/httproot/templates/render.sh

@@ -1,15 +0,0 @@
-#!/bin/sh -x
-base="../kleinanzeigen"
-
-rm -rf $base
-mkdir -p $base
-
-echo "Generating /s-bestandsliste.html"
-p2cli -t index.tpl -i vars.yaml > $base/s-bestandsliste.html
-
-for idx in 0 1; do
-    slug=$(cat vars.yaml | yq ".ads[$idx].slug")
-    id=$(cat vars.yaml | yq ".ads[$idx].id")
-    mkdir -p $base/$slug/$id
-    cat vars.yaml | yq ".ads[$idx]" | p2cli -t ad.tpl -f yaml > $base/$slug/$id/index.html
-done

t/httproot/templates/vars.yaml

@@ -1,27 +0,0 @@
-ads:
-  - slug: first-ad
-    id: 111-11-111
-    title: First Ad
-    price: "19 €"
-    condition: "Sehr gut"
-    category: "Weitere Elektronik"
-    created: 21.12.2023
-    images:
-      - id: fcf6d664-5258-42c2-bf58-d1b8e9221574
-      - id: fcf6d664-5258-42c2-bf58-as43as5d43as
-    text: |
-      Zu Verkaufen.
-      Zahlung nur Paypal.
-  - slug: second-ad
-    id: 222-22-222
-    title: Second Ad
-    price: "200 €"
-    condition: "Sehr gut"
-    category: "Elektronik"
-    created: 21.12.2023
-    images:
-      - id: cdas4sd5-5258-42c2-bf58-d1b8e9221574
-      - id: cdas4sd5-5258-42c2-bf58-as43as5d43as
-    text: |
-      Zu Verkaufen.
-      Zahlung nur Überweisung.

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
-}