Merge branch 'issue7814' of github.com:mike0609king/desktop into issue7814

Signed-off-by: Mike Mengjie Huang <[email protected]>

Author: mike0609king

src/gui/tray/unifiedsearchresultslistmodel.cpp

@@ -324,48 +324,48 @@ bool UnifiedSearchResultsListModel::isSearchInProgress() const
     return !_searchJobConnections.isEmpty();
 }
 
-void UnifiedSearchResultsListModel::resultClicked(
-    const QString &providerId, const QUrl &resourceUrl, const QString &subline, const QString &title
-) const
+
+void UnifiedSearchResultsListModel::resultClicked(const QString &providerId,
+                                                                                           const QUrl &resourceUrl,
+                                                                                           const QString &subline,
+                                                                                           const QString &title) const
 {
-    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 QUrlQuery urlQuery{resourceUrl};
+    auto dir = urlQuery.queryItemValue(QStringLiteral("dir"), QUrl::ComponentFormattingOption::FullyDecoded);
+    auto fileName = urlQuery.queryItemValue(QStringLiteral("scrollto"), QUrl::ComponentFormattingOption::FullyDecoded);
 
-    qCInfo(lcUnifiedSearch) << "relativePath: " << relativePath; 
-    const QStringList localFiles = FolderMan::instance()->findFileInLocalFolders(relativePath, _accountState->account());
+    if (providerId.contains(QStringLiteral("file"), Qt::CaseInsensitive)){
+        if (!_accountState || !_accountState->account()) {
+            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);
+        // server version above 20
+        if (dir.isEmpty() && fileName.isEmpty()) {
+            // file is direct child of syncfolder
+            if (subline.isEmpty()) {
+                dir = title;
+            } else {
+                dir = subline.split(' ', Qt::SkipEmptyParts).last();
+                fileName = QLatin1Char('/') + title;
+            }
+        } else if (dir.length() > 1) {
+        // server version 20
+            fileName.prepend(QLatin1Char('/'));
+        }
+        const auto relativePath = dir + fileName;
+
+        const auto localFiles = FolderMan::instance()->findFileInLocalFolders(relativePath, _accountState->account());
+        if (!localFiles.isEmpty()) {
+            qCInfo(lcUnifiedSearch) << "Opening file: " << localFiles.constFirst();
+            const auto fileOpenedLocally = QDesktopServices::openUrl(QUrl::fromLocalFile(localFiles.constFirst()));
+            if (fileOpenedLocally) {
+                return;
+            } else {
+                qCWarning(lcUnifiedSearch) << "Warning: QDesktopServices::openUrl unexpectedly failed to open the file. Opening resourceUrl in web browser is attempted next.";
+            }
+        }
     }
+    Utility::openBrowser(resourceUrl);
 }
 
 void UnifiedSearchResultsListModel::fetchMoreTriggerClicked(const QString &providerId)

test/testunifiedsearchlistmodel.cpp

@@ -274,12 +274,12 @@ FakeSearchResultsStorage *FakeSearchResultsStorage::_instance = nullptr;
 
 }
 
-class TestUnifiedSearchListmodel : public QObject
+class TestUnifiedSearchListModel : public QObject
 {
     Q_OBJECT
 
 public:
-    TestUnifiedSearchListmodel() = default;
+    TestUnifiedSearchListModel() = default;
 
     QScopedPointer<FakeQNAM> fakeQnam;
     OCC::AccountPtr account;
@@ -578,10 +578,19 @@ private slots:
                 const auto providerId =
                     model->data(model->index(i), OCC::UnifiedSearchResultsListModel::DataRole::ProviderIdRole)
                         .toString();
+
+                const auto subline = 
+                    model->data(model->index(i), OCC::UnifiedSearchResultsListModel::DataRole::SublineRole)
+                        .toString();
+
+                const auto title = 
+                    model->data(model->index(i), OCC::UnifiedSearchResultsListModel::DataRole::TitleRole)
+                        .toString();
+
                 urlForClickedResult = model->data(model->index(i), OCC::UnifiedSearchResultsListModel::DataRole::ResourceUrlRole).toString();
 
                 if (!providerId.isEmpty() && !urlForClickedResult.isEmpty()) {
-                    model->resultClicked(providerId, QUrl(urlForClickedResult), "dummyStringNeedToFix", "dummyStringNeedToFix");
+                    model->resultClicked(providerId, QUrl(urlForClickedResult), subline, title);
                     break;
                 }
             }
@@ -632,5 +641,5 @@ private slots:
     }
 };
 
-QTEST_MAIN(TestUnifiedSearchListmodel)
+QTEST_MAIN(TestUnifiedSearchListModel)
 #include "testunifiedsearchlistmodel.moc"