Skip to content

fix(vfs/windows): do not skip incomplete directory stubs on on-demand listing #10877

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
WFZENB wants to merge 1 commit into
base: stable-33.0
Choose a base branch
from
+53 −6
Open

fix(vfs/windows): do not skip incomplete directory stubs on on-demand listing #10877

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
59 changes: 53 additions & 6 deletions src/libsync/account.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,6 +1214,52 @@ void Account::setAskUserForMnemonic(const bool ask)
emit askUserForMnemonicChanged();
}


namespace {

bool journalHasDirectChildren(SyncJournalDb *journal, const QByteArray &path)
{
bool found = false;
journal->listFilesInPath(path, [&found](const SyncJournalFileRecord &) {
found = true;
});
return found;
}

bool shouldSkipExistingItemForOnDemandListing(
const SyncJournalFileRecord &record,
SyncJournalDb *journal,
const RemoteInfo &remoteInfo)
{
if (!record.isDirectory()) {
if (record._inode == 0) {
return false;
}
if (!remoteInfo.etag.isEmpty() && record._etag != remoteInfo.etag) {
return false;
}
if (!remoteInfo.fileId.isEmpty() && record._fileId != remoteInfo.fileId) {
return false;
}
return true;
}

if (journalHasDirectChildren(journal, record._path)) {
return true;
}

if (remoteInfo.folderQuota.bytesUsed > 0) {
return false;
}
if (remoteInfo.sizeOfFolder > 0) {
return false;
}

return true;
}

} // namespace

void Account::listRemoteFolder(QPromise<OCC::PlaceholderCreateInfo> *promise, const QString &remoteSyncRootPath, const QString &subPath, SyncJournalDb *journalForFolder)
{
qCInfo(lcAccount()) << "ls col job requested for" << subPath;
Expand Down Expand Up @@ -1273,12 +1319,6 @@ void Account::listRemoteFolder(QPromise<OCC::PlaceholderCreateInfo> *promise, co
const auto itemFileName = completeDavPath.mid(slash + 1);
const auto absoluteItemPathName = syncRootPath.isEmpty() ? itemFileName : Utility::noTrailingSlashPath(syncRootPath) + '/' + itemFileName;

auto currentItemDbRecord = SyncJournalFileRecord{};
if (journalForFolder->getFileRecord(absoluteItemPathName, &currentItemDbRecord) && currentItemDbRecord.isValid()) {
qCWarning(lcAccount()) << "skip existing item" << absoluteItemPathName;
return;
}

auto newEntry = RemoteInfo{};
newEntry.name = itemFileName;
newEntry.size = -1;
Expand All @@ -1295,6 +1335,13 @@ void Account::listRemoteFolder(QPromise<OCC::PlaceholderCreateInfo> *promise, co
return;
}

auto currentItemDbRecord = SyncJournalFileRecord{};
if (journalForFolder->getFileRecord(absoluteItemPathName, &currentItemDbRecord) && currentItemDbRecord.isValid()
&& shouldSkipExistingItemForOnDemandListing(currentItemDbRecord, journalForFolder, newEntry)) {
qCWarning(lcAccount()) << "skip existing item" << absoluteItemPathName;
return;
}

promise->emplaceResult(itemFileName, itemFileName.toStdWString(), absoluteItemPathName, newEntry);
});

Expand Down