Add serverPath column to db metadata table

src/libsync/syncfileitem.cpp

@@ -72,6 +72,7 @@ SyncFileItemPtr SyncFileItem::fromSyncJournalFileRecord(const SyncJournalFileRec
     item->_remotePerm = rec._remotePerm;
     item->_serverHasIgnoredFiles = rec._serverHasIgnoredFiles;
     item->_checksumHeader = rec._checksumHeader;
+    item->_remoteName = QString::fromUtf8(rec._serverPath);
     return item;
 }
 

src/libsync/syncfileitem.h

@@ -247,14 +247,22 @@ class OWNCLOUDSYNC_EXPORT SyncFileItem
     QString localName() const { return _localName; }
     void setLocalName(const QString &newName) { _localName = newName; }
 
+    QString remoteName() const { return _remoteName.isEmpty() ? _localName : _remoteName; }
+    QString rawRemoteName() const { return _remoteName; }
+
 private:
     /** The syncfolder-relative filesystem path that the operation is about
      *
      * For rename operation this is the rename source and the target is in _renameTarget.
      */
     QString _localName;
 
-    // QString _remoteName;
+    /**
+     * The remote file name, when the local unicode normalization differs from the remote
+     * normalization. When this string is empty, (and the local name is not), the normalization is
+     * the same, and the local name can be used.
+     */
+    QString _remoteName;
 
 public:
     /** for renames: the name _file should be renamed to