fix(unifiedsearch): open folder or file requested via traymenu-searchbar directly and locally

Author: barisbasar1209

src/gui/tray/UnifiedSearchResultListItem.qml

@@ -68,7 +68,7 @@ MouseArea {
         if (isFetchMoreTrigger) {
             unifiedSearchResultMouseArea.fetchMoreTriggerClicked(model.providerId)
         } else {
-            unifiedSearchResultMouseArea.resultClicked(model.providerId, model.resourceUrlRole)
+            unifiedSearchResultMouseArea.resultClicked(model.providerId, model.resourceUrlRole, model.subline, model.resultTitle)
         }
     }
 }

src/gui/tray/unifiedsearchresultslistmodel.cpp

@@ -324,29 +324,48 @@ bool UnifiedSearchResultsListModel::isSearchInProgress() const
     return !_searchJobConnections.isEmpty();
 }
 
-void UnifiedSearchResultsListModel::resultClicked(const QString &providerId, const QUrl &resourceUrl) const
+void UnifiedSearchResultsListModel::resultClicked(
+    const QString &providerId, const QUrl &resourceUrl, const QString &subline, const QString &title
+) const
 {
-    const QUrlQuery urlQuery{resourceUrl};
-    const auto dir = urlQuery.queryItemValue(QStringLiteral("dir"), QUrl::ComponentFormattingOption::FullyDecoded);
-    const auto fileName =
-        urlQuery.queryItemValue(QStringLiteral("scrollto"), QUrl::ComponentFormattingOption::FullyDecoded);
-
-    if (providerId.contains(QStringLiteral("file"), Qt::CaseInsensitive) && !dir.isEmpty() && !fileName.isEmpty()) {
-        if (!_accountState || !_accountState->account()) {
-            return;
+    if (_accountState == nullptr || _accountState->account() == nullptr || !providerId.contains(QStringLiteral("file"), Qt::CaseInsensitive)) {
+        qCInfo(lcUnifiedSearch) << "immediately returning from resultClicked"; 
+        return; 
+    }
+
+    const QUrlQuery urlQuery{resourceUrl}; 
+    QString dir = urlQuery.queryItemValue(QStringLiteral("dir"), QUrl::ComponentFormattingOption::FullyDecoded); 
+    QString fileName = urlQuery.queryItemValue(QStringLiteral("scrollto"), QUrl::ComponentFormattingOption::FullyDecoded); 
+
+    QString relativePath; 
+    // server version above 20
+    if (dir.isEmpty() && fileName.isEmpty() && !title.isEmpty()) { 
+        if (!subline.isEmpty()) {
+            dir = subline; 
+            dir.remove(0,3); 
+            fileName = QLatin1Char('/') + title; 
         }
+        else {
+            dir = title; 
+        }
+        relativePath = dir + fileName; 
+    }
+    // server version 20
+    else { 
+        relativePath = dir + QLatin1Char('/') + fileName; 
+    }
 
-        const QString relativePath = dir + QLatin1Char('/') + fileName;
-        const auto localFiles =
-            FolderMan::instance()->findFileInLocalFolders(QFileInfo(relativePath).path(), _accountState->account());
+    qCInfo(lcUnifiedSearch) << "relativePath: " << relativePath; 
+    const QStringList localFiles = FolderMan::instance()->findFileInLocalFolders(relativePath, _accountState->account());
 
-        if (!localFiles.isEmpty()) {
-            qCInfo(lcUnifiedSearch) << "Opening file:" << localFiles.constFirst();
-            QDesktopServices::openUrl(QUrl::fromLocalFile(localFiles.constFirst()));
-            return;
-        }
+    if (!localFiles.isEmpty()) {
+        qCInfo(lcUnifiedSearch) << "Opening requested file or folder locally:" << localFiles.constFirst();
+        QDesktopServices::openUrl(QUrl::fromLocalFile(localFiles.constFirst()));
+    }
+    else {
+        qCInfo(lcUnifiedSearch) << "Opening requested file or folder in webbrowser: " << localFiles.constFirst();
+        Utility::openBrowser(resourceUrl);
     }
-    Utility::openBrowser(resourceUrl);
 }
 
 void UnifiedSearchResultsListModel::fetchMoreTriggerClicked(const QString &providerId)

src/gui/tray/unifiedsearchresultslistmodel.h

@@ -71,7 +71,7 @@ class UnifiedSearchResultsListModel : public QAbstractListModel
     [[nodiscard]] QString errorString() const;
     [[nodiscard]] bool waitingForSearchTermEditEnd() const;
 
-    Q_INVOKABLE void resultClicked(const QString &providerId, const QUrl &resourceUrl) const;
+    Q_INVOKABLE void resultClicked(const QString &providerId, const QUrl &resourceUrl, const QString &subline, const QString &title) const;
     Q_INVOKABLE void fetchMoreTriggerClicked(const QString &providerId);
 
     [[nodiscard]] QHash<int, QByteArray> roleNames() const override;

test/testunifiedsearchlistmodel.cpp

@@ -581,7 +581,7 @@ private slots:
                 urlForClickedResult = model->data(model->index(i), OCC::UnifiedSearchResultsListModel::DataRole::ResourceUrlRole).toString();
 
                 if (!providerId.isEmpty() && !urlForClickedResult.isEmpty()) {
-                    model->resultClicked(providerId, QUrl(urlForClickedResult));
+                    model->resultClicked(providerId, QUrl(urlForClickedResult), "dummyStringNeedToFix", "dummyStringNeedToFix");
                     break;
                 }
             }