From 3444500e74592d2af188e2e69467069af7ff8495 Mon Sep 17 00:00:00 2001
From: Socialpranker <273312799+Socialpranker@users.noreply.github.com>
Date: Mon, 27 Jul 2026 18:49:53 +0200
Subject: [PATCH] dropbox: make Rmdir use one less API call - fixes #9663

Rmdir checked that the directory existed with GetMetadata and then
checked it was empty with ListFolder, but ListFolder already reports a
missing path and a path that is a file, so the first request was
redundant.

Drop the GetMetadata call and map the ListFolder lookup errors onto the
same sentinel errors as before, so a missing directory still returns
fs.ErrorDirNotFound and a file still returns fs.ErrorIsFile. Limit is
set to 1 as only the presence of an entry matters, and HasMore is
checked as well so a full first page is not read as an empty directory.
---
 backend/dropbox/dropbox.go | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/backend/dropbox/dropbox.go b/backend/dropbox/dropbox.go
index 04d09c2c5..556a3c520 100644
--- a/backend/dropbox/dropbox.go
+++ b/backend/dropbox/dropbox.go
@@ -1267,15 +1267,11 @@ func (f *Fs) purgeCheck(ctx context.Context, dir string, check bool) (err error)
 	encRoot := f.opt.Enc.FromStandardPath(root)
 
 	if check {
-		// check directory exists
-		_, err = f.getDirMetadata(ctx, root)
-		if err != nil {
-			return fmt.Errorf("Rmdir: %w", err)
-		}
-
-		// check directory empty
+		// ListFolder reports a missing path and a path that is a file, so it
+		// checks that the directory exists and is empty in a single request.
 		arg := files.NewListFolderArg(encRoot)
 		arg.Recursive = false
+		arg.Limit = 1
 		if root == "/" {
 			arg.Path = "" // Specify root folder as empty string
 		}
@@ -1285,9 +1281,20 @@ func (f *Fs) purgeCheck(ctx context.Context, dir string, check bool) (err error)
 			return shouldRetry(ctx, err)
 		})
 		if err != nil {
+			switch e := err.(type) {
+			case files.ListFolderAPIError:
+				if e.EndpointError != nil && e.EndpointError.Path != nil {
+					switch e.EndpointError.Path.Tag {
+					case files.LookupErrorNotFound:
+						err = fs.ErrorDirNotFound
+					case files.LookupErrorNotFolder:
+						err = fs.ErrorIsFile
+					}
+				}
+			}
 			return fmt.Errorf("Rmdir: %w", err)
 		}
-		if len(res.Entries) != 0 {
+		if len(res.Entries) != 0 || res.HasMore {
 			return errors.New("directory not empty")
 		}
 	}