LocationBar: Handle url/search resolution in loadAction instead of WebView::load

autotests/locationbartest.cpp

@@ -64,7 +64,6 @@ void LocationBarTest::loadActionBasicTest()
 
     action = LocationBar::loadAction("localhost/test/path?x=2");
     QCOMPARE(action.type, LocationBar::LoadAction::Url);
-    QEXPECT_FAIL("", "localhost is not treated as full host", Continue);
     QCOMPARE(action.loadRequest.url(), QUrl("http://localhost/test/path?x=2"));
 
     action = LocationBar::loadAction("host.com/test/path?x=2");
@@ -72,12 +71,14 @@ void LocationBarTest::loadActionBasicTest()
     QCOMPARE(action.loadRequest.url(), QUrl("http://host.com/test/path?x=2"));
 
     action = LocationBar::loadAction("not-url");
-    QCOMPARE(action.type, LocationBar::LoadAction::Url);
-    QCOMPARE(action.loadRequest.url(), QUrl("not-url"));
+    QCOMPARE(action.type, LocationBar::LoadAction::Search);
 
     action = LocationBar::loadAction("not url with spaces");
+    QCOMPARE(action.type, LocationBar::LoadAction::Search);
+
+    action = LocationBar::loadAction("qupzilla:about");
     QCOMPARE(action.type, LocationBar::LoadAction::Url);
-    QCOMPARE(action.loadRequest.url(), QUrl("not url with spaces"));
+    QCOMPARE(action.loadRequest.url(), QUrl("qupzilla:about"));
 }
 
 void LocationBarTest::loadActionBookmarksTest()
@@ -95,8 +96,7 @@ void LocationBarTest::loadActionBookmarksTest()
     QCOMPARE(action.loadRequest.url(), QUrl("http://kde.org"));
 
     action = LocationBar::loadAction("kde-bookmark-notkeyword");
-    QCOMPARE(action.type, LocationBar::LoadAction::Url);
-    QCOMPARE(action.loadRequest.url(), QUrl("kde-bookmark-notkeyword"));
+    QCOMPARE(action.type, LocationBar::LoadAction::Search);
 
     action = LocationBar::loadAction("kde-bookmark");
     QCOMPARE(action.type, LocationBar::LoadAction::Bookmark);
@@ -111,13 +111,12 @@ void LocationBarTest::loadActionSearchTest()
     engine.url = "http://test/%s";
     engine.shortcut = "t";
     mApp->searchEnginesManager()->addEngine(engine);
+    mApp->searchEnginesManager()->setActiveEngine(engine);
 
     LocationBar::LoadAction action;
 
     action = LocationBar::loadAction("search term");
-    QEXPECT_FAIL("", "loadAction is not handling searching", Continue);
     QCOMPARE(action.type, LocationBar::LoadAction::Search);
-    QEXPECT_FAIL("", "loadAction is not handling searching", Continue);
     QCOMPARE(action.loadRequest.url(), QUrl("http://test/search%20term"));
 
     action = LocationBar::loadAction("t search term");
@@ -125,8 +124,8 @@ void LocationBarTest::loadActionSearchTest()
     QCOMPARE(action.loadRequest.url(), QUrl("http://test/search%20term"));
 
     action = LocationBar::loadAction(" ttt-notsearch");
-    QCOMPARE(action.type, LocationBar::LoadAction::Url);
-    QCOMPARE(action.loadRequest.url(), QUrl("ttt-notsearch"));
+    QCOMPARE(action.type, LocationBar::LoadAction::Search);
+    QCOMPARE(action.loadRequest.url(), QUrl("http://test/ttt-notsearch"));
 }
 
 int main(int argc, char **argv)

src/lib/navigation/completer/locationcompleter.cpp

