Skip to content

fix(FileProvider): enable pagination for large folder enumeration #9286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ihsanmokhlisse wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(FileProvider): enable pagination for large folder enumeration #9286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions ...SX/NextcloudFileProviderKit/Sources/NextcloudFileProviderKit/Enumeration/Enumerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,20 +173,31 @@ public final class Enumerator: NSObject, NSFileProviderEnumerator, Sendable {
// Do not pass in the NSFileProviderPage default pages, these are not valid Nextcloud
// pagination tokens
var pageTotal: Int? = nil
var pageIndex = 0
var parsedPage: NSFileProviderPage? = nil

if page != NSFileProviderPage.initialPageSortedByName as NSFileProviderPage, page != NSFileProviderPage.initialPageSortedByDate as NSFileProviderPage {
if let enumPageResponse = try? JSONDecoder().decode(EnumeratorPageResponse.self, from: page.rawValue) {
if let total = enumPageResponse.total {
pageTotal = total
}
pageIndex = enumPageResponse.index
parsedPage = page
} else {
logger.error("Could not parse page")
}
}

// Enable pagination by passing page settings
let pageSettings: (page: NSFileProviderPage?, index: Int, size: Int) = (
page: parsedPage,
index: pageIndex,
size: pageItemCount
)

let readResult = await Self.readServerUrl(
serverUrl,
pageSettings: nil,
pageSettings: pageSettings,
account: account,
remoteInterface: remoteInterface,
dbManager: dbManager,
Expand Down Expand Up @@ -223,7 +234,8 @@ public final class Enumerator: NSObject, NSFileProviderEnumerator, Sendable {
nextPage = nil
}

nextPage = nil
// NOTE: Removed unconditional `nextPage = nil` that was disabling pagination
// This was the root cause of large folders (1500+ files) not updating properly

logger.info(
"""
Expand Down
Loading