From 5ee24f804f0058d33da4ebee2235a53508f770e5 Mon Sep 17 00:00:00 2001 From: Yves G Date: Sun, 1 Mar 2020 14:41:48 +0100 Subject: [PATCH] webdav: report full and consistent usage with `about` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit — allow either Used or Available to be ==0 (remote full or empty) — compute Total if both values are received --- backend/webdav/webdav.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/backend/webdav/webdav.go b/backend/webdav/webdav.go index 96bf488c7..83fe1500f 100644 --- a/backend/webdav/webdav.go +++ b/backend/webdav/webdav.go @@ -989,13 +989,14 @@ func (f *Fs) About(ctx context.Context) (*fs.Usage, error) { return nil, errors.Wrap(err, "about call failed") } usage := &fs.Usage{} - if q.Available != 0 || q.Used != 0 { - if q.Available >= 0 && q.Used >= 0 { - usage.Total = fs.NewUsageValue(q.Available + q.Used) - } - if q.Used >= 0 { - usage.Used = fs.NewUsageValue(q.Used) - } + if q.Used >= 0 { + usage.Used = fs.NewUsageValue(q.Used) + } + if q.Available >= 0 { + usage.Free = fs.NewUsageValue(q.Available) + } + if q.Available >= 0 && q.Used >= 0 { + usage.Total = fs.NewUsageValue(q.Available + q.Used) } return usage, nil }