From 6f484a8f2b55a18d5c020c976cac0ebd9b7778e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 3 Feb 2021 16:03:23 +0000 Subject: [PATCH] fix rebase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- internal/http/services/owncloud/ocdav/propfind.go | 6 +++--- .../http/services/owncloud/ocs/handlers/cloud/cloud.go | 6 +++--- internal/http/services/owncloud/ocs/v1.go | 7 +++---- pkg/storage/fs/s3ng/s3ng.go | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/internal/http/services/owncloud/ocdav/propfind.go b/internal/http/services/owncloud/ocdav/propfind.go index 16754057798..26906e9413d 100644 --- a/internal/http/services/owncloud/ocdav/propfind.go +++ b/internal/http/services/owncloud/ocdav/propfind.go @@ -53,9 +53,9 @@ const ( // RFC1123 time that mimics oc10. time.RFC1123 would end in "UTC", see https://github.com/golang/go/issues/13781 RFC1123 = "Mon, 02 Jan 2006 15:04:05 GMT" - _propQuotaUncalculated = "-1" - _propQuotaUnknown = "-2" - _propQuotaUnlimited = "-3" + //_propQuotaUncalculated = "-1" + _propQuotaUnknown = "-2" + //_propQuotaUnlimited = "-3" ) // ns is the namespace that is prefixed to the path in the cs3 namespace diff --git a/internal/http/services/owncloud/ocs/handlers/cloud/cloud.go b/internal/http/services/owncloud/ocs/handlers/cloud/cloud.go index 36aa2a43e6e..8b099b7b0ca 100644 --- a/internal/http/services/owncloud/ocs/handlers/cloud/cloud.go +++ b/internal/http/services/owncloud/ocs/handlers/cloud/cloud.go @@ -37,12 +37,12 @@ type Handler struct { } // Init initializes this and any contained handlers -func (h *Handler) Init(c *config.Config) { +func (h *Handler) Init(c *config.Config) error { h.UserHandler = new(user.Handler) - h.UsersHandler = new(users.Handler) - h.UsersHandler.Init(c) h.CapabilitiesHandler = new(capabilities.Handler) h.CapabilitiesHandler.Init(c) + h.UsersHandler = new(users.Handler) + return h.UsersHandler.Init(c) } // Handler routes the cloud endpoints diff --git a/internal/http/services/owncloud/ocs/v1.go b/internal/http/services/owncloud/ocs/v1.go index 635ab74de1e..f22f4d5392a 100644 --- a/internal/http/services/owncloud/ocs/v1.go +++ b/internal/http/services/owncloud/ocs/v1.go @@ -37,15 +37,14 @@ type V1Handler struct { } func (h *V1Handler) init(c *config.Config) error { + h.ConfigHandler = new(configHandler.Handler) + h.ConfigHandler.Init(c) h.AppsHandler = new(apps.Handler) if err := h.AppsHandler.Init(c); err != nil { return err } h.CloudHandler = new(cloud.Handler) - h.CloudHandler.Init(c) - h.ConfigHandler = new(configHandler.Handler) - h.ConfigHandler.Init(c) - return nil + return h.CloudHandler.Init(c) } // Handler handles requests diff --git a/pkg/storage/fs/s3ng/s3ng.go b/pkg/storage/fs/s3ng/s3ng.go index e42bb197fab..108d6a64048 100644 --- a/pkg/storage/fs/s3ng/s3ng.go +++ b/pkg/storage/fs/s3ng/s3ng.go @@ -139,7 +139,7 @@ func (fs *s3ngfs) Shutdown(ctx context.Context) error { return nil } -func (fs *s3ngfs) GetQuota(ctx context.Context) (int, int, error) { +func (fs *s3ngfs) GetQuota(ctx context.Context) (uint64, uint64, error) { return 0, 0, nil }