From: Olivier Goffart <ogoffart@woboq.com>
Date: Tue, 9 Oct 2018 13:54:03 +0000 (+0200)
Subject: New discovery algorithm: Set the originalFile for ignored files
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~496
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=35c0cf4e598268b2f7c3f27a22c48caaf7c5eff7;p=nextcloud-desktop.git

New discovery algorithm: Set the originalFile for ignored files

This is used to show the name in the UI
---

diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
index 0f1e29808..b6f853156 100644
--- a/src/libsync/discovery.cpp
+++ b/src/libsync/discovery.cpp
@@ -296,6 +296,7 @@ bool ProcessDirectoryJob::handleExcluded(const QString &path, bool isDirectory,
 
     auto item = SyncFileItemPtr::create();
     item->_file = path;
+    item->_originalFile = path;
     item->_instruction = CSYNC_INSTRUCTION_IGNORE;
 
     if (isSymlink) {
@@ -1062,6 +1063,7 @@ void ProcessDirectoryJob::processBlacklisted(const PathTuple &path, const OCC::L
 
     auto item = SyncFileItem::fromSyncJournalFileRecord(dbEntry);
     item->_file = path._target;
+    item->_originalFile = path._original;
     item->_inode = localEntry.inode;
     if (dbEntry.isValid() && ((dbEntry._modtime == localEntry.modtime && dbEntry._fileSize == localEntry.size) || (localEntry.isDirectory && dbEntry._type == ItemTypeDirectory))) {
         item->_instruction = CSYNC_INSTRUCTION_REMOVE;