Improved cliend side sync process for tags. Some code clean-up.

Author: Uwe Runtemund

src/common/syncjournaldb.cpp

@@ -1506,7 +1506,7 @@ bool SyncJournalDb::updateMetadataTagList(const QString &filename,const QByteArr
 {
     QMutexLocker locker(&_mutex);
 
-    qCInfo(lcDb) << "Updating file tag lists " << filename;
+    qCInfo(lcDb) << "Updating file tag list " << filename;
 
     if (!checkConnect()) {
         qCWarning(lcDb) << "Failed to connect database.";
@@ -1525,7 +1525,6 @@ bool SyncJournalDb::updateMetadataTagList(const QString &filename,const QByteArr
     }
     query->bindValue(1, phash);
     query->bindValue(2, *tagList);
-    printf("RMD UPDATE TAG\n");
     return query->exec();
 }
 
@@ -1552,7 +1551,6 @@ QByteArray SyncJournalDb::tagList(const QString &file)
     if (!next.ok || !next.hasData)return QByteArray();
 
     QByteArray result = query->baValue(0);
-    printf("RMD YES %lld %s!\n",phash,result.data());
     return result;
 }
 

src/gui/folder.cpp

@@ -558,7 +558,6 @@ void Folder::slotWatchedPathChanged(const QString &path, ChangeReason reason)
         qCDebug(lcFolder) << "Changed path is not contained in folder, ignoring:" << path;
         return;
     }
-	printf("RMD Change 2\n");
     auto relativePath = path.midRef(this->path().size());
 
     if (pathIsIgnored(path)) {
@@ -628,7 +627,6 @@ void Folder::slotWatchedPathChanged(const QString &path, ChangeReason reason)
         }
     }
     warnOnNewExcludedItem(record, relativePath);
-	printf("RMD Change 3\n");
     emit watchedFileChangedExternally(path);
 
     // Also schedule this folder for a sync, but only after some delay:

src/gui/folderwatcher.cpp

@@ -263,7 +263,6 @@ void FolderWatcher::changeDetected(const QStringList &paths)
 
     qCInfo(lcFolderWatcher) << "Detected changes in paths:" << changedPaths;
     for (const auto &path : changedPaths) {
-		 printf("RMD Change 1\n");
         emit pathChanged(path);
     }
 }

src/libsync/discovery.cpp

@@ -495,20 +495,15 @@ void ProcessDirectoryJob::processFile(PathTuple path,
 
     if(localEntry.isValid()
         && dbEntry.isValid()) {
-        FileTagManager* tm = FileTagManager::GetInstance();
 
-        // Try tag pull by default (order pull,push is relevant!)
-        tm->pullTags(_discoveryData->_localDir % path._original,
-                     localEntry,
-                     dbEntry);
-
-        // Only if all three entries are valid, we make a full sync.
-        if(serverEntry.isValid()) {
-            tm->pushTags(_discoveryData->_localDir % path._original,
-                         localEntry,
-                         serverEntry,
-                         dbEntry);
-        }
+        // Tag synchronization
+        FileTagManager::syncTags(_discoveryData->_account,
+                                 _discoveryData->_statedb,
+                                 _discoveryData->_localDir,
+                                 path._original,
+                                 localEntry,
+                                 serverEntry,
+                                 dbEntry);
     }
 
     if (_discoveryData->isRenamed(path._original)) {

src/libsync/discoveryphase.cpp

@@ -395,7 +395,8 @@ void DiscoverySingleDirectoryJob::start()
           << "http://owncloud.org/ns:permissions"
           << "http://owncloud.org/ns:checksums"
           << "http://owncloud.org/ns:tags"
-          << "http://nextcloud.org/ns:system-tags";
+          << "http://nextcloud.org/ns:system-tags"
+          << "http://nextcloud.org/ns:metadata_etag";
 
     if (_isRootPath)
         props << "http://owncloud.org/ns:data-fingerprint";
@@ -543,11 +544,10 @@ static void propertyMapToRemoteInfo(const QMap<QString, QString> &map, RemoteInf
             }
         }
         if(property == "system-tags" || property == "tags"){
-            QByteArray list =FileTagManager::fromPropertiesToTagList(value);
-            if(list.size()>0){
-                if(result.tagList.size()>0)result.tagList.append('\n');
-                result.tagList.append(list);
-            }
+            FileTagManager::fromPropertiesToTagList(result.tagList,value);
+        }
+        if(property == "metadata_etag"){
+            //TODO: RMD Handle metadata etag for tag synchronization
         }
     }
 

src/libsync/filesystem.cpp

@@ -91,7 +91,7 @@ bool FileSystem::fileChanged(const QString &fileName,
 {
     return getSize(fileName) != previousSize
         || getModTime(fileName) != previousMtime
-        || FileTagManager::GetInstance()->readTagListFromLocalFile(fileName) != taglist;
+        || FileTagManager::readTagListFromLocalFile(fileName) != taglist;
 }
 
 bool FileSystem::verifyFileUnchanged(const QString &fileName,