File 0002-Bookmarks-Runner-Initialize-Chrome-favicon... of Package plasma5-workspace

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-Bookmarks-Runner-Initialize-Chrome-favicon-query-onl.patch of Package plasma5-workspace (Revision 7a0e1784f8849f24a1588970c20df16b)

Currently displaying revision 7a0e1784f8849f24a1588970c20df16b , Show latest

From 984b283272f2a326364ca8ad300fb925b8b405bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sun, 9 Sep 2018 19:59:59 +0200
Subject: [PATCH 2/4] [Bookmarks Runner] Initialize Chrome favicon query only
 once per profile

Summary:
The db scheme will not change during the FetchSqlite livetime. Query
the scheme just once per krunner invocation instead of once per result.

Test Plan: make

Reviewers: #frameworks, davidedmundson

Reviewed By: davidedmundson

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D15489
---
 runners/bookmarks/faviconfromblob.cpp | 33 ++++++++++++---------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/runners/bookmarks/faviconfromblob.cpp b/runners/bookmarks/faviconfromblob.cpp
index a23dc15e..a9daffa5 100644
--- a/runners/bookmarks/faviconfromblob.cpp
+++ b/runners/bookmarks/faviconfromblob.cpp
@@ -47,31 +47,26 @@ private:
     const QString m_query;
 };
 
-class ChromeQuery : public BuildQuery {
-public:
-    ChromeQuery() {}
-    QString query(QSqlDatabase *database) const override {
-      //qDebug() << "tables: " << database->tables();
-        if(database->tables().contains(QStringLiteral("favicon_bitmaps"))) {
-            return QStringLiteral("SELECT * FROM favicons " \
-                                  "inner join icon_mapping on icon_mapping.icon_id = favicons.id " \
-                                  "inner join favicon_bitmaps on icon_mapping.icon_id = favicon_bitmaps.icon_id " \
-                                  "WHERE page_url = :url ORDER BY height desc LIMIT 1;");
-        }
-
-        return QStringLiteral("SELECT * FROM favicons inner join icon_mapping " \
-                              "on icon_mapping.icon_id = favicons.id " \
-                              "WHERE page_url = :url LIMIT 1;");
-    }
-};
-
 FaviconFromBlob *FaviconFromBlob::chrome(const QString &profileDirectory, QObject *parent)
 {
     QString profileName = QFileInfo(profileDirectory).fileName();
     QString faviconCache = QStringLiteral("%1/KRunner-Chrome-Favicons-%2.sqlite")
             .arg(QStandardPaths::writableLocation(QStandardPaths::CacheLocation), profileName);
     FetchSqlite *fetchSqlite = new FetchSqlite(profileDirectory + QStringLiteral("/Favicons"), faviconCache, parent);
-    return new FaviconFromBlob(profileName, new ChromeQuery(), QStringLiteral("image_data"), fetchSqlite, parent);
+
+    QString faviconQuery;
+    if(fetchSqlite->tables().contains(QStringLiteral("favicon_bitmaps"))) {
+        faviconQuery = QLatin1String("SELECT * FROM favicons " \
+                                     "inner join icon_mapping on icon_mapping.icon_id = favicons.id " \
+                                     "inner join favicon_bitmaps on icon_mapping.icon_id = favicon_bitmaps.icon_id " \
+                                     "WHERE page_url = :url ORDER BY height desc LIMIT 1;");
+    } else {
+        faviconQuery = QLatin1String("SELECT * FROM favicons " \
+                                     "inner join icon_mapping on icon_mapping.icon_id = favicons.id " \
+                                     "WHERE page_url = :url LIMIT 1;");
+    }
+
+    return new FaviconFromBlob(profileName, new StaticQuery(faviconQuery), QStringLiteral("image_data"), fetchSqlite, parent);
 }
 
 FaviconFromBlob *FaviconFromBlob::firefox(FetchSqlite *fetchSqlite, QObject *parent)
-- 
2.19.0

Places

File 0002-Bookmarks-Runner-Initialize-Chrome-favicon-query-onl.patch of Package plasma5-workspace (Revision 7a0e1784f8849f24a1588970c20df16b)

Places