Enhancements and various Fixes (#165)

* fix expire data calculation, fixes #162
* add shipping price, if any. fixes #164
* add gh-dash config
* add logo source
* fix #163: used invalid key for type attribute, fixed switch

.gh-dash.yml

@@ -0,0 +1,96 @@
+prSections:
+  - title: Responsible PRs
+    filters: repo:tlinden/kleingebaeck is:open NOT dependabot
+    layout:
+      repoName:
+        hidden: true
+
+  - title: Responsible Dependabot PRs
+    filters: repo:tlinden/kleingebaeck is:open dependabot
+    layout:
+      repoName:
+        hidden: true
+
+issuesSections:
+  - title: Responsible Issues
+    filters: is:open repo:tlinden/kleingebaeck -author:@me
+    layout:
+      repoName:
+        hidden: true
+
+  - title: Note-to-Self Issues
+    filters: is:open repo:tlinden/kleingebaeck author:@me
+    layout:
+      creator:
+        hidden: true
+      repoName:
+        hidden: true
+
+defaults:
+  preview:
+    open: false
+    width: 100
+
+keybindings:
+  universal:
+    - key: "shift+down"
+      builtin: pageDown
+    - key: "shift+up"
+      builtin: pageUp
+  prs:
+    - key: g
+      name: gitu
+      command: >
+        cd {{.RepoPath}} && /home/scip/bin/gitu
+    - key: M
+      name: squash-merge
+      command: gh pr merge --rebase --squash --admin --repo {{.RepoName}} {{.PrNumber}}
+    - key: i
+      name: show ci checks
+      command: gh pr checks --repo {{.RepoName}} {{.PrNumber}} | glow -p
+    - key: e
+      name: edit pr
+      command: ~/.config/gh-dash/edit-gh-pr {{.RepoName}} {{.PrNumber}}
+    - key: E
+      name: open repo in emacs
+      command: emacsclient {{.RepoPath}} &
+  issues:
+    - key: v
+      name: view
+      command: gh issue view --repo {{.RepoName}} {{.IssueNumber}} | glow -p
+    - key: l
+      name: add label
+      command: gh issue --repo {{.RepoName}} edit {{.IssueNumber}} --add-label $(gum choose bug enhancement question dependencies wontfix)
+    - key: L
+      name: remove label
+      command: gh issue --repo {{.RepoName}} edit {{.IssueNumber}} --remove-label $(gum choose bug enhancement question dependencies wontfix)
+    - key: E
+      name: open repo in emacs
+      command: emacsclient {{.RepoPath}} &
+
+theme:
+  ui:
+    sectionsShowCount: true
+    table:
+      compact: false
+      showSeparator: true
+  colors:
+    text:
+      primary: "#E2E1ED"
+      secondary: "#6770cb"
+      inverted: "#242347"
+      faint: "#b0793b"
+      warning: "#E0AF68"
+      success: "#3DF294"
+    background:
+      selected: "#1B1B33"
+    border:
+      primary: "#383B5B"
+      secondary: "#39386B"
+      faint: "#8d3e0b"
+
+repoPaths: 
+    :owner/:repo: ~/dev/:repo
+
+pager:
+  diff: delta

.github/workflows/ci.yaml

@@ -16,7 +16,7 @@ jobs:
       id: go
 
     - name: checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: build
       run: go build
@@ -42,6 +42,6 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version: 1.23
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v8

.github/workflows/pushimage.yaml

@@ -12,10 +12,10 @@ jobs:
       packages: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: Log in to the Container registry
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1
         with:
           registry: https://ghcr.io
           username: ${{ github.actor }}

.github/workflows/release.yaml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up Go
         uses: actions/setup-go@v5

README.md

@@ -201,6 +201,7 @@ somewhat like this:
 ```default
 Title: A book I sell
 Price: 99 € VB
+Shipping: 6,90 €
 Id: 1919191919
 Category: Sachbücher
 Condition: Sehr Gut

ad.go

@@ -44,6 +44,7 @@ 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]"`
+	Shipping     string   `goquery:".boxedarticle--details--shipping,text"` // not always filled
 	Expire       string
 
 	// runtime computed
@@ -61,6 +62,8 @@ func (ad *Ad) LogValue() slog.Value {
 		slog.String("categorytree", strings.Join(ad.CategoryTree, "+")),
 		slog.String("created", ad.Created),
 		slog.String("expire", ad.Expire),
+		slog.String("shipping", ad.Shipping),
+		slog.String("details", ad.Details),
 	)
 }
 
