From d3780e9e326659140f24e62afd8cb452ab34f15c Mon Sep 17 00:00:00 2001 From: arnef Date: Sun, 30 Aug 2026 18:51:45 +0200 Subject: [PATCH] refactor: align import paths with module name --- cmd/server/main.go | 18 +++++++++--------- go.mod | 2 +- internal/auth/middleware.go | 4 ++-- internal/birthdays/birthdays.go | 4 ++-- internal/caldav/backend.go | 12 ++++++------ internal/caldav/backend_test.go | 8 ++++---- internal/caldav/birthdays.go | 2 +- internal/caldav/ics.go | 2 +- internal/carddav/backend.go | 8 ++++---- internal/carddav/backend_test.go | 8 ++++---- internal/icssub/icssub.go | 2 +- internal/store/store_test.go | 2 +- internal/web/account.go | 4 ++-- internal/web/calendar.go | 8 ++++---- internal/web/contacts.go | 4 ++-- internal/web/dashboard.go | 4 ++-- internal/web/files.go | 2 +- internal/web/ics.go | 4 ++-- internal/web/render.go | 2 +- internal/web/resources.go | 4 ++-- internal/web/server.go | 8 ++++---- internal/web/server_test.go | 6 +++--- internal/web/shares.go | 2 +- internal/webdav/handler.go | 4 ++-- internal/webdav/handler_test.go | 4 ++-- tools/migrate/main.go | 4 ++-- tools/nidusctl/main.go | 6 +++--- tools/nidusctl/main_test.go | 2 +- tools/nidusctl/users.go | 2 +- 29 files changed, 71 insertions(+), 71 deletions(-) diff --git a/cmd/server/main.go b/cmd/server/main.go index 377f88b..b40efb0 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -13,15 +13,15 @@ import ( "syscall" "time" - "github.com/yourusername/caldav-server/internal/auth" - "github.com/yourusername/caldav-server/internal/caldav" - "github.com/yourusername/caldav-server/internal/carddav" - "github.com/yourusername/caldav-server/internal/config" - "github.com/yourusername/caldav-server/internal/db" - "github.com/yourusername/caldav-server/internal/store" - "github.com/yourusername/caldav-server/internal/web" - filewebdav "github.com/yourusername/caldav-server/internal/webdav" - webstatic "github.com/yourusername/caldav-server/web" + "git.arnef.de/arnef/nidus/internal/auth" + "git.arnef.de/arnef/nidus/internal/caldav" + "git.arnef.de/arnef/nidus/internal/carddav" + "git.arnef.de/arnef/nidus/internal/config" + "git.arnef.de/arnef/nidus/internal/db" + "git.arnef.de/arnef/nidus/internal/store" + "git.arnef.de/arnef/nidus/internal/web" + filewebdav "git.arnef.de/arnef/nidus/internal/webdav" + webstatic "git.arnef.de/arnef/nidus/web" ) func main() { diff --git a/go.mod b/go.mod index fcc29fe..8736990 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/yourusername/caldav-server +module git.arnef.de/arnef/nidus go 1.25.0 diff --git a/internal/auth/middleware.go b/internal/auth/middleware.go index fc0a914..3402160 100644 --- a/internal/auth/middleware.go +++ b/internal/auth/middleware.go @@ -5,8 +5,8 @@ import ( "log/slog" "net/http" - "github.com/yourusername/caldav-server/internal/config" - "github.com/yourusername/caldav-server/internal/db" + "git.arnef.de/arnef/nidus/internal/config" + "git.arnef.de/arnef/nidus/internal/db" ) type contextKey string diff --git a/internal/birthdays/birthdays.go b/internal/birthdays/birthdays.go index 1a8488d..66f6694 100644 --- a/internal/birthdays/birthdays.go +++ b/internal/birthdays/birthdays.go @@ -14,8 +14,8 @@ import ( "github.com/emersion/go-vcard" - "github.com/yourusername/caldav-server/internal/db" - "github.com/yourusername/caldav-server/internal/store" + "git.arnef.de/arnef/nidus/internal/db" + "git.arnef.de/arnef/nidus/internal/store" ) // Contact holds one contact's parsed birthday. diff --git a/internal/caldav/backend.go b/internal/caldav/backend.go index c1c0903..b797e5b 100644 --- a/internal/caldav/backend.go +++ b/internal/caldav/backend.go @@ -17,12 +17,12 @@ import ( ical "github.com/emersion/go-ical" "github.com/emersion/go-webdav" "github.com/emersion/go-webdav/caldav" - "github.com/yourusername/caldav-server/internal/auth" - "github.com/yourusername/caldav-server/internal/config" - "github.com/yourusername/caldav-server/internal/db" - "github.com/yourusername/caldav-server/internal/icalfix" - "github.com/yourusername/caldav-server/internal/icssub" - "github.com/yourusername/caldav-server/internal/store" + "git.arnef.de/arnef/nidus/internal/auth" + "git.arnef.de/arnef/nidus/internal/config" + "git.arnef.de/arnef/nidus/internal/db" + "git.arnef.de/arnef/nidus/internal/icalfix" + "git.arnef.de/arnef/nidus/internal/icssub" + "git.arnef.de/arnef/nidus/internal/store" ) // sharedNameSep separates the owner from the calendar name in the diff --git a/internal/caldav/backend_test.go b/internal/caldav/backend_test.go index 9f3dc3b..f15c77f 100644 --- a/internal/caldav/backend_test.go +++ b/internal/caldav/backend_test.go @@ -12,10 +12,10 @@ import ( "testing" ical "github.com/emersion/go-ical" - "github.com/yourusername/caldav-server/internal/auth" - "github.com/yourusername/caldav-server/internal/config" - "github.com/yourusername/caldav-server/internal/db" - "github.com/yourusername/caldav-server/internal/store" + "git.arnef.de/arnef/nidus/internal/auth" + "git.arnef.de/arnef/nidus/internal/config" + "git.arnef.de/arnef/nidus/internal/db" + "git.arnef.de/arnef/nidus/internal/store" ) func newTestBackend(t *testing.T) (*Backend, *db.DB) { diff --git a/internal/caldav/birthdays.go b/internal/caldav/birthdays.go index f1733de..2a799d4 100644 --- a/internal/caldav/birthdays.go +++ b/internal/caldav/birthdays.go @@ -13,7 +13,7 @@ import ( "github.com/emersion/go-webdav" "github.com/emersion/go-webdav/caldav" - "github.com/yourusername/caldav-server/internal/birthdays" + "git.arnef.de/arnef/nidus/internal/birthdays" ) // birthdaysCalendarName is the fixed, reserved local calendar name the diff --git a/internal/caldav/ics.go b/internal/caldav/ics.go index f064a5c..541a915 100644 --- a/internal/caldav/ics.go +++ b/internal/caldav/ics.go @@ -12,7 +12,7 @@ import ( "github.com/emersion/go-webdav" "github.com/emersion/go-webdav/caldav" - "github.com/yourusername/caldav-server/internal/db" + "git.arnef.de/arnef/nidus/internal/db" ) // defaultICSColor is the display color for an ICS/webcal subscription diff --git a/internal/carddav/backend.go b/internal/carddav/backend.go index b6b30c2..6fdb609 100644 --- a/internal/carddav/backend.go +++ b/internal/carddav/backend.go @@ -12,10 +12,10 @@ import ( vcard "github.com/emersion/go-vcard" "github.com/emersion/go-webdav" "github.com/emersion/go-webdav/carddav" - "github.com/yourusername/caldav-server/internal/auth" - "github.com/yourusername/caldav-server/internal/config" - "github.com/yourusername/caldav-server/internal/db" - "github.com/yourusername/caldav-server/internal/store" + "git.arnef.de/arnef/nidus/internal/auth" + "git.arnef.de/arnef/nidus/internal/config" + "git.arnef.de/arnef/nidus/internal/db" + "git.arnef.de/arnef/nidus/internal/store" ) // sharedNameSep separates the owner from the address book name in the diff --git a/internal/carddav/backend_test.go b/internal/carddav/backend_test.go index 8b8c035..14df6af 100644 --- a/internal/carddav/backend_test.go +++ b/internal/carddav/backend_test.go @@ -9,10 +9,10 @@ import ( "testing" vcard "github.com/emersion/go-vcard" - "github.com/yourusername/caldav-server/internal/auth" - "github.com/yourusername/caldav-server/internal/config" - "github.com/yourusername/caldav-server/internal/db" - "github.com/yourusername/caldav-server/internal/store" + "git.arnef.de/arnef/nidus/internal/auth" + "git.arnef.de/arnef/nidus/internal/config" + "git.arnef.de/arnef/nidus/internal/db" + "git.arnef.de/arnef/nidus/internal/store" ) func newTestBackend(t *testing.T) (*Backend, *db.DB) { diff --git a/internal/icssub/icssub.go b/internal/icssub/icssub.go index 5eb7610..fcbfb8a 100644 --- a/internal/icssub/icssub.go +++ b/internal/icssub/icssub.go @@ -16,7 +16,7 @@ import ( ical "github.com/emersion/go-ical" - "github.com/yourusername/caldav-server/internal/icalfix" + "git.arnef.de/arnef/nidus/internal/icalfix" ) // DefaultTTL is how long a fetched calendar is cached before being diff --git a/internal/store/store_test.go b/internal/store/store_test.go index c423d8f..1b83acf 100644 --- a/internal/store/store_test.go +++ b/internal/store/store_test.go @@ -6,7 +6,7 @@ import ( "sync" "testing" - "github.com/yourusername/caldav-server/internal/store" + "git.arnef.de/arnef/nidus/internal/store" ) func TestStoreRoundTrip(t *testing.T) { diff --git a/internal/web/account.go b/internal/web/account.go index b5ff33e..1b1738f 100644 --- a/internal/web/account.go +++ b/internal/web/account.go @@ -6,8 +6,8 @@ import ( "net/http" "strings" - "github.com/yourusername/caldav-server/internal/db" - "github.com/yourusername/caldav-server/internal/web/templates" + "git.arnef.de/arnef/nidus/internal/db" + "git.arnef.de/arnef/nidus/internal/web/templates" ) // handleAccount serves GET /account: the current user's own profile and diff --git a/internal/web/calendar.go b/internal/web/calendar.go index 26312f5..0ba9ffa 100644 --- a/internal/web/calendar.go +++ b/internal/web/calendar.go @@ -16,10 +16,10 @@ import ( "time" ical "github.com/emersion/go-ical" - "github.com/yourusername/caldav-server/internal/birthdays" - "github.com/yourusername/caldav-server/internal/db" - "github.com/yourusername/caldav-server/internal/icalfix" - "github.com/yourusername/caldav-server/internal/web/templates" + "git.arnef.de/arnef/nidus/internal/birthdays" + "git.arnef.de/arnef/nidus/internal/db" + "git.arnef.de/arnef/nidus/internal/icalfix" + "git.arnef.de/arnef/nidus/internal/web/templates" ) // eventIDRe validates an event's object ID as it appears in a URL path diff --git a/internal/web/contacts.go b/internal/web/contacts.go index 4117629..a4253dc 100644 --- a/internal/web/contacts.go +++ b/internal/web/contacts.go @@ -16,8 +16,8 @@ import ( "strings" vcard "github.com/emersion/go-vcard" - "github.com/yourusername/caldav-server/internal/store" - "github.com/yourusername/caldav-server/internal/web/templates" + "git.arnef.de/arnef/nidus/internal/store" + "git.arnef.de/arnef/nidus/internal/web/templates" ) // contactIDRe validates a contact's object ID as it appears in a URL path diff --git a/internal/web/dashboard.go b/internal/web/dashboard.go index cc1368f..98d3e9a 100644 --- a/internal/web/dashboard.go +++ b/internal/web/dashboard.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "github.com/yourusername/caldav-server/internal/db" - "github.com/yourusername/caldav-server/internal/web/templates" + "git.arnef.de/arnef/nidus/internal/db" + "git.arnef.de/arnef/nidus/internal/web/templates" ) func (s *Server) handleDashboard(w http.ResponseWriter, r *http.Request) { diff --git a/internal/web/files.go b/internal/web/files.go index 417efd5..07b91a7 100644 --- a/internal/web/files.go +++ b/internal/web/files.go @@ -12,7 +12,7 @@ import ( "path/filepath" "strings" - "github.com/yourusername/caldav-server/internal/web/templates" + "git.arnef.de/arnef/nidus/internal/web/templates" ) // maxUploadMemory bounds how much of a multipart upload is buffered in diff --git a/internal/web/ics.go b/internal/web/ics.go index 427790f..2d6b60c 100644 --- a/internal/web/ics.go +++ b/internal/web/ics.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" - "github.com/yourusername/caldav-server/internal/db" - "github.com/yourusername/caldav-server/internal/web/templates" + "git.arnef.de/arnef/nidus/internal/db" + "git.arnef.de/arnef/nidus/internal/web/templates" ) // icsURLValid does a light sanity check on a subscription URL: it must be diff --git a/internal/web/render.go b/internal/web/render.go index 4011686..f69f4e8 100644 --- a/internal/web/render.go +++ b/internal/web/render.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/yourusername/caldav-server/internal/web/templates" + "git.arnef.de/arnef/nidus/internal/web/templates" ) func renderLogin(w http.ResponseWriter, errMsg string) { diff --git a/internal/web/resources.go b/internal/web/resources.go index 8fb5155..6e051a4 100644 --- a/internal/web/resources.go +++ b/internal/web/resources.go @@ -6,8 +6,8 @@ import ( "regexp" "strings" - "github.com/yourusername/caldav-server/internal/db" - "github.com/yourusername/caldav-server/internal/web/templates" + "git.arnef.de/arnef/nidus/internal/db" + "git.arnef.de/arnef/nidus/internal/web/templates" ) // resourceNameRe restricts calendar/address book names to characters that diff --git a/internal/web/server.go b/internal/web/server.go index e1a0270..b66ab2c 100644 --- a/internal/web/server.go +++ b/internal/web/server.go @@ -10,10 +10,10 @@ import ( "net/http" "strings" - "github.com/yourusername/caldav-server/internal/config" - "github.com/yourusername/caldav-server/internal/db" - "github.com/yourusername/caldav-server/internal/icssub" - "github.com/yourusername/caldav-server/internal/store" + "git.arnef.de/arnef/nidus/internal/config" + "git.arnef.de/arnef/nidus/internal/db" + "git.arnef.de/arnef/nidus/internal/icssub" + "git.arnef.de/arnef/nidus/internal/store" ) // Server holds the dependencies needed by the web UI handlers. diff --git a/internal/web/server_test.go b/internal/web/server_test.go index 2e04fef..baee070 100644 --- a/internal/web/server_test.go +++ b/internal/web/server_test.go @@ -11,9 +11,9 @@ import ( "strings" "testing" - "github.com/yourusername/caldav-server/internal/config" - "github.com/yourusername/caldav-server/internal/db" - "github.com/yourusername/caldav-server/internal/store" + "git.arnef.de/arnef/nidus/internal/config" + "git.arnef.de/arnef/nidus/internal/db" + "git.arnef.de/arnef/nidus/internal/store" ) func newTestServer(t *testing.T) *Server { diff --git a/internal/web/shares.go b/internal/web/shares.go index 8c41f62..f58a2ce 100644 --- a/internal/web/shares.go +++ b/internal/web/shares.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/yourusername/caldav-server/internal/web/templates" + "git.arnef.de/arnef/nidus/internal/web/templates" ) // handleCalendarShare handles POST (create/update share) and DELETE diff --git a/internal/webdav/handler.go b/internal/webdav/handler.go index 2785c85..e1e91db 100644 --- a/internal/webdav/handler.go +++ b/internal/webdav/handler.go @@ -7,8 +7,8 @@ import ( "path/filepath" "sync" - "github.com/yourusername/caldav-server/internal/auth" - "github.com/yourusername/caldav-server/internal/config" + "git.arnef.de/arnef/nidus/internal/auth" + "git.arnef.de/arnef/nidus/internal/config" xwebdav "golang.org/x/net/webdav" ) diff --git a/internal/webdav/handler_test.go b/internal/webdav/handler_test.go index 1c6abc7..c23935a 100644 --- a/internal/webdav/handler_test.go +++ b/internal/webdav/handler_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/yourusername/caldav-server/internal/auth" - filewebdav "github.com/yourusername/caldav-server/internal/webdav" + "git.arnef.de/arnef/nidus/internal/auth" + filewebdav "git.arnef.de/arnef/nidus/internal/webdav" ) func testLogger() *slog.Logger { diff --git a/tools/migrate/main.go b/tools/migrate/main.go index 02252c2..0e32166 100644 --- a/tools/migrate/main.go +++ b/tools/migrate/main.go @@ -8,8 +8,8 @@ import ( "log/slog" "os" - "github.com/yourusername/caldav-server/internal/config" - "github.com/yourusername/caldav-server/internal/store" + "git.arnef.de/arnef/nidus/internal/config" + "git.arnef.de/arnef/nidus/internal/store" ) func main() { diff --git a/tools/nidusctl/main.go b/tools/nidusctl/main.go index fd08425..f8ded83 100644 --- a/tools/nidusctl/main.go +++ b/tools/nidusctl/main.go @@ -13,9 +13,9 @@ import ( "os" "path/filepath" - "github.com/yourusername/caldav-server/internal/config" - "github.com/yourusername/caldav-server/internal/db" - "github.com/yourusername/caldav-server/internal/store" + "git.arnef.de/arnef/nidus/internal/config" + "git.arnef.de/arnef/nidus/internal/db" + "git.arnef.de/arnef/nidus/internal/store" ) func main() { diff --git a/tools/nidusctl/main_test.go b/tools/nidusctl/main_test.go index 4057f93..8f1e55f 100644 --- a/tools/nidusctl/main_test.go +++ b/tools/nidusctl/main_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/yourusername/caldav-server/internal/db" + "git.arnef.de/arnef/nidus/internal/db" ) // writeTestConfig creates a minimal config.yaml in dir and returns its path. diff --git a/tools/nidusctl/users.go b/tools/nidusctl/users.go index b83f40b..01898fd 100644 --- a/tools/nidusctl/users.go +++ b/tools/nidusctl/users.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/yourusername/caldav-server/internal/db" + "git.arnef.de/arnef/nidus/internal/db" "golang.org/x/term" ) -- 2.54.0