mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-22 04:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3020 from nextcloud/feature/increase-file-removal-logging

Browse source 
Increase logging around file removal events
This commit is contained in:
Felix Weilbach 2021-03-22 09:01:42 +01:00 committed by GitHub
commit 4d921c8025
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libsync/discovery.cpp
View file

@ -715,6 +715,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
// Not modified locally (ParentNotChanged)
if (noServerEntry) {
// not on the server: Removed on the server, delete locally
qCInfo(lcDisco) << "File" << item->_file << "is not anymore on server. Going to delete it locally.";
item->_instruction = CSYNC_INSTRUCTION_REMOVE;
item->_direction = SyncFileItem::Down;
} else if (dbEntry._type == ItemTypeVirtualFileDehydration) {
@ -739,6 +740,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
} else if (!serverModified) {
// Removed locally: also remove on the server.
if (!dbEntry._serverHasIgnoredFiles) {
qCInfo(lcDisco) << "File" << item->_file << "was deleted locally. Going to delete it on the server.";
item->_instruction = CSYNC_INSTRUCTION_REMOVE;
item->_direction = SyncFileItem::Up;
}
@ -777,6 +779,7 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
} else if (!typeChange && ((dbEntry._modtime == localEntry.modtime && dbEntry._fileSize == localEntry.size) || localEntry.isDirectory)) {
// Local file unchanged.
if (noServerEntry) {
qCInfo(lcDisco) << "File" << item->_file << "is not anymore on server. Going to delete it locally.";
item->_instruction = CSYNC_INSTRUCTION_REMOVE;
item->_direction = SyncFileItem::Down;
} else if (dbEntry._type == ItemTypeVirtualFileDehydration || localEntry.type == ItemTypeVirtualFileDehydration) {

2
src/libsync/propagateremotedelete.cpp
View file

@ -28,6 +28,8 @@ Q_LOGGING_CATEGORY(lcPropagateRemoteDelete, "nextcloud.sync.propagator.remotedel
void PropagateRemoteDelete::start()
{
qCInfo(lcPropagateRemoteDelete) << "Start propagate remote delete job for" << _item->_file;
if (propagator()->_abortRequested)
return;

4
src/libsync/propagatorjobs.cpp
View file

@ -89,13 +89,15 @@ bool PropagateLocalRemove::removeRecursively(const QString &path)
void PropagateLocalRemove::start()
{
qCInfo(lcPropagateLocalRemove) << "Start propagate local remove job";
_moveToTrash = propagator()->syncOptions()._moveFilesToTrash;
if (propagator()->_abortRequested)
return;
const QString filename = propagator()->fullLocalPath(_item->_file);
qCDebug(lcPropagateLocalRemove) << filename;
qCInfo(lcPropagateLocalRemove) << "Going to delete:" << filename;
if (propagator()->localFileNameClash(_item->_file)) {
done(SyncFileItem::NormalError, tr("Could not remove %1 because of a local file name clash").arg(QDir::toNativeSeparators(filename)));