From 51da5cfb07ed0272089a326be649392cd50c285a Mon Sep 17 00:00:00 2001 From: Caleb Allen Date: Wed, 25 Feb 2026 21:16:29 -0500 Subject: [PATCH] no longer using forked beep --- backend/metadata/decoder.go | 10 +++++----- backend/player/player.go | 8 ++++---- docs/dev/overview.md | 2 +- go.mod | 4 +--- go.sum | 4 ++-- renovate.json5 | 17 +++++------------ 6 files changed, 18 insertions(+), 27 deletions(-) diff --git a/backend/metadata/decoder.go b/backend/metadata/decoder.go index da7edb6..028c784 100644 --- a/backend/metadata/decoder.go +++ b/backend/metadata/decoder.go @@ -7,11 +7,11 @@ import ( "os" "path/filepath" - "github.com/TheCodeOfCaleb/beep/v2" - "github.com/TheCodeOfCaleb/beep/v2/flac" - "github.com/TheCodeOfCaleb/beep/v2/mp3" - "github.com/TheCodeOfCaleb/beep/v2/vorbis" - "github.com/TheCodeOfCaleb/beep/v2/wav" + "github.com/gopxl/beep/v2" + "github.com/gopxl/beep/v2/flac" + "github.com/gopxl/beep/v2/mp3" + "github.com/gopxl/beep/v2/vorbis" + "github.com/gopxl/beep/v2/wav" ) // ErrUnsupportedFileType is returned when the audio file type is not supported. diff --git a/backend/player/player.go b/backend/player/player.go index 2fd3f60..376ae48 100644 --- a/backend/player/player.go +++ b/backend/player/player.go @@ -12,10 +12,10 @@ import ( "sync" "time" - "github.com/TheCodeOfCaleb/beep/v2" - "github.com/TheCodeOfCaleb/beep/v2/effects" - "github.com/TheCodeOfCaleb/beep/v2/generators" - "github.com/TheCodeOfCaleb/beep/v2/speaker" + "github.com/gopxl/beep/v2" + "github.com/gopxl/beep/v2/effects" + "github.com/gopxl/beep/v2/generators" + "github.com/gopxl/beep/v2/speaker" "github.com/wailsapp/wails/v2/pkg/runtime" "yellowjacket/backend/coverart" diff --git a/docs/dev/overview.md b/docs/dev/overview.md index c5e91a7..a8fe0f1 100644 --- a/docs/dev/overview.md +++ b/docs/dev/overview.md @@ -40,7 +40,7 @@ Used to generate Go code from SQL. Used to generate HTML templates with Go code. -### [Beep](https://github.com/TheCodeOfCaleb/beep/v2?tab=readme-ov-file#beep) +### [Beep](https://github.com/gopxl/beep?tab=readme-ov-file#beep) Used for audio playback. diff --git a/go.mod b/go.mod index 0f1bebd..8364c0b 100644 --- a/go.mod +++ b/go.mod @@ -4,11 +4,11 @@ go 1.25.0 require ( github.com/BurntSushi/toml v1.6.0 - github.com/TheCodeOfCaleb/beep/v2 v2.1.2 github.com/a-h/templ v0.3.977 github.com/dhowden/tag v0.0.0-20240417053706-3d75831295e8 github.com/godbus/dbus/v5 v5.1.0 github.com/golang-cz/devslog v0.0.15 + github.com/gopxl/beep/v2 v2.1.1 github.com/wailsapp/wails/v2 v2.10.2 golang.org/x/image v0.12.0 golang.org/x/sync v0.19.0 @@ -381,5 +381,3 @@ tool ( golang.org/x/vuln/cmd/govulncheck yellowjacket ) - -// replace github.com/TheCodeOfCaleb/beep/v2 => /mnt/vault/dev/golang/beep/ diff --git a/go.sum b/go.sum index 01a2cf8..2e39de5 100644 --- a/go.sum +++ b/go.sum @@ -103,8 +103,6 @@ github.com/ProtonMail/go-crypto v1.1.5 h1:eoAQfK2dwL+tFSFpr7TbOaPNUbPiJj4fLYwwGE github.com/ProtonMail/go-crypto v1.1.5/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= -github.com/TheCodeOfCaleb/beep/v2 v2.1.2 h1:KatJD9Pfd6BqFuGbHuDpkjQ+Fc2GYCHMRUmrqfKGkB0= -github.com/TheCodeOfCaleb/beep/v2 v2.1.2/go.mod h1:YpjGFvGe8GKxyKgpS/8bApdCgdMSS+aMbm5ANVNowNE= github.com/a-h/parse v0.0.0-20250122154542-74294addb73e h1:HjVbSQHy+dnlS6C3XajZ69NYAb5jbGNfHanvm1+iYlo= github.com/a-h/parse v0.0.0-20250122154542-74294addb73e/go.mod h1:3mnrkvGpurZ4ZrTDbYU84xhwXW2TjTKShSwjRi2ihfQ= github.com/a-h/templ v0.3.977 h1:kiKAPXTZE2Iaf8JbtM21r54A8bCNsncrfnokZZSrSDg= @@ -457,6 +455,8 @@ github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQ github.com/gookit/color v1.5.0/go.mod h1:43aQb+Zerm/BWh2GnrgOQm7ffz7tvQXEKV6BFMl7wAo= github.com/gookit/color v1.6.0 h1:JjJXBTk1ETNyqyilJhkTXJYYigHG24TM9Xa2M1xAhRA= github.com/gookit/color v1.6.0/go.mod h1:9ACFc7/1IpHGBW8RwuDm/0YEnhg3dwwXpoMsmtyHfjs= +github.com/gopxl/beep/v2 v2.1.1 h1:6FYIYMm2qPAdWkjX+7xwKrViS1x0Po5kDMdRkq8NVbU= +github.com/gopxl/beep/v2 v2.1.1/go.mod h1:ZAm9TGQ9lvpoiFLd4zf5B1IuyxZhgRACMId1XJbaW0E= github.com/gordonklaus/ineffassign v0.2.0 h1:Uths4KnmwxNJNzq87fwQQDDnbNb7De00VOk9Nu0TySs= github.com/gordonklaus/ineffassign v0.2.0/go.mod h1:TIpymnagPSexySzs7F9FnO1XFTy8IT3a59vmZp5Y9Lw= github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8= diff --git a/renovate.json5 b/renovate.json5 index 29d381b..e8eb184 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -7,7 +7,7 @@ // - Go and frontend (pnpm) dependency updates are grouped separately to keep // PRs reviewable and CI matrix manageable. // - GitHub Actions are tracked and grouped into a single PR. -// - The custom beep fork (TheCodeOfCaleb/beep) is excluded from updates. +// - Beep (gopxl/beep) is grouped with other Go dependencies. // - Go tool directives (templ, sqlc, lefthook) are tracked automatically. { "$schema": "https://docs.renovatebot.com/renovate-schema.json", @@ -81,14 +81,7 @@ "groupName": "github actions", }, - // 4. Ignore the custom beep fork — it's manually managed. - { - "description": "Ignore custom beep fork (manually managed)", - "matchPackageNames": ["github.com/TheCodeOfCaleb/beep/v2"], - "enabled": false, - }, - - // 5. Major updates get individual PRs for careful review. + // 4. Major updates get individual PRs for careful review. { "description": "Separate PRs for major updates", "matchUpdateTypes": ["major"], @@ -96,7 +89,7 @@ "commitMessagePrefix": "chore(deps)!:", }, - // 6. Auto-merge patch-level updates for dev dependencies. + // 5. Auto-merge patch-level updates for dev dependencies. { "description": "Auto-merge patch updates for frontend devDependencies", "matchManagers": ["npm"], @@ -106,14 +99,14 @@ "automergeType": "pr", }, - // 7. Pin htmx.org — it uses exact versioning intentionally. + // 6. Pin htmx.org — it uses exact versioning intentionally. { "description": "Keep htmx.org pinned to exact versions", "matchPackageNames": ["htmx.org"], "rangeStrategy": "pin", }, - // 8. Wails is critical infrastructure — separate PR, never auto-merge. + // 7. Wails is critical infrastructure — separate PR, never auto-merge. { "description": "Wails updates get their own PR (critical dep)", "matchPackageNames": ["github.com/wailsapp/wails/v2"],