read capabilities for bulk upload from server

use it in dedicated tests

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

diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp
index cfffa403afef3865ffc5e6429b84920b41272898..a917c20e5409db332fdce306e2b5827f08516f61 100644 (file)
--- a/src/libsync/capabilities.cpp
+++ b/src/libsync/capabilities.cpp
@@ -216,6 +216,11 @@ bool Capabilities::chunkingNg() const
     return _capabilities["dav"].toMap()["chunking"].toByteArray() >= "1.0";
 }
 
+bool Capabilities::bulkUpload() const
+{
+    return _capabilities["dav"].toMap()["bulkupload"].toByteArray() >= "1.0";
+}
+
 bool Capabilities::userStatus() const
 {
     if (!_capabilities.contains("user_status")) {

diff --git a/src/libsync/capabilities.h b/src/libsync/capabilities.h
index f91208d90bd8dd00c5dc736f67c7d8e3c264a09f..dddda5f5c1805fdad829d55a3d34fddf041fe173 100644 (file)
--- a/src/libsync/capabilities.h
+++ b/src/libsync/capabilities.h
@@ -63,6 +63,7 @@ public:
     bool shareResharing() const;
     int shareDefaultPermissions() const;
     bool chunkingNg() const;
+    bool bulkUpload() const;
     bool userStatus() const;
     bool userStatusSupportsEmoji() const;
 

diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index 9a4ceae545958e8f2a29a01ace500e53be8d2622..b36365780e3bf8b0f38b1dae9964de42bb32e2b1 100644 (file)
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -861,7 +861,7 @@ Result<Vfs::ConvertToPlaceholderResult, QString> OwncloudPropagator::staticUpdat
 
 bool OwncloudPropagator::isDelayedUploadItem(const SyncFileItemPtr &item) const
 {
-    return !_scheduleDelayedTasks && !item->_isEncrypted;
+    return account()->capabilities().bulkUpload() && !_scheduleDelayedTasks && !item->_isEncrypted && _syncOptions._minChunkSize > item->_size;
 }
 
 void OwncloudPropagator::setScheduleDelayedTasks(bool active)

diff --git a/test/testcapabilities.cpp b/test/testcapabilities.cpp
index 1c8e9bac28611ac8a30f3cf47ca7bdb246bea34c..2088cc7b0b02bfda30d5c07d9de20e93d8169c8e 100644 (file)
--- a/test/testcapabilities.cpp
+++ b/test/testcapabilities.cpp
@@ -243,6 +243,20 @@ private slots:
 
         QCOMPARE(defaultSharePermissionsAvailable, 31);
     }
+
+    void testBulkUploadAvailable_bulkUploadAvailable_returnTrue()
+    {
+        QVariantMap bulkuploadMap;
+        bulkuploadMap["bulkupload"] = "1.0";
+
+        QVariantMap capabilitiesMap;
+        capabilitiesMap["dav"] = bulkuploadMap;
+
+        const auto &capabilities = OCC::Capabilities(capabilitiesMap);
+        const auto bulkuploadAvailable = capabilities.bulkUpload();
+
+        QCOMPARE(bulkuploadAvailable, true);
+    }
 };
 
 QTEST_GUILESS_MAIN(TestCapabilities)

diff --git a/test/testsyncengine.cpp b/test/testsyncengine.cpp
index 7e1fc36c46ea0f3eaf9c093f579364a174fa2b63..e17e7ac31c8e998898d25fe52a2110d14aab95be 100644 (file)
--- a/test/testsyncengine.cpp
+++ b/test/testsyncengine.cpp
@@ -92,6 +92,8 @@ private slots:
 
     void testDirUploadWithDelayedAlgorithm() {
         FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()};
+        fakeFolder.syncEngine().account()->setCapabilities({ { "dav", QVariantMap{ {"bulkupload", "1.0"} } } });
+
         ItemCompletedSpy completeSpy(fakeFolder);
         fakeFolder.localModifier().mkdir("Y");
         fakeFolder.localModifier().insert("Y/d0");