aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2025-08-29 09:26:10 -0700
committerFranck Cuny <franck@fcuny.net>2025-08-29 09:26:10 -0700
commitb0e3bdaaba4f2671769f9c690b33155d7cf15017 (patch)
tree54d6a5c06056aacd3839367aa4c360ebaa93b748
parentMerge remote-tracking branch 'import/main' (diff)
downloadx-b0e3bdaaba4f2671769f9c690b33155d7cf15017.tar.gz
fix import paths for mpd-scrobbler
-rw-r--r--cmd/mpd-scrobbler/main.go16
-rw-r--r--go.mod3
-rw-r--r--go.sum6
-rw-r--r--internal/scrobbler/scrobbler.go5
4 files changed, 24 insertions, 6 deletions
diff --git a/cmd/mpd-scrobbler/main.go b/cmd/mpd-scrobbler/main.go
index c2693a4..cce441d 100644
--- a/cmd/mpd-scrobbler/main.go
+++ b/cmd/mpd-scrobbler/main.go
@@ -7,13 +7,21 @@ import (
"os"
"path/filepath"
- "golang.fcuny.net/mpd-stats/internal/scrobbler"
+ "go.fcuny.net/x/internal/scrobbler"
)
func main() {
var (
- mpdHost = flag.String("host", "localhost", "The MPD server to connect to (default: localhost)")
- mpdPort = flag.Int("port", 6600, "The TCP port of the MPD server to connect to (default: 6600)")
+ mpdHost = flag.String(
+ "host",
+ "localhost",
+ "The MPD server to connect to (default: localhost)",
+ )
+ mpdPort = flag.Int(
+ "port",
+ 6600,
+ "The TCP port of the MPD server to connect to (default: 6600)",
+ )
)
flag.Parse()
@@ -48,7 +56,7 @@ func getDbPath() (string, error) {
scrobblerHome := filepath.Join(xch, "mpd-scrobbler")
if _, err := os.Stat(scrobblerHome); os.IsNotExist(err) {
- if err := os.Mkdir(scrobblerHome, 0755); err != nil {
+ if err := os.Mkdir(scrobblerHome, 0o755); err != nil {
return "", err
}
}
diff --git a/go.mod b/go.mod
index e506b94..702811b 100644
--- a/go.mod
+++ b/go.mod
@@ -3,6 +3,9 @@ module go.fcuny.net/x
go 1.24.5
require (
+ github.com/fhs/gompd/v2 v2.3.0
+ github.com/google/uuid v1.6.0
+ github.com/mattn/go-sqlite3 v1.14.32
github.com/prometheus/client_golang v1.23.0
golang.org/x/mod v0.27.0
golang.org/x/text v0.28.0
diff --git a/go.sum b/go.sum
index a74ab67..a9149e9 100644
--- a/go.sum
+++ b/go.sum
@@ -4,12 +4,18 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fhs/gompd/v2 v2.3.0 h1:wuruUjmOODRlJhrYx73rJnzS7vTSXSU7pWmZtM3VPE0=
+github.com/fhs/gompd/v2 v2.3.0/go.mod h1:nNdZtcpD5VpmzZbRl5rV6RhxeMmAWTxEsSIMBkmMIy4=
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/mattn/go-sqlite3 v1.14.32 h1:JD12Ag3oLy1zQA+BNn74xRgaBbdhbNIDYvQUEuuErjs=
+github.com/mattn/go-sqlite3 v1.14.32/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
diff --git a/internal/scrobbler/scrobbler.go b/internal/scrobbler/scrobbler.go
index f0f9d0e..694f9ff 100644
--- a/internal/scrobbler/scrobbler.go
+++ b/internal/scrobbler/scrobbler.go
@@ -5,7 +5,7 @@ import (
"log"
"time"
- "golang.fcuny.net/mpd-stats/internal/mpd"
+ "go.fcuny.net/x/internal/mpd"
)
type Scrobbler struct {
@@ -96,7 +96,8 @@ func (s *Scrobbler) Run() error {
}
func (s *Scrobbler) save(record *Record) error {
- _, err := s.db.Exec("insert into records(id, title, artist, album, duration, playtime, time) values(?, ?, ?, ?, ?, 0, ?)",
+ _, err := s.db.Exec(
+ "insert into records(id, title, artist, album, duration, playtime, time) values(?, ?, ?, ?, ?, 0, ?)",
record.Id,
record.Title,
record.Artist,