refactor: align import paths with module name
This commit was merged in pull request #5.
This commit is contained in:
+9
-9
@@ -13,15 +13,15 @@ import (
|
|||||||
"syscall"
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/yourusername/caldav-server/internal/auth"
|
"git.arnef.de/arnef/nidus/internal/auth"
|
||||||
"github.com/yourusername/caldav-server/internal/caldav"
|
"git.arnef.de/arnef/nidus/internal/caldav"
|
||||||
"github.com/yourusername/caldav-server/internal/carddav"
|
"git.arnef.de/arnef/nidus/internal/carddav"
|
||||||
"github.com/yourusername/caldav-server/internal/config"
|
"git.arnef.de/arnef/nidus/internal/config"
|
||||||
"github.com/yourusername/caldav-server/internal/db"
|
"git.arnef.de/arnef/nidus/internal/db"
|
||||||
"github.com/yourusername/caldav-server/internal/store"
|
"git.arnef.de/arnef/nidus/internal/store"
|
||||||
"github.com/yourusername/caldav-server/internal/web"
|
"git.arnef.de/arnef/nidus/internal/web"
|
||||||
filewebdav "github.com/yourusername/caldav-server/internal/webdav"
|
filewebdav "git.arnef.de/arnef/nidus/internal/webdav"
|
||||||
webstatic "github.com/yourusername/caldav-server/web"
|
webstatic "git.arnef.de/arnef/nidus/web"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
module github.com/yourusername/caldav-server
|
module git.arnef.de/arnef/nidus
|
||||||
|
|
||||||
go 1.25.0
|
go 1.25.0
|
||||||
|
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ import (
|
|||||||
"log/slog"
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/yourusername/caldav-server/internal/config"
|
"git.arnef.de/arnef/nidus/internal/config"
|
||||||
"github.com/yourusername/caldav-server/internal/db"
|
"git.arnef.de/arnef/nidus/internal/db"
|
||||||
)
|
)
|
||||||
|
|
||||||
type contextKey string
|
type contextKey string
|
||||||
|
|||||||
@@ -14,8 +14,8 @@ import (
|
|||||||
|
|
||||||
"github.com/emersion/go-vcard"
|
"github.com/emersion/go-vcard"
|
||||||
|
|
||||||
"github.com/yourusername/caldav-server/internal/db"
|
"git.arnef.de/arnef/nidus/internal/db"
|
||||||
"github.com/yourusername/caldav-server/internal/store"
|
"git.arnef.de/arnef/nidus/internal/store"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Contact holds one contact's parsed birthday.
|
// Contact holds one contact's parsed birthday.
|
||||||
|
|||||||
@@ -17,12 +17,12 @@ import (
|
|||||||
ical "github.com/emersion/go-ical"
|
ical "github.com/emersion/go-ical"
|
||||||
"github.com/emersion/go-webdav"
|
"github.com/emersion/go-webdav"
|
||||||
"github.com/emersion/go-webdav/caldav"
|
"github.com/emersion/go-webdav/caldav"
|
||||||
"github.com/yourusername/caldav-server/internal/auth"
|
"git.arnef.de/arnef/nidus/internal/auth"
|
||||||
"github.com/yourusername/caldav-server/internal/config"
|
"git.arnef.de/arnef/nidus/internal/config"
|
||||||
"github.com/yourusername/caldav-server/internal/db"
|
"git.arnef.de/arnef/nidus/internal/db"
|
||||||
"github.com/yourusername/caldav-server/internal/icalfix"
|
"git.arnef.de/arnef/nidus/internal/icalfix"
|
||||||
"github.com/yourusername/caldav-server/internal/icssub"
|
"git.arnef.de/arnef/nidus/internal/icssub"
|
||||||
"github.com/yourusername/caldav-server/internal/store"
|
"git.arnef.de/arnef/nidus/internal/store"
|
||||||
)
|
)
|
||||||
|
|
||||||
// sharedNameSep separates the owner from the calendar name in the
|
// sharedNameSep separates the owner from the calendar name in the
|
||||||
|
|||||||
@@ -12,10 +12,10 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
ical "github.com/emersion/go-ical"
|
ical "github.com/emersion/go-ical"
|
||||||
"github.com/yourusername/caldav-server/internal/auth"
|
"git.arnef.de/arnef/nidus/internal/auth"
|
||||||
"github.com/yourusername/caldav-server/internal/config"
|
"git.arnef.de/arnef/nidus/internal/config"
|
||||||
"github.com/yourusername/caldav-server/internal/db"
|
"git.arnef.de/arnef/nidus/internal/db"
|
||||||
"github.com/yourusername/caldav-server/internal/store"
|
"git.arnef.de/arnef/nidus/internal/store"
|
||||||
)
|
)
|
||||||
|
|
||||||
func newTestBackend(t *testing.T) (*Backend, *db.DB) {
|
func newTestBackend(t *testing.T) (*Backend, *db.DB) {
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import (
|
|||||||
"github.com/emersion/go-webdav"
|
"github.com/emersion/go-webdav"
|
||||||
"github.com/emersion/go-webdav/caldav"
|
"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
|
// birthdaysCalendarName is the fixed, reserved local calendar name the
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import (
|
|||||||
"github.com/emersion/go-webdav"
|
"github.com/emersion/go-webdav"
|
||||||
"github.com/emersion/go-webdav/caldav"
|
"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
|
// defaultICSColor is the display color for an ICS/webcal subscription
|
||||||
|
|||||||
@@ -12,10 +12,10 @@ import (
|
|||||||
vcard "github.com/emersion/go-vcard"
|
vcard "github.com/emersion/go-vcard"
|
||||||
"github.com/emersion/go-webdav"
|
"github.com/emersion/go-webdav"
|
||||||
"github.com/emersion/go-webdav/carddav"
|
"github.com/emersion/go-webdav/carddav"
|
||||||
"github.com/yourusername/caldav-server/internal/auth"
|
"git.arnef.de/arnef/nidus/internal/auth"
|
||||||
"github.com/yourusername/caldav-server/internal/config"
|
"git.arnef.de/arnef/nidus/internal/config"
|
||||||
"github.com/yourusername/caldav-server/internal/db"
|
"git.arnef.de/arnef/nidus/internal/db"
|
||||||
"github.com/yourusername/caldav-server/internal/store"
|
"git.arnef.de/arnef/nidus/internal/store"
|
||||||
)
|
)
|
||||||
|
|
||||||
// sharedNameSep separates the owner from the address book name in the
|
// sharedNameSep separates the owner from the address book name in the
|
||||||
|
|||||||
@@ -9,10 +9,10 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
vcard "github.com/emersion/go-vcard"
|
vcard "github.com/emersion/go-vcard"
|
||||||
"github.com/yourusername/caldav-server/internal/auth"
|
"git.arnef.de/arnef/nidus/internal/auth"
|
||||||
"github.com/yourusername/caldav-server/internal/config"
|
"git.arnef.de/arnef/nidus/internal/config"
|
||||||
"github.com/yourusername/caldav-server/internal/db"
|
"git.arnef.de/arnef/nidus/internal/db"
|
||||||
"github.com/yourusername/caldav-server/internal/store"
|
"git.arnef.de/arnef/nidus/internal/store"
|
||||||
)
|
)
|
||||||
|
|
||||||
func newTestBackend(t *testing.T) (*Backend, *db.DB) {
|
func newTestBackend(t *testing.T) (*Backend, *db.DB) {
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import (
|
|||||||
|
|
||||||
ical "github.com/emersion/go-ical"
|
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
|
// DefaultTTL is how long a fetched calendar is cached before being
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/yourusername/caldav-server/internal/store"
|
"git.arnef.de/arnef/nidus/internal/store"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestStoreRoundTrip(t *testing.T) {
|
func TestStoreRoundTrip(t *testing.T) {
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/yourusername/caldav-server/internal/db"
|
"git.arnef.de/arnef/nidus/internal/db"
|
||||||
"github.com/yourusername/caldav-server/internal/web/templates"
|
"git.arnef.de/arnef/nidus/internal/web/templates"
|
||||||
)
|
)
|
||||||
|
|
||||||
// handleAccount serves GET /account: the current user's own profile and
|
// handleAccount serves GET /account: the current user's own profile and
|
||||||
|
|||||||
@@ -16,10 +16,10 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
ical "github.com/emersion/go-ical"
|
ical "github.com/emersion/go-ical"
|
||||||
"github.com/yourusername/caldav-server/internal/birthdays"
|
"git.arnef.de/arnef/nidus/internal/birthdays"
|
||||||
"github.com/yourusername/caldav-server/internal/db"
|
"git.arnef.de/arnef/nidus/internal/db"
|
||||||
"github.com/yourusername/caldav-server/internal/icalfix"
|
"git.arnef.de/arnef/nidus/internal/icalfix"
|
||||||
"github.com/yourusername/caldav-server/internal/web/templates"
|
"git.arnef.de/arnef/nidus/internal/web/templates"
|
||||||
)
|
)
|
||||||
|
|
||||||
// eventIDRe validates an event's object ID as it appears in a URL path
|
// eventIDRe validates an event's object ID as it appears in a URL path
|
||||||
|
|||||||
@@ -16,8 +16,8 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
vcard "github.com/emersion/go-vcard"
|
vcard "github.com/emersion/go-vcard"
|
||||||
"github.com/yourusername/caldav-server/internal/store"
|
"git.arnef.de/arnef/nidus/internal/store"
|
||||||
"github.com/yourusername/caldav-server/internal/web/templates"
|
"git.arnef.de/arnef/nidus/internal/web/templates"
|
||||||
)
|
)
|
||||||
|
|
||||||
// contactIDRe validates a contact's object ID as it appears in a URL path
|
// contactIDRe validates a contact's object ID as it appears in a URL path
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"github.com/yourusername/caldav-server/internal/db"
|
"git.arnef.de/arnef/nidus/internal/db"
|
||||||
"github.com/yourusername/caldav-server/internal/web/templates"
|
"git.arnef.de/arnef/nidus/internal/web/templates"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (s *Server) handleDashboard(w http.ResponseWriter, r *http.Request) {
|
func (s *Server) handleDashboard(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"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
|
// maxUploadMemory bounds how much of a multipart upload is buffered in
|
||||||
|
|||||||
+2
-2
@@ -5,8 +5,8 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/yourusername/caldav-server/internal/db"
|
"git.arnef.de/arnef/nidus/internal/db"
|
||||||
"github.com/yourusername/caldav-server/internal/web/templates"
|
"git.arnef.de/arnef/nidus/internal/web/templates"
|
||||||
)
|
)
|
||||||
|
|
||||||
// icsURLValid does a light sanity check on a subscription URL: it must be
|
// icsURLValid does a light sanity check on a subscription URL: it must be
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"net/http"
|
"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) {
|
func renderLogin(w http.ResponseWriter, errMsg string) {
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ import (
|
|||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/yourusername/caldav-server/internal/db"
|
"git.arnef.de/arnef/nidus/internal/db"
|
||||||
"github.com/yourusername/caldav-server/internal/web/templates"
|
"git.arnef.de/arnef/nidus/internal/web/templates"
|
||||||
)
|
)
|
||||||
|
|
||||||
// resourceNameRe restricts calendar/address book names to characters that
|
// resourceNameRe restricts calendar/address book names to characters that
|
||||||
|
|||||||
@@ -10,10 +10,10 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/yourusername/caldav-server/internal/config"
|
"git.arnef.de/arnef/nidus/internal/config"
|
||||||
"github.com/yourusername/caldav-server/internal/db"
|
"git.arnef.de/arnef/nidus/internal/db"
|
||||||
"github.com/yourusername/caldav-server/internal/icssub"
|
"git.arnef.de/arnef/nidus/internal/icssub"
|
||||||
"github.com/yourusername/caldav-server/internal/store"
|
"git.arnef.de/arnef/nidus/internal/store"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Server holds the dependencies needed by the web UI handlers.
|
// Server holds the dependencies needed by the web UI handlers.
|
||||||
|
|||||||
@@ -11,9 +11,9 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/yourusername/caldav-server/internal/config"
|
"git.arnef.de/arnef/nidus/internal/config"
|
||||||
"github.com/yourusername/caldav-server/internal/db"
|
"git.arnef.de/arnef/nidus/internal/db"
|
||||||
"github.com/yourusername/caldav-server/internal/store"
|
"git.arnef.de/arnef/nidus/internal/store"
|
||||||
)
|
)
|
||||||
|
|
||||||
func newTestServer(t *testing.T) *Server {
|
func newTestServer(t *testing.T) *Server {
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"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
|
// handleCalendarShare handles POST (create/update share) and DELETE
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/yourusername/caldav-server/internal/auth"
|
"git.arnef.de/arnef/nidus/internal/auth"
|
||||||
"github.com/yourusername/caldav-server/internal/config"
|
"git.arnef.de/arnef/nidus/internal/config"
|
||||||
xwebdav "golang.org/x/net/webdav"
|
xwebdav "golang.org/x/net/webdav"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/yourusername/caldav-server/internal/auth"
|
"git.arnef.de/arnef/nidus/internal/auth"
|
||||||
filewebdav "github.com/yourusername/caldav-server/internal/webdav"
|
filewebdav "git.arnef.de/arnef/nidus/internal/webdav"
|
||||||
)
|
)
|
||||||
|
|
||||||
func testLogger() *slog.Logger {
|
func testLogger() *slog.Logger {
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ import (
|
|||||||
"log/slog"
|
"log/slog"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"github.com/yourusername/caldav-server/internal/config"
|
"git.arnef.de/arnef/nidus/internal/config"
|
||||||
"github.com/yourusername/caldav-server/internal/store"
|
"git.arnef.de/arnef/nidus/internal/store"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|||||||
@@ -13,9 +13,9 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"github.com/yourusername/caldav-server/internal/config"
|
"git.arnef.de/arnef/nidus/internal/config"
|
||||||
"github.com/yourusername/caldav-server/internal/db"
|
"git.arnef.de/arnef/nidus/internal/db"
|
||||||
"github.com/yourusername/caldav-server/internal/store"
|
"git.arnef.de/arnef/nidus/internal/store"
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"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.
|
// writeTestConfig creates a minimal config.yaml in dir and returns its path.
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"github.com/yourusername/caldav-server/internal/db"
|
"git.arnef.de/arnef/nidus/internal/db"
|
||||||
"golang.org/x/term"
|
"golang.org/x/term"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user