fix(lockedFiles): check for locked files before opening them

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

Author: mgallien

src/libsync/propagateuploadng.cpp

@@ -355,15 +355,19 @@ void PropagateUploadFileNG::startNextChunk()
     }
 
     const auto fileName = _fileToUpload._path;
+    if (FileSystem::isFileLocked(fileName, FileSystem::LockMode::SharedRead)) {
+        // If the file is currently locked, we want to retry the sync
+        // when it becomes available again.
+        emit propagator()->seenLockedFile(fileName);
+
+        // Soft error because this is likely caused by the user modifying his files while syncing
+        abortWithError(SyncFileItem::FileLocked, tr("File is locked preventing syncing it", "Generic warning message when a locked file cannot be synced"));
+        return;
+    }
     auto device = std::make_unique<UploadDevice>(fileName, _sent, _currentChunkSize, &propagator()->_bandwidthManager);
-    if (auto isLocked = FileSystem::isFileLocked(fileName, FileSystem::LockMode::SharedRead); isLocked || !device->open(QIODevice::ReadOnly)) {
+    if (!device->open(QIODevice::ReadOnly)) {
         qCWarning(lcPropagateUploadNG) << "Could not prepare upload device: " << device->errorString();
 
-        // If the file is currently locked, we want to retry the sync
-        // when it becomes available again.
-        if (isLocked) {
-            emit propagator()->seenLockedFile(fileName);
-        }
         // Soft error because this is likely caused by the user modifying his files while syncing
         abortWithError(SyncFileItem::SoftError, device->errorString());
         return;

src/libsync/propagateuploadv1.cpp

@@ -134,18 +134,21 @@ void PropagateUploadFileV1::startNextChunk()
     }
 
     const QString fileName = _fileToUpload._path;
+    if (FileSystem::isFileLocked(fileName, FileSystem::LockMode::SharedRead)) {
+        emit propagator()->seenLockedFile(fileName);
+
+               // Soft error because this is likely caused by the user modifying his files while syncing
+        abortWithError(SyncFileItem::FileLocked, tr("File is locked preventing syncing it", "Generic warning message when a locked file cannot be synced"));
+        return;
+    }
+
     auto device = std::make_unique<UploadDevice>(
             fileName, chunkStart, currentChunkSize, &propagator()->_bandwidthManager);
-    if (const auto isLocked = FileSystem::isFileLocked(fileName, FileSystem::LockMode::SharedRead); isLocked || !device->open(QIODevice::ReadOnly)) {
+    if (!device->open(QIODevice::ReadOnly)) {
         qCWarning(lcPropagateUploadV1) << "Could not prepare upload device: " << device->errorString();
 
-        // If the file is currently locked, we want to retry the sync
-        // when it becomes available again.
-        if (isLocked) {
-            emit propagator()->seenLockedFile(fileName);
-        }
         // Soft error because this is likely caused by the user modifying his files while syncing
-        abortWithError(isLocked ? SyncFileItem::FileLocked : SyncFileItem::SoftError, device->errorString());
+        abortWithError(SyncFileItem::SoftError, device->errorString());
         return;
     }