@@ -292,18 +292,20 @@ public class Enumerator: NSObject, NSFileProviderEnumerator {
292292 let metadataRemoteUrl = metadata. serverUrl + " / " + metadata. fileName
293293 nextFoldersServerUrlsToEnumerateWorkingSet. append ( metadataRemoteUrl)
294294 }
295+ let nextPageValid = nextPage != nil
296+ let nextPageToken = nextPage? . token ?? " " // For logging
295297 Self . logger. debug (
296298 """
297299 Current folders awaiting paged enumeration:
298300 \( self . nextFoldersServerUrlsToEnumerateWorkingSet, privacy: . public)
299- next page is nil : \( nextPage == nil , privacy: . public)
300- next page token: \( nextPage ? . token ?? " NIL " , privacy: . public)
301+ next page is valid : \( nextPageValid , privacy: . public)
302+ next page token: \( nextPageToken , privacy: . public)
301303 """
302304 )
303305
304306 // If we have finished paged enumeration of the current serverUrl, move to next
305307 // child to scan
306- if nextPage == nil && !nextFoldersServerUrlsToEnumerateWorkingSet. isEmpty {
308+ if !nextPageValid && !nextFoldersServerUrlsToEnumerateWorkingSet. isEmpty {
307309 let nextServerUrl = nextFoldersServerUrlsToEnumerateWorkingSet. removeFirst ( )
308310 nextPage = EnumeratorPageResponse ( nextServerUrl: nextServerUrl)
309311 Self . logger. info ( " Next page token set to be \( nextServerUrl, privacy: . public) " )
@@ -619,6 +621,14 @@ public class Enumerator: NSObject, NSFileProviderEnumerator {
619621 Task { @MainActor in
620622 observer. didEnumerate ( items)
621623 Self . logger. info ( " Did enumerate \( items. count) items " )
624+ let nextPageNil = nextPage == nil // For logging
625+ let nextPageToken = nextPage? . token ?? " " // For logging
626+ Self . logger. info (
627+ """
628+ Next page is nil: \( nextPageNil, privacy: . public)
629+ next page token: \( nextPageToken, privacy: . public)
630+ """
631+ )
622632 if let nextPage, let nextPageData = nextPage. token. data ( using: . utf8) {
623633 self . pageNum = nextPage. index
624634 observer. finishEnumerating ( upTo: NSFileProviderPage ( nextPageData) )
0 commit comments