mirror of
https://codeberg.org/scip/kleingebaeck.git
synced 2025-12-17 20:41:01 +01:00
Compare commits
4 Commits
feature/en
...
intern/moc
| Author | SHA1 | Date | |
|---|---|---|---|
| ec8f0fcac9 | |||
| a94ef63a90 | |||
| 90f5e86fdb | |||
| 587529e314 |
31
.github/ISSUE_TEMPLATE/bug_report.md
vendored
31
.github/ISSUE_TEMPLATE/bug_report.md
vendored
@@ -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**
|
|
||||||
32
.github/ISSUE_TEMPLATE/bug_report_de.md
vendored
32
.github/ISSUE_TEMPLATE/bug_report_de.md
vendored
@@ -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**
|
|
||||||
23
.github/ISSUE_TEMPLATE/feature_request.md
vendored
23
.github/ISSUE_TEMPLATE/feature_request.md
vendored
@@ -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
|
|
||||||
-->
|
|
||||||
|
|
||||||
20
.github/ISSUE_TEMPLATE/feature_request_de.md
vendored
20
.github/ISSUE_TEMPLATE/feature_request_de.md
vendored
@@ -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.
|
|
||||||
-->
|
|
||||||
7
.github/ISSUE_TEMPLATE/note_to_self.md
vendored
7
.github/ISSUE_TEMPLATE/note_to_self.md
vendored
@@ -1,7 +0,0 @@
|
|||||||
---
|
|
||||||
name: Note to self
|
|
||||||
about: Internal bugs and wishes
|
|
||||||
title: "[bug-report]"
|
|
||||||
labels: bug
|
|
||||||
assignees: TLINDEN
|
|
||||||
|
|
||||||
BIN
.github/assets/english.png
vendored
BIN
.github/assets/english.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 2.5 KiB |
BIN
.github/assets/english.xcf
vendored
BIN
.github/assets/english.xcf
vendored
Binary file not shown.
BIN
.github/assets/german.png
vendored
BIN
.github/assets/german.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 1.9 KiB |
BIN
.github/assets/german.xcf
vendored
BIN
.github/assets/german.xcf
vendored
Binary file not shown.
6
.github/workflows/pushimage.yaml
vendored
6
.github/workflows/pushimage.yaml
vendored
@@ -26,9 +26,3 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
push: true
|
push: true
|
||||||
tags: ghcr.io/tlinden/kleingebaeck:${{ github.ref_name}}
|
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
|
|
||||||
|
|||||||
@@ -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!
|
|
||||||
@@ -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!
|
|
||||||
2
Makefile
2
Makefile
@@ -78,7 +78,7 @@ release: buildall
|
|||||||
|
|
||||||
show-versions: buildlocal
|
show-versions: buildlocal
|
||||||
@echo "### kleingebaeck version:"
|
@echo "### kleingebaeck version:"
|
||||||
@./kleingebaeck -V
|
@./kleingebaeck -v
|
||||||
|
|
||||||
@echo
|
@echo
|
||||||
@echo "### go module versions:"
|
@echo "### go module versions:"
|
||||||
|
|||||||
303
README-de.md
303
README-de.md
@@ -1,303 +0,0 @@
|
|||||||
## Kleingebäck - kleinanzeigen.de Backup
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
[](https://goreportcard.com/report/github.com/tlinden/kleingebaeck)
|
|
||||||
[](https://github.com/tlinden/kleingebaeck/actions)
|
|
||||||
[](https://raw.githack.com/wiki/tlinden/kleingebaeck/coverage.html)
|
|
||||||

|
|
||||||
[](https://github.com/TLINDEN/kleingebaeck/releases/latest)
|
|
||||||
[](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:
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
Sichern ich meine Anzeigen:
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
Backupverzeichnis nach dem Download:
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
Verzeichnis einer Anzeige:
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
**Das gleiche unter Windows:**
|
|
||||||
|
|
||||||
Anzeigen Sichern:
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
Backupverzeichnis nach dem Download
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
Und eine Anzeige:
|
|
||||||
|
|
||||||

|
|
||||||
|
|
||||||
## 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>
|
|
||||||
|
|
||||||
46
README.md
46
README.md
@@ -7,9 +7,7 @@
|
|||||||
[](https://raw.githack.com/wiki/tlinden/kleingebaeck/coverage.html)
|
[](https://raw.githack.com/wiki/tlinden/kleingebaeck/coverage.html)
|
||||||

|

|
||||||
[](https://github.com/TLINDEN/kleingebaeck/releases/latest)
|
[](https://github.com/TLINDEN/kleingebaeck/releases/latest)
|
||||||
[](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
|
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
|
page](https://github.com/TLINDEN/kleingebaeck/releases/latest) and
|
||||||
look for your OS and platform. There are two options to install the binary:
|
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`
|
e.g. `kleingebaeck-linux-amd64-0.0.5`, rename it to `kleingebaeck`
|
||||||
(or whatever you like more!) and put it into your bin dir
|
(or whatever you like more!) and put it into your bin dir
|
||||||
(e.g. `$HOME/bin` or as root to `/usr/local/bin`).
|
(e.g. `$HOME/bin` or as root to `/usr/local/bin`).
|
||||||
@@ -99,37 +97,29 @@ To install after building either copy the binary or execute `sudo make install`.
|
|||||||
### Using the docker image
|
### Using the docker image
|
||||||
|
|
||||||
A pre-built docker image is available, which you can use to test the
|
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
|
```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 `OUTDIR` must exist
|
||||||
|
prior to the execution, otherwise docker will create it as root, then
|
||||||
|
kleingebaeck will fail. You may also use a `.env` file in the same
|
||||||
|
directory containing the variables, such as:
|
||||||
|
|
||||||
```shell
|
```
|
||||||
mkdir myads
|
USER_ID=1000
|
||||||
docker run -u `id -u $USER` -v ./myads:/backup ghcr.io/tlinden/kleingebaeck:latest -u XXX -v
|
GROUP_ID=1000
|
||||||
ls -l myads/ein-buch-mit-leeren-seiten
|
OUTDIR=./kleinanzeigen-backup
|
||||||
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
|
You may of course also modify the `docker-compose.yaml` to suit your needs.
|
||||||
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
|
If you want to build the image yourself, use the supplied Dockerfile.
|
||||||
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:
|
## Commandline options:
|
||||||
|
|
||||||
@@ -256,9 +246,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
|
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.
|
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.
|
Licensed under the GNU GENERAL PUBLIC LICENSE version 3.
|
||||||
|
|
||||||
|
|||||||
14
config.go
14
config.go
@@ -35,27 +35,19 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
VERSION string = "0.3.1"
|
VERSION string = "0.2.0"
|
||||||
Baseuri string = "https://www.kleinanzeigen.de"
|
Baseuri string = "https://www.kleinanzeigen.de"
|
||||||
Listuri string = "/s-bestandsliste.html"
|
Listuri string = "/s-bestandsliste.html"
|
||||||
Defaultdir string = "."
|
Defaultdir string = "."
|
||||||
|
|
||||||
DefaultTemplate string = "Title: {{.Title}}\nPrice: {{.Price}}\nId: {{.Id}}\n" +
|
DefaultTemplate string = "Title: {{.Title}}\nPrice: {{.Price}}\nId: {{.Id}}\n" +
|
||||||
"Category: {{.Category}}\nCondition: {{.Condition}}\n" +
|
"Category: {{.Category}}\nCondition: {{.Condition}}\n" +
|
||||||
"Created: {{.Created}}\nExpire: {{.Expire}}\n\n{{.Text}}\n"
|
"Created: {{.Created}}\nExpire: {{.Expire}}\n\n{{.Text}}\n"
|
||||||
|
|
||||||
DefaultTemplateWin string = "Title: {{.Title}}\r\nPrice: {{.Price}}\r\nId: {{.Id}}\r\n" +
|
DefaultTemplateWin string = "Title: {{.Title}}\r\nPrice: {{.Price}}\r\nId: {{.Id}}\r\n" +
|
||||||
"Category: {{.Category}}\r\nCondition: {{.Condition}}\r\n" +
|
"Category: {{.Category}}\r\nCondition: {{.Condition}}\r\n" +
|
||||||
"Created: {{.Created}}\r\nExpires: {{.Expire}}\r\n\r\n{{.Text}}\r\n"
|
"Created: {{.Created}}\r\nExpires: {{.Expire}}\r\n\r\n{{.Text}}\r\n"
|
||||||
|
Useragent string = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " +
|
||||||
DefaultUserAgent string = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " +
|
|
||||||
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
|
"AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
|
||||||
|
|
||||||
DefaultAdNameTemplate string = "{{.Slug}}"
|
DefaultAdNameTemplate string = "{{.Slug}}"
|
||||||
|
|
||||||
// for image download throttling
|
|
||||||
MinThrottle int = 2
|
|
||||||
MaxThrottle int = 20
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const Usage string = `This is kleingebaeck, the kleinanzeigen.de backup tool.
|
const Usage string = `This is kleingebaeck, the kleinanzeigen.de backup tool.
|
||||||
@@ -92,7 +84,6 @@ type Config struct {
|
|||||||
Limit int `koanf:"limit"`
|
Limit int `koanf:"limit"`
|
||||||
IgnoreErrors bool `koanf:"ignoreerrors"`
|
IgnoreErrors bool `koanf:"ignoreerrors"`
|
||||||
ForceDownload bool `koanf:"force"`
|
ForceDownload bool `koanf:"force"`
|
||||||
UserAgent string `koanf:"useragent"` // conf only
|
|
||||||
Adlinks []string
|
Adlinks []string
|
||||||
StatsCountAds int
|
StatsCountAds int
|
||||||
StatsCountImages int
|
StatsCountImages int
|
||||||
@@ -123,7 +114,6 @@ func InitConfig(w io.Writer) (*Config, error) {
|
|||||||
"loglevel": "notice",
|
"loglevel": "notice",
|
||||||
"userid": 0,
|
"userid": 0,
|
||||||
"adnametemplate": DefaultAdNameTemplate,
|
"adnametemplate": DefaultAdNameTemplate,
|
||||||
"useragent": DefaultUserAgent,
|
|
||||||
}, "."), nil); err != nil {
|
}, "."), nil); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
35
fetch.go
35
fetch.go
@@ -22,32 +22,21 @@ import (
|
|||||||
"io"
|
"io"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/cookiejar"
|
|
||||||
"net/url"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// convenient wrapper to fetch some web content
|
// convenient wrapper to fetch some web content
|
||||||
type Fetcher struct {
|
type Fetcher struct {
|
||||||
Config *Config
|
Config *Config
|
||||||
Client *http.Client
|
Client *http.Client
|
||||||
Cookies []*http.Cookie
|
Useragent string // FIXME: make configurable
|
||||||
}
|
|
||||||
|
|
||||||
func NewFetcher(c *Config) (*Fetcher, error) {
|
|
||||||
jar, err := cookiejar.New(nil)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func NewFetcher(c *Config) *Fetcher {
|
||||||
return &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: c,
|
||||||
Cookies: []*http.Cookie{},
|
}
|
||||||
},
|
|
||||||
nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *Fetcher) Get(uri string) (io.ReadCloser, error) {
|
func (f *Fetcher) Get(uri string) (io.ReadCloser, error) {
|
||||||
@@ -56,16 +45,7 @@ func (f *Fetcher) Get(uri string) (io.ReadCloser, error) {
|
|||||||
return nil, 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)
|
res, err := f.Client.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -76,9 +56,6 @@ func (f *Fetcher) Get(uri string) (io.ReadCloser, error) {
|
|||||||
return nil, errors.New("could not get page via HTTP")
|
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
|
return res.Body, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
2
go.mod
2
go.mod
@@ -14,7 +14,7 @@ require (
|
|||||||
github.com/lmittmann/tint v1.0.4
|
github.com/lmittmann/tint v1.0.4
|
||||||
github.com/mattn/go-isatty v0.0.20
|
github.com/mattn/go-isatty v0.0.20
|
||||||
github.com/spf13/pflag v1.0.5
|
github.com/spf13/pflag v1.0.5
|
||||||
github.com/tlinden/yadu v0.1.1
|
github.com/tlinden/yadu v0.1.0
|
||||||
golang.org/x/sync v0.5.0
|
golang.org/x/sync v0.5.0
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
2
go.sum
2
go.sum
@@ -62,8 +62,6 @@ github.com/tlinden/yadu v0.0.0-20240118202225-ec3f0b7fc355 h1:EmgK+IGUz2m42bFKte
|
|||||||
github.com/tlinden/yadu v0.0.0-20240118202225-ec3f0b7fc355/go.mod h1:l3bRmHKL9zGAR6pnBHY2HRPxBecf7L74BoBgOOpTcUA=
|
github.com/tlinden/yadu v0.0.0-20240118202225-ec3f0b7fc355/go.mod h1:l3bRmHKL9zGAR6pnBHY2HRPxBecf7L74BoBgOOpTcUA=
|
||||||
github.com/tlinden/yadu v0.1.0 h1:qtCi1jxg392qVRLFyrJ2LYu6/PiKSp1LT02EX+mNLME=
|
github.com/tlinden/yadu v0.1.0 h1:qtCi1jxg392qVRLFyrJ2LYu6/PiKSp1LT02EX+mNLME=
|
||||||
github.com/tlinden/yadu v0.1.0/go.mod h1:l3bRmHKL9zGAR6pnBHY2HRPxBecf7L74BoBgOOpTcUA=
|
github.com/tlinden/yadu v0.1.0/go.mod h1:l3bRmHKL9zGAR6pnBHY2HRPxBecf7L74BoBgOOpTcUA=
|
||||||
github.com/tlinden/yadu v0.1.1 h1:116oEUy9b4PcMF5wLL2dCFA/sn/praYutOnao07MROw=
|
|
||||||
github.com/tlinden/yadu v0.1.1/go.mod h1:l3bRmHKL9zGAR6pnBHY2HRPxBecf7L74BoBgOOpTcUA=
|
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
golang.org/x/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-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-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||||
|
|||||||
@@ -133,7 +133,7 @@
|
|||||||
.\" ========================================================================
|
.\" ========================================================================
|
||||||
.\"
|
.\"
|
||||||
.IX Title "KLEINGEBAECK 1"
|
.IX Title "KLEINGEBAECK 1"
|
||||||
.TH KLEINGEBAECK 1 "2024-01-24" "1" "User Commands"
|
.TH KLEINGEBAECK 1 "2024-01-22" "1" "User Commands"
|
||||||
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
|
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
|
||||||
.\" way too many mistakes in technical documents.
|
.\" way too many mistakes in technical documents.
|
||||||
.if n .ad l
|
.if n .ad l
|
||||||
@@ -174,11 +174,10 @@ well. We use \s-1TOML\s0 as our configuration language. See
|
|||||||
.PP
|
.PP
|
||||||
Format is pretty simple:
|
Format is pretty simple:
|
||||||
.PP
|
.PP
|
||||||
.Vb 11
|
.Vb 10
|
||||||
\& user = 1010101
|
\& user = 1010101
|
||||||
\& loglevel = verbose
|
\& loglevel = verbose
|
||||||
\& outdir = "test"
|
\& outdir = "test"
|
||||||
\& useragent = "Mozilla/5.0"
|
|
||||||
\& template = """
|
\& template = """
|
||||||
\& Title: {{.Title}}
|
\& Title: {{.Title}}
|
||||||
\& Price: {{.Price}}
|
\& Price: {{.Price}}
|
||||||
|
|||||||
@@ -39,7 +39,6 @@ CONFIGURATION
|
|||||||
user = 1010101
|
user = 1010101
|
||||||
loglevel = verbose
|
loglevel = verbose
|
||||||
outdir = "test"
|
outdir = "test"
|
||||||
useragent = "Mozilla/5.0"
|
|
||||||
template = """
|
template = """
|
||||||
Title: {{.Title}}
|
Title: {{.Title}}
|
||||||
Price: {{.Price}}
|
Price: {{.Price}}
|
||||||
|
|||||||
@@ -39,7 +39,6 @@ Format is pretty simple:
|
|||||||
user = 1010101
|
user = 1010101
|
||||||
loglevel = verbose
|
loglevel = verbose
|
||||||
outdir = "test"
|
outdir = "test"
|
||||||
useragent = "Mozilla/5.0"
|
|
||||||
template = """
|
template = """
|
||||||
Title: {{.Title}}
|
Title: {{.Title}}
|
||||||
Price: {{.Price}}
|
Price: {{.Price}}
|
||||||
|
|||||||
10
main.go
10
main.go
@@ -22,10 +22,8 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"math/rand"
|
|
||||||
"os"
|
"os"
|
||||||
"runtime/debug"
|
"runtime/debug"
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/lmittmann/tint"
|
"github.com/lmittmann/tint"
|
||||||
"github.com/tlinden/yadu"
|
"github.com/tlinden/yadu"
|
||||||
@@ -113,13 +111,7 @@ func Main(w io.Writer) int {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// used for all HTTP requests
|
// used for all HTTP requests
|
||||||
fetch, err := NewFetcher(conf)
|
fetch := NewFetcher(conf)
|
||||||
if err != nil {
|
|
||||||
return Die(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// randomization needed here and there
|
|
||||||
rand.Seed(time.Now().UnixNano())
|
|
||||||
|
|
||||||
if len(conf.Adlinks) >= 1 {
|
if len(conf.Adlinks) >= 1 {
|
||||||
// directly backup ad listing[s]
|
// directly backup ad listing[s]
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
@@ -447,22 +446,19 @@ func GetImage(path string) []byte {
|
|||||||
|
|
||||||
// setup httpmock
|
// setup httpmock
|
||||||
func SetIntercept(ads []Adsource) {
|
func SetIntercept(ads []Adsource) {
|
||||||
ch := http.Header{}
|
|
||||||
ch.Add("Set-Cookie", "session=permanent")
|
|
||||||
|
|
||||||
for _, ad := range ads {
|
for _, ad := range ads {
|
||||||
if ad.status == 0 {
|
if ad.status == 0 {
|
||||||
ad.status = 200
|
ad.status = 200
|
||||||
}
|
}
|
||||||
|
|
||||||
httpmock.RegisterResponder("GET", ad.uri,
|
httpmock.RegisterResponder("GET", ad.uri,
|
||||||
httpmock.NewStringResponder(ad.status, ad.content).HeaderAdd(ch))
|
httpmock.NewStringResponder(ad.status, ad.content))
|
||||||
}
|
}
|
||||||
|
|
||||||
// we just use 2 images, put this here
|
// we just use 2 images, put this here
|
||||||
for _, image := range []string{"t/1.jpg", "t/2.jpg"} {
|
for _, image := range []string{"t/1.jpg", "t/2.jpg"} {
|
||||||
httpmock.RegisterResponder("GET", image,
|
httpmock.RegisterResponder("GET", image,
|
||||||
httpmock.NewBytesResponder(200, GetImage(image)).HeaderAdd(ch))
|
httpmock.NewBytesResponder(200, GetImage(image)))
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
10
scrape.go
10
scrape.go
@@ -24,7 +24,6 @@ import (
|
|||||||
"log/slog"
|
"log/slog"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
|
||||||
|
|
||||||
"astuart.co/goq"
|
"astuart.co/goq"
|
||||||
"golang.org/x/sync/errgroup"
|
"golang.org/x/sync/errgroup"
|
||||||
@@ -151,11 +150,6 @@ func ScrapeImages(fetch *Fetcher, ad *Ad, addir string) error {
|
|||||||
imguri := imguri
|
imguri := imguri
|
||||||
file := filepath.Join(adpath, fmt.Sprintf("%d.jpg", img))
|
file := filepath.Join(adpath, fmt.Sprintf("%d.jpg", img))
|
||||||
g.Go(func() error {
|
g.Go(func() error {
|
||||||
// wait a little
|
|
||||||
|
|
||||||
t := GetThrottleTime()
|
|
||||||
time.Sleep(t)
|
|
||||||
|
|
||||||
body, err := fetch.Getimage(imguri)
|
body, err := fetch.Getimage(imguri)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -169,7 +163,7 @@ func ScrapeImages(fetch *Fetcher, ad *Ad, addir string) error {
|
|||||||
|
|
||||||
buf2 := buf.Bytes() // needed for image writing
|
buf2 := buf.Bytes() // needed for image writing
|
||||||
|
|
||||||
image := NewImage(buf, file, imguri)
|
image := NewImage(buf, "", imguri)
|
||||||
err = image.CalcHash()
|
err = image.CalcHash()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -187,7 +181,7 @@ func ScrapeImages(fetch *Fetcher, ad *Ad, addir string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
slog.Debug("wrote image", "image", image, "size", len(buf2), "throttle", t)
|
slog.Debug("wrote image", "image", image, "size", len(buf2))
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
img++
|
img++
|
||||||
|
|||||||
@@ -1,37 +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 (
|
|
||||||
"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) {
|
|
||||||
buf := []byte{1, 2, 3, 4, 5, 6, 7, 8}
|
|
||||||
file := "t/out/t.jpg"
|
|
||||||
|
|
||||||
err := WriteImage(file, buf)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Could not write mock image to %s: %s", file, err.Error())
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
6
util.go
6
util.go
@@ -20,11 +20,9 @@ package main
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"errors"
|
"errors"
|
||||||
"math/rand"
|
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
"runtime"
|
"runtime"
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/mattn/go-isatty"
|
"github.com/mattn/go-isatty"
|
||||||
)
|
)
|
||||||
@@ -68,7 +66,3 @@ func IsNoTty() bool {
|
|||||||
// it is a tty
|
// it is a tty
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetThrottleTime() time.Duration {
|
|
||||||
return time.Duration(rand.Intn(MaxThrottle-MinThrottle+1)+MinThrottle) * time.Millisecond
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user