Merge pull request #5111 from nextcloud/backport/5107/stable-3.6

[stable-3.6] Refactor FolderMan's "Edit Locally" capabilities as separate class
nextcloud · Oct 31, 2022 · 9c52bd8 · 9c52bd8
2 parents dc64a7b + 13b7043
commit 9c52bd8
Show file tree

Hide file tree

Showing 12 changed files with 580 additions and 191 deletions.
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -80,6 +80,10 @@ set(client_SRCS
     conflictsolver.cpp
     connectionvalidator.h
     connectionvalidator.cpp
+    editlocallyjob.h
+    editlocallyjob.cpp
+    editlocallymanager.h
+    editlocallymanager.cpp
     folder.h
     folder.cpp
     foldercreationdialog.h

diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
@@ -348,6 +348,21 @@ AccountStatePtr AccountManager::account(const QString &name)
     return it != _accounts.cend() ? *it : AccountStatePtr();
 }
 
+AccountStatePtr AccountManager::accountFromUserId(const QString &id) const
+{
+    for (const auto &account : accounts()) {
+        const auto isUserIdWithPort = id.split(QLatin1Char(':')).size() > 1;
+        const auto port = isUserIdWithPort ? account->account()->url().port() : -1;
+        const auto portString = (port > 0 && port != 80 && port != 443) ? QStringLiteral(":%1").arg(port) : QStringLiteral("");
+        const QString davUserId = QStringLiteral("%1@%2").arg(account->account()->davUser(), account->account()->url().host()) + portString;
+
+        if (davUserId == id) {
+            return account;
+        }
+    }
+    return {};
+}
+
 AccountState *AccountManager::addAccount(const AccountPtr &newAccount)
 {
     auto id = newAccount->id();

diff --git a/src/gui/accountmanager.h b/src/gui/accountmanager.h
@@ -65,6 +65,12 @@ class AccountManager : public QObject
      */
     AccountStatePtr account(const QString &name);
 
+    /**
+     * Return the account state pointer for an account from its id
+     */
+
+    AccountStatePtr accountFromUserId(const QString &id) const;
+
     /**
      * Delete the AccountState
      */

diff --git a/src/gui/application.cpp b/src/gui/application.cpp
@@ -22,6 +22,7 @@
 #include "config.h"
 #include "account.h"
 #include "accountstate.h"
+#include "editlocallymanager.h"
 #include "connectionvalidator.h"
 #include "folder.h"
 #include "folderman.h"
@@ -749,34 +750,10 @@ void Application::handleEditLocallyFromOptions()
         return;
     }
 
-    handleEditLocally(_editFileLocallyUrl);
+    EditLocallyManager::instance()->editLocally(_editFileLocallyUrl);
     _editFileLocallyUrl.clear();
 }
 
-void Application::handleEditLocally(const QUrl &url) const
-{
-    auto pathSplit = url.path().split('/', Qt::SkipEmptyParts);
-
-    if (pathSplit.size() < 2) {
-        qCWarning(lcApplication) << "Invalid URL for file local editing: " + pathSplit.join('/');
-        return;
-    }
-
-    // for a sample URL "nc://open/admin@nextcloud.lan:8080/Photos/lovely.jpg", QUrl::path would return "admin@nextcloud.lan:8080/Photos/lovely.jpg"
-    const auto userId = pathSplit.takeFirst();
-    const auto fileRemotePath = pathSplit.join('/');
-    const auto urlQuery = QUrlQuery{url};
-
-    auto token = QString{};
-    if (urlQuery.hasQueryItem(QStringLiteral("token"))) {
-        token = urlQuery.queryItemValue(QStringLiteral("token"));
-    } else {
-        qCWarning(lcApplication) << "Invalid URL for file local editing: missing token";
-    }
-
-    FolderMan::instance()->editFileLocally(userId, fileRemotePath, token);
-}
-
 QString substLang(const QString &lang)
 {
     // Map the more appropriate script codes
@@ -917,7 +894,7 @@ bool Application::event(QEvent *event)
             // On macOS, Qt does not handle receiving a custom URI as it does on other systems (as an application argument).
             // Instead, it sends out a QFileOpenEvent. We therefore need custom handling for our URI handling on macOS.
             qCInfo(lcApplication) << "macOS: Opening local file for editing: " << openEvent->url();
-            handleEditLocally(openEvent->url());
+            EditLocallyManager::instance()->editLocally(openEvent->url());
         } else {
             const auto errorParsingLocalFileEditingUrl = QStringLiteral("The supplied url for local file editing '%1' is invalid!").arg(openEvent->url().toString());
             qCInfo(lcApplication) << errorParsingLocalFileEditingUrl;

diff --git a/src/gui/application.h b/src/gui/application.h
@@ -87,8 +87,6 @@ public slots:
     /// Attempt to show() the tray icon again. Used if no systray was available initially.
     void tryTrayAgain();
 
-    void handleEditLocally(const QUrl &url) const;
-
 protected:
     void parseOptions(const QStringList &);
     void setupTranslations();