.gitignore

@@ -3,4 +3,3 @@ release
 dist
 .env
 dist/
-.DS_Store

.goreleaser.yaml

@@ -1,9 +1,8 @@
-version: 2
-
 before:
   hooks:
     - go mod tidy
     - go test ./...
+    - golangci-lint run
 
 builds:
   - env:
@@ -14,11 +13,11 @@ builds:
       - darwin
 
 archives:
-  - formats: [tar.gz]
+  - format: tar.gz
     # this name template makes the OS and Arch compatible with the results of `uname`.
     name_template: >-
       {{ .ProjectName }}_
-      {{- title .Os }}_
+      {{- .Os }}_
       {{- if eq .Arch "amd64" }}x86_64
       {{- else if eq .Arch "386" }}i386
       {{- else }}{{ .Arch }}{{ end }}
@@ -26,28 +25,16 @@ archives:
     # use zip for windows archives
     format_overrides:
       - goos: windows
-        formats: [zip]
+        format: zip
 
 changelog:
-  disable: true
+  skip: true
 
 dockers:
   - image_templates:
-      - "tardisx/gropple:{{ .Tag }}-amd64"
-    use: buildx
-    build_flag_templates:
-      - "--pull"
-      - "--platform=linux/amd64"
-  - image_templates:
-      - "tardisx/gropple:{{ .Tag }}-arm64"
-    use: buildx
-    build_flag_templates:
-      - "--pull"
-      - "--platform=linux/arm64"
-    goarch: arm64
+      - "tardisx/gropple:{{ .Tag }}"
+      - "tardisx/gropple:v{{ .Major }}"
+      - "tardisx/gropple:v{{ .Major }}.{{ .Minor }}"
+      - "tardisx/gropple:latest"
+
 
-docker_manifests:
-  - name_template: "tardisx/gropple:{{ .Tag }}"
-    image_templates:
-      - "tardisx/gropple:{{ .Tag }}-amd64"
-      - "tardisx/gropple:{{ .Tag }}-arm64"

CHANGELOG.md

@@ -2,12 +2,6 @@
 
 All notable changes to this project will be documented in this file.
 
-## [v1.1.4] - 2025-04-25
-
-- Minor refactorings, upgrade dependencies
-- Migrate to goreleaser v2 configuration
-- Generate arm64 docker builds
-
 ## [v1.1.3] - 2024-03-17
 
 - Code cleanups, better error checking

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:noble
+FROM ubuntu:mantic
 COPY gropple /
 
 RUN apt update &&  apt install -y curl python3 ffmpeg

config/config.go

@@ -266,14 +266,14 @@ func (cs *ConfigService) LoadConfig() error {
 	path := cs.ConfigPath
 	b, err := os.ReadFile(path)
 	if err != nil {
-		return fmt.Errorf("could not read config '%s': %v", path, err)
+		return fmt.Errorf("Could not read config '%s': %v", path, err)
 	}
 	c := Config{}
 	cs.Config = &c
 
 	err = yaml.Unmarshal(b, &c)
 	if err != nil {
-		return fmt.Errorf("could not parse YAML config '%s': %v", path, err)
+		return fmt.Errorf("Could not parse YAML config '%s': %v", path, err)
 	}
 
 	// do migrations

docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   gropple:
-    image: tardisx/gropple:v1.1.4
+    image: tardisx/gropple:latest
     volumes:
       - /tmp/gropple-config-dir/:/config
       - /tmp/downloads/:/downloads/

download/download.go

@@ -277,7 +277,7 @@ func (dl *Download) Begin() {
 	}
 
 	// only add the url if it's not empty or an example URL. This helps us with testing
-	if dl.Url != "" && !strings.Contains(dl.domain(), "example.org") {
+	if !(dl.Url == "" || strings.Contains(dl.domain(), "example.org")) {
 		cmdSlice = append(cmdSlice, dl.Url)
 	}
 

go.mod

@@ -1,13 +1,11 @@
 module github.com/tardisx/gropple
 
-go 1.23.0
-
-toolchain go1.24.1
+go 1.22
 
 require (
 	github.com/gorilla/mux v1.8.1
 	github.com/stretchr/testify v1.9.0
-	golang.org/x/mod v0.24.0
+	golang.org/x/mod v0.16.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 

go.sum

@@ -6,8 +6,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
-golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
+golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 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.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

main.go

@@ -9,18 +9,13 @@ import (
 
 	"github.com/tardisx/gropple/config"
 	"github.com/tardisx/gropple/download"
-	v "github.com/tardisx/gropple/version"
+	"github.com/tardisx/gropple/version"
 	"github.com/tardisx/gropple/web"
 )
 
-var (
-	version = "dev"
-)
-
 func main() {
-	versionInfo := &v.Manager{
-		// version from goreleaser has no leading 'v', even if the tag does
-		VersionInfo: v.Info{CurrentVersion: "v" + version},
+	versionInfo := &version.Manager{
+		VersionInfo: version.Info{CurrentVersion: "v1.1.3"},
 	}
 	log.Printf("Starting gropple %s - https://github.com/tardisx/gropple", versionInfo.GetInfo().CurrentVersion)
 

web/web.go

@@ -416,7 +416,7 @@ func fetchHandler(cs *config.ConfigService, vm *version.Manager, dm *download.Ma
 
 			if !present {
 				w.WriteHeader(400)
-				_, _ = fmt.Fprint(w, "No url supplied")
+				fmt.Fprint(w, "No url supplied")
 				return
 			}
 
@@ -447,8 +447,7 @@ func bulkHandler(cs *config.ConfigService, vm *version.Manager, dm *download.Man
 		log.Printf("bulkHandler")
 
 		method := r.Method
-		switch method {
-		case "GET":
+		if method == "GET" {
 
 			t, err := template.ParseFS(webFS, "data/templates/layout.tmpl", "data/templates/menu.tmpl", "data/templates/bulk.tmpl")
 			if err != nil {
@@ -468,7 +467,8 @@ func bulkHandler(cs *config.ConfigService, vm *version.Manager, dm *download.Man
 			}
 
 			return
-		case "POST":
+
+		} else if method == "POST" {
 			type reqBulkType struct {
 				URLs                 string `json:"urls"`
 				ProfileChosen        string `json:"profile"`