Iteration.

Signed-off-by: alex-z <[email protected]>
nextcloud · Feb 24, 2024 · 3671582 · 3671582
1 parent 1438e72
commit 3671582
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 8 deletions.
diff --git a/src/common/utility.cpp b/src/common/utility.cpp
@@ -693,15 +693,28 @@ QString Utility::noLeadingSlashPath(const QString &path)
     return path.startsWith(slash) ? path.mid(1) : path;
 }
 
+QString Utility::noTrailingSlashPath(const QString &path)
+{
+    static const auto slash = QLatin1Char('/');
+    return path.endsWith(slash) ? path.chopped(1) : path;
+}
+
 QString Utility::fullRemotePathToRemoteSyncRootRelative(const QString &fullRemotePath, const QString &remoteSyncRoot)
 {
     const auto remoteSyncRootNoLeadingSlashWithTrailingSlash = Utility::trailingSlashPath(noLeadingSlashPath(remoteSyncRoot));
     const auto fullRemotePathNoLeadingSlash = noLeadingSlashPath(fullRemotePath);
-    const auto relativePathToRemoteSyncRoot = remoteSyncRootNoLeadingSlashWithTrailingSlash != QStringLiteral("/") && fullRemotePathNoLeadingSlash.startsWith(remoteSyncRootNoLeadingSlashWithTrailingSlash)
-         ? fullRemotePathNoLeadingSlash.mid(remoteSyncRootNoLeadingSlashWithTrailingSlash.size())
-         : fullRemotePath;
+
+    if (remoteSyncRootNoLeadingSlashWithTrailingSlash == QStringLiteral("/")) {
+        return noLeadingSlashPath(noTrailingSlashPath(fullRemotePath));
+    }
+
+    if (!fullRemotePathNoLeadingSlash.startsWith(remoteSyncRootNoLeadingSlashWithTrailingSlash)) {
+        return fullRemotePath;
+    }
+
+    const auto relativePathToRemoteSyncRoot = fullRemotePathNoLeadingSlash.mid(remoteSyncRootNoLeadingSlashWithTrailingSlash.size());
     Q_ASSERT(!relativePathToRemoteSyncRoot.isEmpty());
-    return noLeadingSlashPath(relativePathToRemoteSyncRoot);
+    return noLeadingSlashPath(noTrailingSlashPath(relativePathToRemoteSyncRoot));
 }
 
 

diff --git a/src/common/utility.h b/src/common/utility.h
@@ -269,6 +269,7 @@ namespace Utility {
 
     OCSYNC_EXPORT QString trailingSlashPath(const QString &path);
     OCSYNC_EXPORT QString noLeadingSlashPath(const QString &path);
+    OCSYNC_EXPORT QString noTrailingSlashPath(const QString &path);
     OCSYNC_EXPORT QString fullRemotePathToRemoteSyncRootRelative(const QString &fullRemotePath, const QString &remoteSyncRoot);
 
 #ifdef Q_OS_WIN

diff --git a/src/libsync/propagatedownloadencrypted.cpp b/src/libsync/propagatedownloadencrypted.cpp
@@ -37,7 +37,8 @@ PropagateDownloadEncrypted::PropagateDownloadEncrypted(OwncloudPropagator *propa
 void PropagateDownloadEncrypted::start()
 {
     SyncJournalFileRecord rec;
-    if (!_propagator->_journal->getRootE2eFolderRecord(Utility::fullRemotePathToRemoteSyncRootRelative(_remoteParentPath, _propagator->remotePath()), &rec) || !rec.isValid()) {
+    if (!_propagator->_journal->getRootE2eFolderRecord(Utility::fullRemotePathToRemoteSyncRootRelative(_remoteParentPath, _propagator->remotePath()), &rec)
+        || !rec.isValid()) {
         emit failed();
         return;
     }

diff --git a/src/libsync/propagateremotemkdir.cpp b/src/libsync/propagateremotemkdir.cpp
@@ -157,7 +157,14 @@ void PropagateRemoteMkdir::finalizeMkColJob(QNetworkReply::NetworkError err, con
             // We're expecting directory path in /Foo/Bar convention...
             Q_ASSERT(jobPath.startsWith('/') && !jobPath.endsWith('/'));
             // But encryption job expect it in Foo/Bar/ convention
-            auto job = new OCC::EncryptFolderJob(propagator()->account(), propagator()->_journal, jobPath.mid(1), _item->_file, propagator()->remotePath(), _item->_fileId, propagator(), _item);
+            auto job = new OCC::EncryptFolderJob(propagator()->account(),
+                                                 propagator()->_journal,
+                                                 jobPath.mid(1),
+                                                 _item->_file,
+                                                 propagator()->remotePath(),
+                                                 _item->_fileId,
+                                                 propagator(),
+                                                 _item);
             job->setParent(this);
             connect(job, &OCC::EncryptFolderJob::finished, this, &PropagateRemoteMkdir::slotEncryptFolderFinished);
             job->start();

diff --git a/src/libsync/propagateuploadencrypted.cpp b/src/libsync/propagateuploadencrypted.cpp
@@ -55,7 +55,9 @@ void PropagateUploadEncrypted::start()
      */
     // Encrypt File!
     SyncJournalFileRecord rec;
-    if (!_propagator->_journal->getRootE2eFolderRecord(Utility::fullRemotePathToRemoteSyncRootRelative(_remoteParentAbsolutePath, _propagator->remotePath()), &rec) || !rec.isValid()) {
+    if (!_propagator->_journal->getRootE2eFolderRecord(Utility::fullRemotePathToRemoteSyncRootRelative(_remoteParentAbsolutePath, _propagator->remotePath()),
+                                                       &rec)
+        || !rec.isValid()) {
         emit error();
         return;
     }

diff --git a/src/libsync/updatee2eefoldermetadatajob.cpp b/src/libsync/updatee2eefoldermetadatajob.cpp
@@ -84,7 +84,8 @@ void UpdateE2eeFolderMetadataJob::slotFetchMetadataJobFinished(int httpReturnCod
     }
 
     SyncJournalFileRecord rec;
-    if (!propagator()->_journal->getRootE2eFolderRecord(Utility::fullRemotePathToRemoteSyncRootRelative(_encryptedRemotePath, propagator()->remotePath()), &rec) || !rec.isValid()) {
+    if (!propagator()->_journal->getRootE2eFolderRecord(Utility::fullRemotePathToRemoteSyncRootRelative(_encryptedRemotePath, propagator()->remotePath()), &rec)
+        || !rec.isValid()) {
         unlockFolder(EncryptedFolderMetadataHandler::UnlockFolderWithResult::Failure);
         return;
     }