update linter

update dependencies, add linter config, satisfy linter
fix release build (#2 )
2026-08-24 06:44:21 +02:00 · 2026-08-22 21:17:33 +02:00 · 2026-08-22 21:14:45 +02:00 · 2025-12-19 09:30:44 +01:00 · 2025-12-19 08:37:48 +01:00 · 2025-12-05 21:12:33 +01:00
11 changed files with 356 additions and 99 deletions
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -1,87 +0,0 @@
-name: build-release
-on:
-  push:
-    tags:
-      - "v*.*.*"
-
-jobs:
-  release:
-    name: Build Release Assets
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: 1.23.5
-
-      - name: Build the executables
-        run: ./mkrel.sh descratch ${{ github.ref_name}}
-
-      - name: List the executables
-        run: ls -l ./releases
-
-      - name: Upload the binaries
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.ref_name }}
-          file: ./releases/*
-          file_glob: true
-
-      - name: Build Changelog
-        id: github_release
-        uses: mikepenz/release-changelog-builder-action@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          mode: "PR"
-          configurationJson: |
-            {
-              "template": "#{{CHANGELOG}}\n\n**Full Changelog**: #{{RELEASE_DIFF}}",
-              "pr_template": "- #{{TITLE}} (##{{NUMBER}}) by #{{AUTHOR}}\n#{{BODY}}",
-              "empty_template": "- no changes",
-              "categories": [
-                {
-                    "title": "## New Features",
-                    "labels": ["add", "feature"]
-                },
-                {
-                    "title": "## Bug Fixes",
-                    "labels": ["fix", "bug", "revert"]
-                },
-                {
-                    "title": "## Documentation Enhancements",
-                    "labels": ["doc"]
-                },
-                {
-                    "title": "## Refactoring Efforts",
-                    "labels": ["refactor"]
-                },
-                {
-                    "title": "## Miscellaneus Changes",
-                    "labels": []
-                }
-              ],
-              "ignore_labels": [
-                 "duplicate", "good first issue", "help wanted", "invalid", "question", "wontfix"
-              ],
-              "label_extractor": [
-                 {
-                    "pattern": "(.) (.+)",
-                    "target": "$1"
-                 },
-                 {
-                    "pattern": "(.) (.+)",
-                    "target": "$1",
-                    "on_property": "title"
-                 }
-              ]
-            }
-    
-      - name: Create Release
-        uses: softprops/action-gh-release@v2
-        with:
-          body: ${{steps.github_release.outputs.changelog}}
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -0,0 +1,104 @@
+version: "2"
+
+linters:
+  enable:
+    - errcheck
+    - govet
+    - ineffassign
+    - staticcheck
+    - unused
+    - arangolint
+    - asasalint
+    - asciicheck
+    - bidichk
+    - bodyclose
+    - canonicalheader
+    - clickhouselint
+    - containedctx
+    - copyloopvar
+    - cyclop
+    - decorder
+    - dogsled
+    - dupword
+    - durationcheck
+    - embeddedstructfieldcheck
+    - errchkjson
+    - errname
+    - exhaustive
+    - exptostd
+    - fatcontext
+    - funcorder
+    - funlen
+    - ginkgolinter
+    - gocheckcompilerdirectives
+    - gochecknoinits
+    - gochecksumtype
+    - gocritic
+    - gocyclo
+    - godoclint
+    - goheader
+    - gomoddirectives
+    - gomodguard_v2
+    - goprintffuncname
+    - gosmopolitan
+    - grouper
+    - iface
+    - importas
+    - inamedparam
+    - interfacebloat
+    - intrange
+    - iotamixing
+    - lll
+    - loggercheck
+    - makezero
+    - misspell
+    - modernize
+    - nakedret
+    - nestif
+    - nilerr
+    - nilnesserr
+    - nlreturn
+    - nonamedreturns
+    - nosprintfhostport
+    - paralleltest
+    - perfsprint
+    - prealloc
+    - promlinter
+    - protogetter
+    - reassign
+    - recvcheck
+    - rowserrcheck
+    - sloglint
+    - spancheck
+    - sqlclosecheck
+    - tagalign
+    - testableexamples
+    - testifylint
+    - testpackage
+    - thelper
+    - tparallel
+    - unconvert
+    - unparam
+    - unqueryvet
+    - usestdlibvars
+    - usetesting
+    - varnamelen
+    - wastedassign
+    - whitespace
+    - wsl_v5
+    - zerologlint
+
+  settings:
+    varnamelen:
+      ignore-names:
+        - err
+        - wg
+        - mu
+        - ts
+        - to
+        - es
+        - op
+        - fd
+        - id
+        - fn
+      
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -0,0 +1,68 @@
+# vim: set ts=2 sw=2 tw=0 fo=cnqoj
+
+version: 2
+
+before:
+  hooks:
+    - go mod tidy
+
+gitea_urls:
+  api: https://codeberg.org/api/v1
+  download: https://codeberg.org
+  
+builds:
+  - env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - freebsd
+    goarch:
+      - amd64
+      - arm64
+
+archives:
+  - formats: [tar.gz]
+    # this name template makes the OS and Arch compatible with the results of `uname`.
+    name_template: >-
+      {{ .ProjectName }}_
+      {{- title .Os }}_
+      {{- if eq .Arch "amd64" }}x86_64
+      {{- else if eq .Arch "386" }}i386
+      {{- else }}{{ .Arch }}{{ end }}
+      {{- if .Arm }}v{{ .Arm }}{{ end }}_{{ .Tag }}
+    # use zip for windows archives
+    format_overrides:
+      - goos: windows
+        formats: [zip]
+      - goos: linux
+        formats: [tar.gz,binary]
+    files:
+      - src: "*.md"
+        strip_parent: true
+      - src: Makefile.dist
+        dst: Makefile
+    wrap_in_directory: true
+
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - "^docs:"
+      - "^test:"
+  groups:
+    - title: Improved
+      regexp: '^.*?(feat|add|new)(\([[:word:]]+\))??!?:.+$'
+      order: 0
+    - title: Fixed
+      regexp: '^.*?(bug|fix)(\([[:word:]]+\))??!?:.+$'
+      order: 1
+    - title: Changed
+      order: 999
+
+release:
+  header: "# Release Notes"
+  footer: >-
+
+    ---
+
+    Full Changelog: [{{ .PreviousTag }}...{{ .Tag }}](https://codeberg.org/scip/sway-descratch/compare/{{ .PreviousTag }}...{{ .Tag }})
--- a/.woodpecker/build.yaml
+++ b/.woodpecker/build.yaml
@@ -0,0 +1,38 @@
+matrix:
+  platform:
+    - linux/amd64
+  goversion:
+    - 1.26
+  lintversion:
+    - v2.12.2
+
+labels:
+  platform: ${platform}
+    
+steps:
+  build:
+    when:
+      event: [push]
+    image: golang:${goversion}
+    commands:
+      - go get
+      - go build
+
+  linter:
+    when:
+      event: [push]
+    image: golang:${goversion}
+    commands:
+      - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(go env GOPATH)/bin ${lintversion}
+      - golangci-lint --version
+      - golangci-lint run ./...
+    depends_on: [build]
+
+  test:
+    when:
+      event: [push]
+    image: golang:${goversion}
+    commands:
+      - go get
+      - go test -v -cover
+    depends_on: [build,linter]
--- a/.woodpecker/release.yaml
+++ b/.woodpecker/release.yaml
@@ -0,0 +1,15 @@
+# build release
+
+labels:
+  platform: linux/amd64
+    
+steps:
+  goreleaser:
+    image: goreleaser/goreleaser
+    when:
+      event: [tag]
+    environment:
+      GITEA_TOKEN:
+        from_secret: DEPLOY_TOKEN
+    commands:
+      - goreleaser release --clean --verbose
--- a/70
+++ b/70
@@ -0,0 +1,70 @@
+# Copyright © 2025-2026 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/>.
+
+
+#
+# no need to modify anything below
+tool      = sway-descratch
+VERSION   = $(shell grep VERSION main.go | head -1 | cut -d '"' -f2)
+archs     = darwin freebsd linux
+PREFIX    = /usr/local
+UID       = root
+GID       = 0
+HAVE_POD := $(shell pod2text -h 2>/dev/null)
+
+all: buildlocal
+
+
+buildlocal:
+	CGO_LDFLAGS='-static' go build -tags osusergo,netgo -ldflags "-extldflags=-static" -o $(tool)
+
+install: buildlocal
+	install -d -o $(UID) -g $(GID) $(PREFIX)/bin
+	install -d -o $(UID) -g $(GID) $(PREFIX)/man/man1
+	install -o $(UID) -g $(GID) -m 555 $(tool)  $(PREFIX)/sbin/
+	install -o $(UID) -g $(GID) -m 444 $(tool).1 $(PREFIX)/man/man1/
+
+clean:
+	rm -rf $(tool) coverage.out testdata t/out
+
+test: clean
+	mkdir -p t/out
+	go test ./... $(ARGS)
+
+testlint: test lint
+
+lint:
+	golangci-lint run --show-stats=false
+
+testfuzzy: clean
+	go test -fuzz ./... $(ARGS)
+
+singletest:
+	@echo "Call like this: make singletest TEST=TestPrepareColumns ARGS=-v"
+	go test -run $(TEST) $(ARGS)
+
+cover-report:
+	go test ./... -cover -coverprofile=coverage.out
+	go tool cover -html=coverage.out
+
+goupdate:
+	go get -t -u=patch ./...
+
+buildall:
+	./mkrel.sh $(tool) $(VERSION)
+
+release:
+	gh release create v$(VERSION) --generate-notes
+
--- a/Makefile.dist
+++ b/Makefile.dist
@@ -0,0 +1,18 @@
+# -*-make-*-
+
+.PHONY: install all
+
+tool   = rpn
+PREFIX = /usr/local
+UID    = root
+GID    = 0
+
+all:
+	@echo "Type 'sudo make install' to install the tool."
+	@echo "To change prefix, type 'sudo make install PREFIX=/opt'"
+
+install:
+	install -d -o $(UID) -g $(GID) $(PREFIX)/bin
+	install -d -o $(UID) -g $(GID) $(PREFIX)/share/doc
+	install -o $(UID) -g $(GID) -m 555 $(tool)  $(PREFIX)/sbin/
+	install -o $(UID) -g $(GID) -m 444 *.md $(PREFIX)/share/doc/
--- a/README.md
+++ b/README.md
@@ -1,7 +1,12 @@
+[![status-badge](https://ci.codeberg.org/api/badges/15678/status.svg)](https://ci.codeberg.org/repos/15678)
+[![Go Report Card](https://goreportcard.com/badge/codeberg.org/scip/swayipc)](https://goreportcard.com/report/codeberg.org/scip/sway-descratch) 
+[![License](https://img.shields.io/badge/license-GPL-blue.svg)](https://codeberg.org/scip/sway-descratch/raw/branch/main/LICENSE)
+
+
 # sway-descratch

 This   is    a   more   practical   example    for   [swayipc   module
-usage](https://github.com/TLINDEN/swayipc).  With  sway you  can  move
+usage](https://codeberg.org/scip/swayipc).  With  sway you  can  move
 windows  to a  "scratchpad", i.e.  like iconify  it. There  may be  an
 official  way to  get back  such  windows, but  I didn't  find a  good
 one. There's the  "scratchpad show" command, but it  doesn't allow you
@@ -37,11 +42,11 @@ best way for me to forget to do something.

 In order to report a bug,  unexpected behavior, feature requests or to
 submit    a    patch,    please    open   an    issue    on    github:
-https://github.com/tlinden/sway-descratch/issues.
+https://codeberg.org/scip/sway-descratch/issues.

 ## See also

- [swayipc golang sway binding](https://github.com/tlinden/swayipc)
+- [swayipc golang sway binding](https://codeberg.org/scip/swayipc)
 - [sway-ipc(7) manpage](https://www.mankier.com/7/sway-ipc)
 - [swaywm](https://github.com/swaywm/sway/)
 - [swayfx](https://github.com/WillPower3309/swayfx)
@@ -56,7 +61,7 @@ T.v.Dein <tom AT vondein DOT org>

 ## Project homepage

-https://github.com/tlinden/sway-descratch
+https://codeberg.org/scip/sway-descratch

 ## Copyright and License

--- a/go.mod
+++ b/go.mod
@@ -1,3 +1,8 @@
 module sway-descratch

-go 1.23.5
+go 1.26
+
+require (
+	codeberg.org/scip/swayipc/v2 v2.1.0
+	github.com/alecthomas/repr v0.5.4
+)
--- a/go.sum
+++ b/go.sum
@@ -0,0 +1,8 @@
+codeberg.org/scip/swayipc/v2 v2.0.0 h1:uHiETbutVJAUQVSzC5/PPFo2S+gEoCnzydhErYiQYNM=
+codeberg.org/scip/swayipc/v2 v2.0.0/go.mod h1:F+rmNQ+NjLDr8fU7HW/jSjiUIXeYfQ1cSyBiGByhoWI=
+codeberg.org/scip/swayipc/v2 v2.1.0 h1:tBiOBOUFDOA38+acZwx4BO5Yo/VVwxbqkL+R2/zmW6c=
+codeberg.org/scip/swayipc/v2 v2.1.0/go.mod h1:cqicjgMgPS7tGTJgjqjSMvnLeMA+J3to/YnufcysCns=
+github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs=
+github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
+github.com/alecthomas/repr v0.5.4 h1:OVP7JEcuzU9CCDsT6STCr3rg17oQfWILtPWd2EG0uN4=
+github.com/alecthomas/repr v0.5.4/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
--- a/main.go
+++ b/main.go
@@ -24,11 +24,20 @@ import (
 	"os"
 	"strconv"

+	"codeberg.org/scip/swayipc/v2"
 	"github.com/alecthomas/repr"
-	"github.com/tlinden/swayipc"
 )

+const VERSION = `v0.0.4`
+
 func main() {
+	if len(os.Args) > 1 {
+		if os.Args[1] == "-v" {
+			fmt.Printf("This is sway-descratch version %s\n", VERSION)
+			os.Exit(0)
+		}
+	}
+
 	// we need a session to sway via IPC
 	ipc := swayipc.NewSwayIPC()

@@ -36,12 +45,16 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	defer ipc.Close()
+	defer func() {
+		if err := ipc.Close(); err != nil {
+			log.Fatal(err)
+		}
+	}()

 	// first, retrieve the whole sway root node
 	root, err := ipc.GetTree()
 	if err != nil {
-		log.Fatal(err)
+		log.Fatal(err) // nolint:gocritic
 	}

 	// get the hidden scratchpad workspace
@@ -51,7 +64,7 @@ func main() {
 		// called with an arg, consider it to be a container id
 		id, err := strconv.Atoi(os.Args[1])
 		if err != nil {
-			log.Fatalf("failed to convert arg %s to integer: %w", os.Args[1], err)
+			log.Fatalf("failed to convert arg %s to integer: %s", os.Args[1], err)
 		}

 		// switch to it
@@ -65,8 +78,9 @@ func main() {
 func retrieveWindow(ipc *swayipc.SwayIPC, scratch *swayipc.Node, id int) {
 	// make sure the id exists
 	var exists bool
+
 	for _, con := range scratch.FloatingNodes {
-		if con.Id == id {
+		if con.ID == id {
 			exists = true
 		}
 	}
@@ -82,13 +96,12 @@ func retrieveWindow(ipc *swayipc.SwayIPC, scratch *swayipc.Node, id int) {
 		repr.Println(responses)
 		log.Fatal(err)
 	}
-
 }

 func listScratchedContainer(scratch *swayipc.Node) {
 	// list the windows
 	for _, con := range scratch.FloatingNodes {
-		fmt.Printf("%d %s\n", con.Id, con.Name)
+		fmt.Printf("%d %s\n", con.ID, con.Name)
 	}
 }
Author	SHA1	Message	Date
Thomas von Dein	02c1792d02	update linter	2026-08-22 21:17:33 +02:00
Thomas von Dein	12794946a1	update dependencies, add linter config, satisfy linter	2026-08-22 21:14:45 +02:00
T. von Dein	5f392e9d60	fix release build (#2 )	2025-12-19 09:30:44 +01:00
Thomas von Dein	81e7474846	add version flag -v and give it a version	2025-12-19 08:37:48 +01:00
T. von Dein	2d2ebc51ea	move to codeberg (#1 )	2025-12-05 21:12:33 +01:00