fix(linux/vfs): makes sure the hydration job can do something useful

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

Author: mgallien

src/common/vfs.h

@@ -326,6 +326,9 @@ public Q_SLOTS:
     /// start complete
     void started();
 
+    /// The vfs plugin detected that the meta data are out of sync and requests a sync with the server
+    void needSync();
+
 protected:
     /** Setup the plugin for the folder.
      *

src/gui/folder.cpp

@@ -599,6 +599,14 @@ void Folder::startVfs()
     connect(&_engine->syncFileStatusTracker(), &SyncFileStatusTracker::fileStatusChanged,
             _vfs.data(), &Vfs::fileStatusChanged);
 
+    connect(_vfs.get(), &Vfs::needSync, this, [this] {
+        if (canSync()) {
+            // the vfs plugin detected that its metadata is out of sync and requests a new sync
+            // the request has a hight priority as it is probably issued after a user request
+            FolderMan::instance()->scheduleFolder(this);
+        }
+    });
+
     _vfs->start(vfsParams);
 
     // Immediately mark the sqlite temporaries as excluded. They get recreated

src/libsync/hydrationjob.cpp

@@ -3,7 +3,9 @@
 
 #include "hydrationjob.h"
 
+#include "common/syncjournaldb.h"
 #include "common/vfs.h"
+#include "propagatedownload.h"
 
 using namespace OCC;
 
@@ -27,50 +29,53 @@ QString HydrationJob::targetFileName() const
 
 void HydrationJob::start()
 {
-    // _vfs->params().journal->getFileRecordsByFileId(_fileId, [this](const SyncJournalFileRecord &record) {
-    //     Q_ASSERT(!_record.isValid());
-    //     _record = record;
-    // });
-    // if (!_record.isValid()) {
-    //     Q_EMIT error(tr("Failed to find fileId: %1 in db").arg(QString::fromUtf8(_fileId)));
-    //     Q_EMIT _vfs->needSync();
-    //     return;
-    // }
-    // if (!OC_ENSURE(_device->open(QIODevice::WriteOnly))) {
-    //     Q_EMIT error(_device->errorString());
-    //     return;
-    // }
+    const auto dbQueryResult = _vfs->params().journal->getFileRecordsByFileId(_fileId, [this](const SyncJournalFileRecord &record) {
+        Q_ASSERT(!_record.isValid());
+        _record = record;
+    });
+    if (!dbQueryResult || !_record.isValid()) {
+        Q_EMIT error(tr("Failed to find fileId: %1 in db").arg(QString::fromUtf8(_fileId)));
+        Q_EMIT _vfs->needSync();
+        return;
+    }
+    if (!_device->open(QIODevice::WriteOnly)) {
+        Q_EMIT error(_device->errorString());
+        return;
+    }
 
-    // Q_ASSERT(!_job);
-    // _job = new GETFileJob(_vfs->params().account, _vfs->params().baseUrl(), _record.path(), _device.get(), {}, {}, 0, this);
-    // _job->setExpectedContentLength(_record.size());
-    // _job->setPriority(QNetworkRequest::HighPriority);
-    // connect(_job, &GETFileJob::finishedSignal, this, [this] {
-    //     QString errorMsg;
-    //     if (_job->reply()->error() != 0 || (_job->httpStatusCode() != 200 && _job->httpStatusCode() != 204)) {
-    //         errorMsg = _job->reply()->errorString();
-    //     }
+    Q_ASSERT(!_job);
+    // propagator()->account(),
+    // propagator()->fullRemotePath(isEncrypted() ? _item->_encryptedFileName : _item->_file),
+    //    &_tmpFile, headers, expectedEtagForResume, _resumeStart, this
+    _job = new GETFileJob(_vfs->params().account, _vfs->params().remotePath + _record.path(), _device.get(), {}, {}, 0, this);
+    _job->setExpectedContentLength(_record._fileSize);
+    //_job->setPriority(QNetworkRequest::HighPriority);
+    connect(_job, &GETFileJob::finishedSignal, this, [this] {
+        QString errorMsg;
+        if (_job->reply()->error() != 0 /*|| (_job->httpStatusCode() != 200 && _job->httpStatusCode() != 204)*/) {
+            errorMsg = _job->reply()->errorString();
+        }
 
-    //     if (_job->contentLength() != -1) {
-    //         const auto size = _job->resumeStart() + _job->contentLength();
-    //         if (size != _record.size()) {
-    //             errorMsg = tr("Unexpected file size transferred. Expected %1 received %2").arg(QString::number(_record.size()), QString::number(size));
-    //             // assume that the local and the remote metadata are out of sync
-    //             Q_EMIT _vfs->needSync();
-    //         }
-    //     }
-    //     if (_job->aborted()) {
-    //         errorMsg = tr("Aborted.");
-    //     }
+        if (_job->contentLength() != -1) {
+            const auto size = _job->resumeStart() + _job->contentLength();
+            if (size != _record._fileSize) {
+                errorMsg = tr("Unexpected file size transferred. Expected %1 received %2").arg(QString::number(_record._fileSize), QString::number(size));
+                // assume that the local and the remote metadata are out of sync
+                Q_EMIT _vfs->needSync();
+            }
+        }
+        // if (_job->aborted()) {
+        //     errorMsg = tr("Aborted.");
+        // }
 
-    //     if (!errorMsg.isEmpty()) {
-    //         Q_EMIT error(errorMsg);
-    //         return;
-    //     }
+        if (!errorMsg.isEmpty()) {
+            Q_EMIT error(errorMsg);
+            return;
+        }
 
-    //     Q_EMIT finished();
-    // });
-    // _job->start();
+        Q_EMIT finished();
+    });
+    _job->start();
 }
 
 void HydrationJob::abort()