diff options
| -rw-r--r-- | src/libsync/discovery.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp index ce58549fe..711e9921e 100644 --- a/src/libsync/discovery.cpp +++ b/src/libsync/discovery.cpp @@ -885,16 +885,15 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo( item->_type = localEntry.isDirectory ? ItemTypeDirectory : localEntry.isVirtualFile ? ItemTypeVirtualFile : ItemTypeFile; _childModified = true; - auto postProcessLocalNew = [item, localEntry, this]() { + auto postProcessLocalNew = [item, localEntry, path, this]() { if (localEntry.isVirtualFile) { - // Remove the spurious file if it looks like a placeholder file - // (we know placeholder files contain " ", but only in the suffix case) - if (localEntry.size <= 1 || !isVfsWithSuffix()) { - qCWarning(lcDisco) << "Wiping virtual file without db entry for" << _currentFolder._local + "/" + localEntry.name; + const bool isPlaceHolder = _discoveryData->_syncOptions._vfs->isDehydratedPlaceholder(_discoveryData->_localDir + path._local); + if (isPlaceHolder) { + qCWarning(lcDisco) << "Wiping virtual file without db entry for" << path._local; item->_instruction = CSYNC_INSTRUCTION_REMOVE; item->_direction = SyncFileItem::Down; } else { - qCWarning(lcDisco) << "Virtual file without db entry for" << _currentFolder._local << localEntry.name + qCWarning(lcDisco) << "Virtual file without db entry for" << path._local << "but looks odd, keeping"; item->_instruction = CSYNC_INSTRUCTION_IGNORE; } |