WIP: Add option to consider the status of remote devices for overall …

…status

* See #74
* TODO: Better add distinct status e.g. "RemoteSynchronizing"?
* TODO: Add UI and configuration
* TODO: Maybe use an enum here instead of a boolean as it is also wanted
        by other users to have *less* states
        (see #76)?

connector/syncthingconnection.cpp

@@ -101,6 +101,7 @@ SyncthingConnection::SyncthingConnection(const QString &syncthingUrl, const QByt
     , m_lastFileDeleted(false)
     , m_dirStatsAltered(false)
     , m_recordFileChanges(false)
+    , m_considerRemoteProgressForStatus(false)
 {
     m_trafficPollTimer.setInterval(SyncthingConnectionSettings::defaultTrafficPollInterval);
     m_trafficPollTimer.setTimerType(Qt::VeryCoarseTimer);
@@ -775,6 +776,7 @@ bool SyncthingConnection::applySettings(SyncthingConnectionSettings &connectionS
     setDevStatsPollInterval(connectionSettings.devStatsPollInterval);
     setErrorsPollInterval(connectionSettings.errorsPollInterval);
     setAutoReconnectInterval(connectionSettings.reconnectInterval);
+    setConsiderRemoteProgressForStatus(connectionSettings.considerRemoteProgressForStatus);
 
     return reconnectRequired;
 }
@@ -826,6 +828,16 @@ void SyncthingConnection::setStatus(SyncthingStatus status)
             }
         }
 
+        // set the status to "synchronizing" if at least one remote device is still in progress
+        if (!synchronizing && m_considerRemoteProgressForStatus) {
+            for (const SyncthingDev &dev : m_devs) {
+                if (dev.status == SyncthingDevStatus::Synchronizing) {
+                    synchronizing = true;
+                    break;
+                }
+            }
+        }
+
         if (synchronizing) {
             status = SyncthingStatus::Synchronizing;
         } else if (scanning) {

connector/syncthingconnection.h

@@ -64,6 +64,7 @@ class LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingConnection : public QObject {
     Q_PROPERTY(int trafficPollInterval READ trafficPollInterval WRITE setTrafficPollInterval)
     Q_PROPERTY(int devStatsPollInterval READ devStatsPollInterval WRITE setDevStatsPollInterval)
     Q_PROPERTY(bool recordFileChanges READ recordFileChanges WRITE setRecordFileChanges)
+    Q_PROPERTY(bool considerRemoteProgressForStatus READ considerRemoteProgressForStatus WRITE setConsiderRemoteProgressForStatus)
     Q_PROPERTY(QString myId READ myId NOTIFY myIdChanged)
     Q_PROPERTY(QString configDir READ configDir NOTIFY configDirChanged)
     Q_PROPERTY(int totalIncomingTraffic READ totalIncomingTraffic NOTIFY trafficChanged)
@@ -119,6 +120,8 @@ class LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingConnection : public QObject {
     void disablePolling();
     bool recordFileChanges() const;
     void setRecordFileChanges(bool recordFileChanges);
+    bool considerRemoteProgressForStatus() const;
+    void setConsiderRemoteProgressForStatus(bool considerRemoteProgressForStatus);
 
     // getter for information retrieved from Syncthing
     const QString &configDir() const;
@@ -359,6 +362,7 @@ private Q_SLOTS:
     QJsonObject m_rawConfig;
     bool m_dirStatsAltered;
     bool m_recordFileChanges;
+    bool m_considerRemoteProgressForStatus;
 };
 
 /*!
@@ -607,6 +611,25 @@ inline void SyncthingConnection::setRecordFileChanges(bool recordFileChanges)
     m_recordFileChanges = recordFileChanges;
 }
 
+/*!
+ * \brief Returns whether progress of remote devices is considered when computing the status.
+ */
+inline bool SyncthingConnection::considerRemoteProgressForStatus() const
+{
+    return m_considerRemoteProgressForStatus;
+}
+
+/*!
+ * \brief Sets whether the progress of remote devices is considered when computing the status.
+ */
+inline void SyncthingConnection::setConsiderRemoteProgressForStatus(bool considerRemoteProgressForStatus)
+{
+    if (m_considerRemoteProgressForStatus != considerRemoteProgressForStatus) {
+        m_considerRemoteProgressForStatus = considerRemoteProgressForStatus;
+        recalculateStatus();
+    }
+}
+
 /*!
  * \brief Returns the Syncthing home/configuration directory.
  */

connector/syncthingconnectionsettings.h

@@ -24,6 +24,7 @@ struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingConnectionSettings {
     QString httpsCertPath;
     QList<QSslError> expectedSslErrors;
     bool autoConnect = false;
+    bool considerRemoteProgressForStatus = false;
     bool loadHttpsCert();
 
     static constexpr int defaultTrafficPollInterval = 5000;