@@ -84,7 +87,7 @@ func (ad *Ad) CalculateExpire() {
 	if ad.Created != "" {
 		ts, err := time.Parse("02.01.2006", ad.Created)
 		if err == nil {
-			ad.Expire = ts.AddDate(0, ExpireMonths, ExpireDays).Format("02.01.2006")
+			ad.Expire = ts.AddDate(0, 0, ExpireDays).Format("02.01.2006")
 		}
 	}
 }
@@ -138,14 +141,23 @@ func (ad *Ad) DecodeAttributes() {
 
 	ad.Attributes = attrmap
 
-	switch {
+	if Exists(ad.Attributes, "Zustand") {
-	case Exists(ad.Attributes, "Zustand"):
 		ad.Condition = ad.Attributes["Zustand"]
-	case Exists(ad.Attributes, "Farbe"):
+	}
+
+	if Exists(ad.Attributes, "Farbe") {
 		ad.Color = ad.Attributes["Farbe"]
-	case Exists(ad.Attributes, "Art"):
+	}
-		ad.Type = ad.Attributes["Type"]
+
-	case Exists(ad.Attributes, "Material"):
+	if Exists(ad.Attributes, "Art") {
+		ad.Type = ad.Attributes["Art"]
+	}
+
+	if Exists(ad.Attributes, "Material") {
 		ad.Material = ad.Attributes["Material"]
 	}
+
+	slog.Debug("parsed attributes", "attributes", ad.Attributes)
+
+	ad.Shipping = strings.Replace(ad.Shipping, "+ Versand ab ", "", 1)
 }

config.go

@@ -34,7 +34,7 @@ import (
 )
 
 const (
-	VERSION    string = "0.3.21"
+	VERSION    string = "0.3.22"
 	Baseuri    string = "https://www.kleinanzeigen.de"
 	Listuri    string = "/s-bestandsliste.html"
 	Defaultdir string = "."
@@ -47,11 +47,11 @@ const (
 			"Created: {{.Created}}\nExpire: {{.Expire}}\n\n{{.Text}}\n"
 
 	*/
-	DefaultTemplate string = "Title: {{.Title}}\nPrice: {{.Price}}\nId: {{.ID}}\n" +
+	DefaultTemplate string = "Title: {{.Title}}\nPrice: {{.Price}}\nShipping: {{.Shipping}}\nId: {{.ID}}\n" +
 		"Category: {{.Category}}\nCondition: {{.Condition}}\nType: {{.Type}}\nColor: {{.Color}}\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\nShipping: {{.Shipping}}\r\nId: {{.ID}}\r\n" +
 		"Category: {{.Category}}\r\nCondition: {{.Condition}}\r\nType: {{.Type}}\r\nColor: {{.Color}}\r\n" +
 		"Created: {{.Created}}\r\nExpires: {{.Expire}}\r\n\r\n{{.Text}}\r\n"
 
@@ -69,8 +69,12 @@ const (
 	// we extract the slug from the uri
 	SlugURIPartNum int = 6
 
-	ExpireMonths int = 2
+	// We have  to calculate the ad expiry because  the real value can
-	ExpireDays   int = 1
+	// only be seen by logged in users. The initial ad lifetime is 120
+	// days. It can be extended by the user 8 days before expire by 60
+	// days. But this is unknown to us, so we'll stick with our 120
+	// days. They may be wrong for older ads. Don't rely on it!
+	ExpireDays int = 120
 
 	WIN string = "windows"
 )

example.conf

@@ -21,6 +21,7 @@ outdir = "test"
 template="""
 Title: {{.Title}}
 Price: {{.Price}}
+Shipping: {{.Shipping}}
 Id: {{.Id}}
 Category: {{.Category}}
 Condition: {{.Condition}}

go.mod

@@ -8,18 +8,18 @@ require (
 	astuart.co/goq v1.0.0
 	github.com/corona10/goimagehash v1.1.0
 	github.com/inconshreveable/mousetrap v1.1.0
-	github.com/jarcoal/httpmock v1.4.0
+	github.com/jarcoal/httpmock v1.4.1
 	github.com/knadh/koanf/parsers/toml v0.1.0
 	github.com/knadh/koanf/providers/confmap v1.0.0
 	github.com/knadh/koanf/providers/env v1.1.0
 	github.com/knadh/koanf/providers/file v1.2.0
 	github.com/knadh/koanf/providers/posflag v1.0.1
-	github.com/knadh/koanf/v2 v2.2.1
+	github.com/knadh/koanf/v2 v2.2.2
 	github.com/lmittmann/tint v1.1.2
 	github.com/mattn/go-isatty v0.0.20
-	github.com/spf13/pflag v1.0.6
+	github.com/spf13/pflag v1.0.9
 	github.com/tlinden/yadu v0.1.3
-	golang.org/x/image v0.26.0
+	golang.org/x/image v0.30.0
 	golang.org/x/sync v0.16.0
 )
 
@@ -28,7 +28,7 @@ require (
 	github.com/andybalholm/cascadia v1.1.0 // indirect
 	github.com/fatih/color v1.16.0 // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
-	github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/knadh/koanf/maps v0.1.2 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect

go.sum

@@ -15,12 +15,12 @@ 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.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk=
+github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
-github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/jarcoal/httpmock v1.4.0 h1:BvhqnH0JAYbNudL2GMJKgOHe2CtKlzJ/5rWKyp+hc2k=
+github.com/jarcoal/httpmock v1.4.1 h1:0Ju+VCFuARfFlhVXFc2HxlcQkfB+Xq12/EotHko+x2A=
-github.com/jarcoal/httpmock v1.4.0/go.mod h1:ftW1xULwo+j0R0JJkJIIi7UKigZUXCLLanykgjwBXL0=
+github.com/jarcoal/httpmock v1.4.1/go.mod h1:ftW1xULwo+j0R0JJkJIIi7UKigZUXCLLanykgjwBXL0=
 github.com/knadh/koanf/maps v0.1.2 h1:RBfmAW5CnZT+PJ1CVc1QSJKf4Xu9kxfQgYVQSu8hpbo=
 github.com/knadh/koanf/maps v0.1.2/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
 github.com/knadh/koanf/parsers/toml v0.1.0 h1:S2hLqS4TgWZYj4/7mI5m1CQQcWurxUz6ODgOub/6LCI=
@@ -33,8 +33,8 @@ github.com/knadh/koanf/providers/file v1.2.0 h1:hrUJ6Y9YOA49aNu/RSYzOTFlqzXSCpmY
 github.com/knadh/koanf/providers/file v1.2.0/go.mod h1:bp1PM5f83Q+TOUu10J/0ApLBd9uIzg+n9UgthfY+nRA=
 github.com/knadh/koanf/providers/posflag v1.0.1 h1:EnMxHSrPkYCFnKgBUl5KBgrjed8gVFrcXDzaW4l/C6Y=
 github.com/knadh/koanf/providers/posflag v1.0.1/go.mod h1:3Wn3+YG3f4ljzRyCUgIwH7G0sZ1pMjCOsNBovrbKmAk=
-github.com/knadh/koanf/v2 v2.2.1 h1:jaleChtw85y3UdBnI0wCqcg1sj1gPoz6D3caGNHtrNE=
+github.com/knadh/koanf/v2 v2.2.2 h1:ghbduIkpFui3L587wavneC9e3WIliCgiCgdxYO/wd7A=
-github.com/knadh/koanf/v2 v2.2.1/go.mod h1:PSFru3ufQgTsI7IF+95rf9s8XA1+aHxKuO/W+dPoHEY=
+github.com/knadh/koanf/v2 v2.2.2/go.mod h1:abWQc0cBXLSF/PSOMCB/SK+T13NXDsPvOksbpi5e/9Q=
 github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -57,8 +57,8 @@ github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3v
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
+github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
-github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
@@ -66,8 +66,8 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
 github.com/tlinden/yadu v0.1.3 h1:5cRCUmj+l5yvlM2irtpFBIJwVV2DPEgYSaWvF19FtcY=
 github.com/tlinden/yadu v0.1.3/go.mod h1:l3bRmHKL9zGAR6pnBHY2HRPxBecf7L74BoBgOOpTcUA=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/image v0.26.0 h1:4XjIFEZWQmCZi6Wv8BoxsDhRU3RVnLX04dToTDAEPlY=
+golang.org/x/image v0.30.0 h1:jD5RhkmVAnjqaCUXfbGBrn3lpxbknfN9w2UhHHU+5B4=
-golang.org/x/image v0.26.0/go.mod h1:lcxbMFAovzpnJxzXS3nyL83K27tmqtKzIJpctK8YO5c=
+golang.org/x/image v0.30.0/go.mod h1:SAEUTxCCMWSrJcCy/4HwavEsfZZJlYxeHLc6tTiAe/c=
 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=