From e3ba95cd7760a7f7a4a6111089c4d49e1627a532 Mon Sep 17 00:00:00 2001 From: Conrad Hoffmann Date: Fri, 2 Feb 2024 14:09:22 +0100 Subject: [PATCH] caldav: add path to interface QueryCalendarObjects This was missing for proper multi-calendar support. --- caldav/server.go | 4 ++-- caldav/server_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/caldav/server.go b/caldav/server.go index c67b3cb..1e3cca8 100644 --- a/caldav/server.go +++ b/caldav/server.go @@ -34,7 +34,7 @@ type Backend interface { GetCalendar(ctx context.Context, path string) (*Calendar, error) GetCalendarObject(ctx context.Context, path string, req *CalendarCompRequest) (*CalendarObject, error) ListCalendarObjects(ctx context.Context, path string, req *CalendarCompRequest) ([]CalendarObject, error) - QueryCalendarObjects(ctx context.Context, query *CalendarQuery) ([]CalendarObject, error) + QueryCalendarObjects(ctx context.Context, path string, query *CalendarQuery) ([]CalendarObject, error) PutCalendarObject(ctx context.Context, path string, calendar *ical.Calendar, opts *PutCalendarObjectOptions) (loc string, err error) DeleteCalendarObject(ctx context.Context, path string) error @@ -213,7 +213,7 @@ func (h *Handler) handleQuery(r *http.Request, w http.ResponseWriter, query *cal } q.CompFilter = *cf - cos, err := h.Backend.QueryCalendarObjects(r.Context(), &q) + cos, err := h.Backend.QueryCalendarObjects(r.Context(), r.URL.Path, &q) if err != nil { return err } diff --git a/caldav/server_test.go b/caldav/server_test.go index f6e5f40..26acd56 100644 --- a/caldav/server_test.go +++ b/caldav/server_test.go @@ -226,6 +226,6 @@ func (t testBackend) ListCalendarObjects(ctx context.Context, path string, req * return t.objectMap[path], nil } -func (t testBackend) QueryCalendarObjects(ctx context.Context, query *CalendarQuery) ([]CalendarObject, error) { +func (t testBackend) QueryCalendarObjects(ctx context.Context, path string, query *CalendarQuery) ([]CalendarObject, error) { return nil, nil }