Small cleanup in socket api

1 files changed, 25 insertions, 13 deletions

diff --git a/src/gui/socketapi/socketapi.cpp b/src/gui/socketapi/socketapi.cpp
index aaab9cd3b..000d519bc 100644
--- a/src/gui/socketapi/socketapi.cpp
+++ b/src/gui/socketapi/socketapi.cpp
@@ -450,17 +450,30 @@ void SocketApi::slotUpdateFolderView(Folder *f)
 
     if (f) {
         // do only send UPDATE_VIEW for a couple of status
-        if (f->syncResult().status() == SyncResult::SyncPrepare
-            || f->syncResult().status() == SyncResult::Success
-            || f->syncResult().status() == SyncResult::Paused
-            || f->syncResult().status() == SyncResult::Problem
-            || f->syncResult().status() == SyncResult::Error
-            || f->syncResult().status() == SyncResult::SetupError) {
-            QString rootPath = removeTrailingSlash(f->path());
+        switch (f->syncResult().status()) {
+        case SyncResult::SyncPrepare:
+            Q_FALLTHROUGH();
+        case SyncResult::Success:
+            Q_FALLTHROUGH();
+        case SyncResult::Paused:
+            Q_FALLTHROUGH();
+        case SyncResult::Problem:
+            Q_FALLTHROUGH();
+        case SyncResult::Error:
+            Q_FALLTHROUGH();
+        case SyncResult::SetupError: {
+            const QString rootPath = removeTrailingSlash(f->path());
             broadcastStatusPushMessage(rootPath, f->syncEngine().syncFileStatusTracker().fileStatus(""));
 
-            broadcastMessage(buildMessage(QLatin1String("UPDATE_VIEW"), rootPath));
-        } else {
+            broadcastMessage(buildMessage(QStringLiteral("UPDATE_VIEW"), rootPath));
+        } break;
+        case OCC::SyncResult::Undefined:
+            Q_FALLTHROUGH();
+        case OCC::SyncResult::NotYetStarted:
+            Q_FALLTHROUGH();
+        case OCC::SyncResult::SyncRunning:
+            Q_FALLTHROUGH();
+        case OCC::SyncResult::SyncAbortRequested:
             qCDebug(lcSocketApi) << "Not sending UPDATE_VIEW for" << f->alias() << "because status() is" << f->syncResult().status();
         }
     }
@@ -537,18 +550,17 @@ void SocketApi::command_RETRIEVE_FILE_STATUS(const QString &argument, SocketList
     auto fileData = FileData::get(argument);
     if (!fileData.folder) {
         // this can happen in offline mode e.g.: nothing to worry about
-        statusString = QLatin1String("NOP");
+        statusString = SyncFileStatus(SyncFileStatus::StatusNone).toSocketAPIString();
     } else {
         // The user probably visited this directory in the file shell.
         // Let the listener know that it should now send status pushes for sibblings of this file.
         QString directory = fileData.localPath.left(fileData.localPath.lastIndexOf('/'));
         listener->registerMonitoredDirectory(qHash(directory));
 
-        SyncFileStatus fileStatus = fileData.syncFileStatus();
-        statusString = fileStatus.toSocketAPIString();
+        statusString = fileData.syncFileStatus().toSocketAPIString();
     }
 
-    const QString message = QLatin1String("STATUS:") % statusString % QLatin1Char(':') % QDir::toNativeSeparators(argument);
+    const QString message = QStringLiteral("STATUS:") % statusString % QLatin1Char(':') % QDir::toNativeSeparators(argument);
     listener->sendMessage(message);
 }