From 0c7a3591d00263ba54d9d25abd847e1cae42c0bb Mon Sep 17 00:00:00 2001 From: Erik Winter Date: Tue, 17 Sep 2024 07:43:12 +0200 Subject: [PATCH] domain update --- client/imdb.go | 2 +- client/tmdb.go | 2 +- desktop-client/backend/backend.go | 4 ++-- desktop-client/backend/state.go | 2 +- desktop-client/gui/gui.go | 2 +- desktop-client/main.go | 8 ++++---- go.mod | 4 ++-- go.sum | 12 ++---------- job/queue.go | 4 ++-- markdown-export/main.go | 4 ++-- terminal-client/main.go | 8 ++++---- terminal-client/tui/basemodel.go | 6 +++--- terminal-client/tui/movie.go | 2 +- terminal-client/tui/tabemdb.go | 2 +- terminal-client/tui/tabreview.go | 2 +- terminal-client/tui/tabtmdb.go | 6 +++--- terminal-client/tui/tui.go | 6 +++--- worker-client/main.go | 8 ++++---- worker-client/worker/findalltitles.go | 2 +- worker-client/worker/findtitles.go | 2 +- worker-client/worker/refreshallreviews.go | 2 +- worker-client/worker/refreshreviews.go | 2 +- worker-client/worker/worker.go | 6 +++--- 23 files changed, 45 insertions(+), 53 deletions(-) diff --git a/client/imdb.go b/client/imdb.go index cf71f7d..e66b415 100644 --- a/client/imdb.go +++ b/client/imdb.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "code.ewintr.nl/emdb/storage" + "go-mod.ewintr.nl/emdb/storage" "github.com/PuerkitoBio/goquery" "github.com/google/uuid" ) diff --git a/client/tmdb.go b/client/tmdb.go index e64b058..c0a68cc 100644 --- a/client/tmdb.go +++ b/client/tmdb.go @@ -3,7 +3,7 @@ package client import ( "time" - "code.ewintr.nl/emdb/storage" + "go-mod.ewintr.nl/emdb/storage" tmdb "github.com/cyruzin/golang-tmdb" ) diff --git a/desktop-client/backend/backend.go b/desktop-client/backend/backend.go index 6c4bd10..d7a50b6 100644 --- a/desktop-client/backend/backend.go +++ b/desktop-client/backend/backend.go @@ -3,8 +3,8 @@ package backend import ( "fmt" - "code.ewintr.nl/emdb/client" - "code.ewintr.nl/emdb/storage" + "go-mod.ewintr.nl/emdb/client" + "go-mod.ewintr.nl/emdb/storage" ) type Backend struct { diff --git a/desktop-client/backend/state.go b/desktop-client/backend/state.go index 8e00680..9f89afd 100644 --- a/desktop-client/backend/state.go +++ b/desktop-client/backend/state.go @@ -1,7 +1,7 @@ package backend import ( - "code.ewintr.nl/emdb/storage" + "go-mod.ewintr.nl/emdb/storage" ) type State struct { diff --git a/desktop-client/gui/gui.go b/desktop-client/gui/gui.go index 8e282c5..c6bbeab 100644 --- a/desktop-client/gui/gui.go +++ b/desktop-client/gui/gui.go @@ -3,7 +3,7 @@ package gui import ( "strings" - "code.ewintr.nl/emdb/desktop-client/backend" + "go-mod.ewintr.nl/emdb/desktop-client/backend" "fyne.io/fyne/v2" "fyne.io/fyne/v2/app" "fyne.io/fyne/v2/container" diff --git a/desktop-client/main.go b/desktop-client/main.go index f93c331..b392d69 100644 --- a/desktop-client/main.go +++ b/desktop-client/main.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "code.ewintr.nl/emdb/client" - "code.ewintr.nl/emdb/desktop-client/backend" - "code.ewintr.nl/emdb/desktop-client/gui" - "code.ewintr.nl/emdb/storage" + "go-mod.ewintr.nl/emdb/client" + "go-mod.ewintr.nl/emdb/desktop-client/backend" + "go-mod.ewintr.nl/emdb/desktop-client/gui" + "go-mod.ewintr.nl/emdb/storage" ) func main() { diff --git a/go.mod b/go.mod index caed40d..753de5c 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,8 @@ -module code.ewintr.nl/emdb +module go-mod.ewintr.nl/emdb go 1.21.5 require ( - code.ewintr.nl/go-kit v0.0.0-20240308074309-a1328c3c44c6 fyne.io/fyne/v2 v2.4.5 github.com/PuerkitoBio/goquery v1.9.1 github.com/charmbracelet/bubbles v0.18.0 @@ -54,6 +53,7 @@ require ( github.com/stretchr/testify v1.8.4 // indirect github.com/tevino/abool v1.2.0 // indirect github.com/yuin/goldmark v1.5.5 // indirect + go-mod.ewintr.nl/go-kit v0.0.0-20240915084633-589e6c3a4b97 // indirect golang.org/x/image v0.11.0 // indirect golang.org/x/mobile v0.0.0-20230531173138-3c911d8e3eda // indirect golang.org/x/net v0.21.0 // indirect diff --git a/go.sum b/go.sum index 5ee6fb8..dfd5109 100644 --- a/go.sum +++ b/go.sum @@ -36,8 +36,6 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -code.ewintr.nl/go-kit v0.0.0-20240308074309-a1328c3c44c6 h1:qZwAicZOd18o9qWCU3pSj/QnrSNLCAMAOPJvyLgBQ0U= -code.ewintr.nl/go-kit v0.0.0-20240308074309-a1328c3c44c6/go.mod h1:Yk8Mdn1f4/L9tcymurtItqevVkac6P9ljh2Sd3T+FS8= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= fyne.io/fyne/v2 v2.4.5 h1:W6jpAEmLoBbKyBB+EXqI7GMJ7kLgHQWCa0wZHUV2VfQ= fyne.io/fyne/v2 v2.4.5/go.mod h1:SlOgbca0y80cRObu/JOhxIJdIgtoW7aCyqUVlTMgs0Y= @@ -116,8 +114,6 @@ github.com/go-text/render v0.1.0 h1:osrmVDZNHuP1RSu3pNG7Z77Sd2xSbcb/xWytAj9kyVs= github.com/go-text/render v0.1.0/go.mod h1:jqEuNMenrmj6QRnkdpeaP0oKGFLDNhDkVKwGjsWWYU4= github.com/go-text/typesetting v0.1.0 h1:vioSaLPYcHwPEPLT7gsjCGDCoYSbljxoHJzMnKwVvHw= github.com/go-text/typesetting v0.1.0/go.mod h1:d22AnmeKq/on0HNv73UFriMKc4Ez6EqZAofLhAzpSzI= -github.com/go-text/typesetting-utils v0.0.0-20240329101916-eee87fb235a3 h1:levTnuLLUmpavLGbJYLJA7fQnKeS7P1eCdAlM+vReXk= -github.com/go-text/typesetting-utils v0.0.0-20240329101916-eee87fb235a3/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -228,14 +224,10 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -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/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= @@ -292,7 +284,6 @@ github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUc github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= -github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= @@ -339,6 +330,8 @@ github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yuin/goldmark v1.5.5 h1:IJznPe8wOzfIKETmMkd06F8nXkmlhaHqFRM9l1hAGsU= github.com/yuin/goldmark v1.5.5/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go-mod.ewintr.nl/go-kit v0.0.0-20240915084633-589e6c3a4b97 h1:vk8KmsDbJOYFD8JrYPRlJ44ll6H2JgiPcYrNZNJccj8= +go-mod.ewintr.nl/go-kit v0.0.0-20240915084633-589e6c3a4b97/go.mod h1:JVAoSGJi3oLkkl+nGN0pqRjP6omkPfriCaT3CslW+Ok= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= @@ -712,7 +705,6 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= diff --git a/job/queue.go b/job/queue.go index 3c63753..a0b49c1 100644 --- a/job/queue.go +++ b/job/queue.go @@ -5,7 +5,7 @@ import ( "errors" "log/slog" - "code.ewintr.nl/emdb/storage" + "go-mod.ewintr.nl/emdb/storage" ) type JobQueue struct { @@ -63,7 +63,7 @@ LIMIT 1;`) UPDATE job_queue SET status='doing' WHERE id=$1;`, job.ID); err != nil { - logger.Error("could not set job to doing", "error") + logger.Error("could not set job to doing", "error", err) return Job{}, err } diff --git a/markdown-export/main.go b/markdown-export/main.go index 97f2f1b..d74daa7 100644 --- a/markdown-export/main.go +++ b/markdown-export/main.go @@ -7,8 +7,8 @@ import ( "strings" "text/template" - "code.ewintr.nl/emdb/storage" - "code.ewintr.nl/go-kit/slugify" + "go-mod.ewintr.nl/emdb/storage" + "go-mod.ewintr.nl/go-kit/slugify" ) const ( diff --git a/terminal-client/main.go b/terminal-client/main.go index 1333657..d6dd717 100644 --- a/terminal-client/main.go +++ b/terminal-client/main.go @@ -5,10 +5,10 @@ import ( "log/slog" "os" - "code.ewintr.nl/emdb/client" - "code.ewintr.nl/emdb/job" - "code.ewintr.nl/emdb/storage" - "code.ewintr.nl/emdb/terminal-client/tui" + "go-mod.ewintr.nl/emdb/client" + "go-mod.ewintr.nl/emdb/job" + "go-mod.ewintr.nl/emdb/storage" + "go-mod.ewintr.nl/emdb/terminal-client/tui" ) func main() { diff --git a/terminal-client/tui/basemodel.go b/terminal-client/tui/basemodel.go index 0f57b73..e076dd8 100644 --- a/terminal-client/tui/basemodel.go +++ b/terminal-client/tui/basemodel.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "code.ewintr.nl/emdb/client" - "code.ewintr.nl/emdb/job" - "code.ewintr.nl/emdb/storage" + "go-mod.ewintr.nl/emdb/client" + "go-mod.ewintr.nl/emdb/job" + "go-mod.ewintr.nl/emdb/storage" "github.com/charmbracelet/bubbles/viewport" tea "github.com/charmbracelet/bubbletea" ) diff --git a/terminal-client/tui/movie.go b/terminal-client/tui/movie.go index 7f89cc6..e786c97 100644 --- a/terminal-client/tui/movie.go +++ b/terminal-client/tui/movie.go @@ -3,7 +3,7 @@ package tui import ( "fmt" - "code.ewintr.nl/emdb/storage" + "go-mod.ewintr.nl/emdb/storage" "github.com/charmbracelet/bubbles/list" ) diff --git a/terminal-client/tui/tabemdb.go b/terminal-client/tui/tabemdb.go index 3347b1d..c899ee5 100644 --- a/terminal-client/tui/tabemdb.go +++ b/terminal-client/tui/tabemdb.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "code.ewintr.nl/emdb/storage" + "go-mod.ewintr.nl/emdb/storage" "github.com/charmbracelet/bubbles/list" "github.com/charmbracelet/bubbles/textarea" "github.com/charmbracelet/bubbles/textinput" diff --git a/terminal-client/tui/tabreview.go b/terminal-client/tui/tabreview.go index cca199a..171f88f 100644 --- a/terminal-client/tui/tabreview.go +++ b/terminal-client/tui/tabreview.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "code.ewintr.nl/emdb/storage" + "go-mod.ewintr.nl/emdb/storage" "github.com/charmbracelet/bubbles/textarea" "github.com/charmbracelet/bubbles/textinput" "github.com/charmbracelet/bubbles/viewport" diff --git a/terminal-client/tui/tabtmdb.go b/terminal-client/tui/tabtmdb.go index 71b2559..a0b48da 100644 --- a/terminal-client/tui/tabtmdb.go +++ b/terminal-client/tui/tabtmdb.go @@ -3,9 +3,9 @@ package tui import ( "fmt" - "code.ewintr.nl/emdb/client" - "code.ewintr.nl/emdb/job" - "code.ewintr.nl/emdb/storage" + "go-mod.ewintr.nl/emdb/client" + "go-mod.ewintr.nl/emdb/job" + "go-mod.ewintr.nl/emdb/storage" "github.com/charmbracelet/bubbles/list" "github.com/charmbracelet/bubbles/textinput" tea "github.com/charmbracelet/bubbletea" diff --git a/terminal-client/tui/tui.go b/terminal-client/tui/tui.go index 264f4e1..81adf90 100644 --- a/terminal-client/tui/tui.go +++ b/terminal-client/tui/tui.go @@ -1,9 +1,9 @@ package tui import ( - "code.ewintr.nl/emdb/client" - "code.ewintr.nl/emdb/job" - "code.ewintr.nl/emdb/storage" + "go-mod.ewintr.nl/emdb/client" + "go-mod.ewintr.nl/emdb/job" + "go-mod.ewintr.nl/emdb/storage" "github.com/charmbracelet/bubbles/viewport" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" diff --git a/worker-client/main.go b/worker-client/main.go index cc8b0be..faf659c 100644 --- a/worker-client/main.go +++ b/worker-client/main.go @@ -7,10 +7,10 @@ import ( "os/signal" "syscall" - "code.ewintr.nl/emdb/client" - "code.ewintr.nl/emdb/job" - "code.ewintr.nl/emdb/storage" - "code.ewintr.nl/emdb/worker-client/worker" + "go-mod.ewintr.nl/emdb/client" + "go-mod.ewintr.nl/emdb/job" + "go-mod.ewintr.nl/emdb/storage" + "go-mod.ewintr.nl/emdb/worker-client/worker" ) func main() { diff --git a/worker-client/worker/findalltitles.go b/worker-client/worker/findalltitles.go index 92b3a49..8cccdcd 100644 --- a/worker-client/worker/findalltitles.go +++ b/worker-client/worker/findalltitles.go @@ -1,7 +1,7 @@ package worker import ( - "code.ewintr.nl/emdb/job" + "go-mod.ewintr.nl/emdb/job" ) func (w *Worker) FindAllTitles(jobID int) { diff --git a/worker-client/worker/findtitles.go b/worker-client/worker/findtitles.go index 8af7ddf..1376e48 100644 --- a/worker-client/worker/findtitles.go +++ b/worker-client/worker/findtitles.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - "code.ewintr.nl/emdb/storage" + "go-mod.ewintr.nl/emdb/storage" ) const ( diff --git a/worker-client/worker/refreshallreviews.go b/worker-client/worker/refreshallreviews.go index da2c803..9762009 100644 --- a/worker-client/worker/refreshallreviews.go +++ b/worker-client/worker/refreshallreviews.go @@ -3,7 +3,7 @@ package worker import ( "time" - "code.ewintr.nl/emdb/job" + "go-mod.ewintr.nl/emdb/job" ) func (w *Worker) RefreshAllReviews(jobID int) { diff --git a/worker-client/worker/refreshreviews.go b/worker-client/worker/refreshreviews.go index 6125d5c..f211150 100644 --- a/worker-client/worker/refreshreviews.go +++ b/worker-client/worker/refreshreviews.go @@ -1,6 +1,6 @@ package worker -import "code.ewintr.nl/emdb/job" +import "go-mod.ewintr.nl/emdb/job" func (w *Worker) RefreshReviews(jobID int, movieID string) { logger := w.logger.With("method", "fetchReviews", "jobID", jobID, "movieID", movieID) diff --git a/worker-client/worker/worker.go b/worker-client/worker/worker.go index a3116b3..b26faec 100644 --- a/worker-client/worker/worker.go +++ b/worker-client/worker/worker.go @@ -6,9 +6,9 @@ import ( "log/slog" "time" - "code.ewintr.nl/emdb/client" - "code.ewintr.nl/emdb/job" - "code.ewintr.nl/emdb/storage" + "go-mod.ewintr.nl/emdb/client" + "go-mod.ewintr.nl/emdb/job" + "go-mod.ewintr.nl/emdb/storage" ) const (