@@ -283,8 +283,6 @@ void LocationCompleter::indexDeleteRequested(const QModelIndex &index)
 LoadRequest LocationCompleter::createLoadRequest(const QModelIndex &index)
 {
     LoadRequest request;
-    QString searchString;
-    SearchEngine searchEngine;
     BookmarkItem *bookmark = nullptr;
 
     if (index.data(LocationCompleterModel::HistoryRole).toBool()) {
@@ -292,8 +290,8 @@ LoadRequest LocationCompleter::createLoadRequest(const QModelIndex &index)
     } else if (index.data(LocationCompleterModel::BookmarkRole).toBool()) {
         bookmark = static_cast<BookmarkItem*>(index.data(LocationCompleterModel::BookmarkItemRole).value<void*>());
     } else if (index.data(LocationCompleterModel::SearchSuggestionRole).toBool()) {
-        searchEngine = LocationBar::searchEngine();
-        searchString = index.data(LocationCompleterModel::TitleRole).toString();
+        const QString text = index.data(LocationCompleterModel::TitleRole).toString();
+        request = mApp->searchEnginesManager()->searchResult(LocationBar::searchEngine(), text);
     } else if (index.data(LocationCompleterModel::VisitSearchItemRole).toBool()) {
         const auto action = LocationBar::loadAction(m_originalText);
         switch (action.type) {
@@ -312,8 +310,6 @@ LoadRequest LocationCompleter::createLoadRequest(const QModelIndex &index)
     if (bookmark) {
         bookmark->updateVisitCount();
         request = bookmark->url();
-    } else if (searchEngine.isValid()) {
-        request = mApp->searchEnginesManager()->searchResult(searchEngine, searchString);
     }
 
     return request;

src/lib/navigation/completer/locationcompleterdelegate.cpp

@@ -29,21 +29,6 @@
 #include <QMouseEvent>
 #include <QTextLayout>
 
-static bool isUrlOrDomain(const QString &text)
-{
-    QUrl url(text);
-    if (!url.scheme().isEmpty() && (!url.host().isEmpty() || !url.path().isEmpty())) {
-        return true;
-    }
-    if (text.contains(QL1C('.')) && !text.contains(QL1C(' '))) {
-        return true;
-    }
-    if (text == QL1S("localhost")) {
-        return true;
-    }
-    return false;
-}
-
 LocationCompleterDelegate::LocationCompleterDelegate(QObject *parent)
     : QStyledItemDelegate(parent)
     , m_rowHeight(0)
@@ -93,17 +78,12 @@ void LocationCompleterDelegate::paint(QPainter* painter, const QStyleOptionViewI
     const bool isVisitSearchItem = index.data(LocationCompleterModel::VisitSearchItemRole).toBool();
     const bool isSearchSuggestion = index.data(LocationCompleterModel::SearchSuggestionRole).toBool();
 
-    bool isWebSearch = false;
     LocationBar::LoadAction loadAction;
+    bool isWebSearch = isSearchSuggestion;
 
     if (isVisitSearchItem) {
         loadAction = LocationBar::loadAction(m_originalText);
         isWebSearch = loadAction.type == LocationBar::LoadAction::Search;
-        if (!isWebSearch && loadAction.type == LocationBar::LoadAction::Url) {
-            isWebSearch = !isUrlOrDomain(m_originalText.trimmed());
-        }
-    } else if (isSearchSuggestion) {
-        isWebSearch = true;
     }
 
     // Draw icon

src/lib/navigation/locationbar.cpp

@@ -213,6 +213,10 @@ LocationBar::LoadAction LocationBar::loadAction(const QString &text)
 
     const QString &t = text.trimmed();
 
+    if (t.isEmpty()) {
+        return action;
+    }
+
     // Check for Search Engine shortcut
     const int firstSpacePos = t.indexOf(QLatin1Char(' '));
     if (qzSettings->searchFromAddressBar && firstSpacePos != -1) {
@@ -238,27 +242,35 @@ LocationBar::LoadAction LocationBar::loadAction(const QString &text)
         return action;
     }
 
-    // Otherwise load as url
-    action.type = LoadAction::Url;
-
-    // One word needs special handling, because QUrl::fromUserInput
-    // would convert it to QUrl("http://WORD")
-    if (t != QL1S("localhost") && !QzTools::containsSpace(t) && !t.contains(QL1C('.'))) {
-        action.loadRequest.setUrl(QUrl(t));
-    } else {
-        const QUrl &guessed = QUrl::fromUserInput(t);
-        if (!guessed.isEmpty())
-            action.loadRequest.setUrl(guessed);
-        else
-            action.loadRequest.setUrl(QUrl::fromEncoded(t.toUtf8()));
+    if (!qzSettings->searchFromAddressBar) {
+        action.type = LoadAction::Url;
+        action.loadRequest = QUrl(t);
+        return action;
     }
 
-    // Search when creating url failed
-    if (qzSettings->searchFromAddressBar && !action.loadRequest.isValid()) {
+    // Check for one word search
+    if (t != QL1S("localhost")
+            && !QzTools::containsSpace(t)
+            && !t.contains(QL1C('.'))
+            && !t.contains(QL1C(':'))
+            && !t.contains(QL1C('/'))
+       ) {
         action.type = LoadAction::Search;
-        action.loadRequest = mApp->searchEnginesManager()->searchResult(t);
+        action.loadRequest = mApp->searchEnginesManager()->searchResult(searchEngine(), t);
+        return action;
     }
 
+    // Otherwise load as url
+    const QUrl &guessedUrl = QUrl::fromUserInput(t);
+    if (guessedUrl.isValid()) {
+        action.type = LoadAction::Url;
+        action.loadRequest = guessedUrl;
+        return action;
+    }
+
+    // Search when creating url failed
+    action.type = LoadAction::Search;
+    action.loadRequest = mApp->searchEnginesManager()->searchResult(searchEngine(), t);
     return action;
 }
 

src/lib/webengine/webview.cpp

@@ -43,7 +43,6 @@
 #include <QDesktopServices>
 #include <QWebEngineHistory>
 #include <QClipboard>
-#include <QHostInfo>
 #include <QMimeData>
 #include <QWebEngineContextMenuData>
 #include <QStackedLayout>
@@ -203,31 +202,6 @@ void WebView::load(const LoadRequest &request)
 
     if (isUrlValid(reqUrl)) {
         loadRequest(request);
-        return;
-    }
-
-    // Make sure to correctly load hosts like localhost (eg. without the dot)
-    if (!reqUrl.isEmpty() &&
-        reqUrl.scheme().isEmpty() &&
-        !QzTools::containsSpace(reqUrl.path()) && // See #1622
-        !reqUrl.path().contains(QL1C('.'))
-       ) {
-        QUrl u(QSL("http://") + reqUrl.path());
-        if (u.isValid()) {
-            // This is blocking...
-            QHostInfo info = QHostInfo::fromName(u.path());
-            if (info.error() == QHostInfo::NoError) {
-                LoadRequest req = request;
-                req.setUrl(u);
-                loadRequest(req);
-                return;
-            }
-        }
-    }
-
-    if (qzSettings->searchFromAddressBar) {
-        const LoadRequest searchRequest = mApp->searchEnginesManager()->searchResult(request.urlString());
-        loadRequest(searchRequest);
     }
 }