From 81eaf7c32f4d6570f75431f053c04536a5787c98 Mon Sep 17 00:00:00 2001
From: Juraj Oravec <jurajoravec@mailo.com>
Date: Tue, 16 Aug 2022 09:10:08 +0200
Subject: [PATCH] Add data cache in HTML5PermDialog

Signed-off-by: Juraj Oravec <jurajoravec@mailo.com>
---
 .../html5permissionsdialog.cpp                | 55 ++++++++++++-------
 .../html5permissions/html5permissionsdialog.h |  9 ++-
 2 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/src/lib/tools/html5permissions/html5permissionsdialog.cpp b/src/lib/tools/html5permissions/html5permissionsdialog.cpp
index 5399d67cc..7733dc5b8 100644
--- a/src/lib/tools/html5permissions/html5permissionsdialog.cpp
+++ b/src/lib/tools/html5permissions/html5permissionsdialog.cpp
@@ -52,30 +52,27 @@ void HTML5PermissionsDialog::showFeaturePermissions(QWebEnginePage::Feature feat
 {
     ui->treeWidget->clear();
 
-    QString column = mApp->siteSettingsManager()->sqlColumnFromWebEngineFeature(feature);
-    QSqlQuery query(SqlDatabase::instance()->database());
-    query.prepare(QSL("SELECT id, server, %1 FROM site_settings WHERE %1 != ?").arg(column));
-    query.addBindValue(SiteSettingsManager::Default);
-    query.exec();
+    if (m_data[feature].length() == 0) {
+        QString column = mApp->siteSettingsManager()->sqlColumnFromWebEngineFeature(feature);
+        QSqlQuery query(SqlDatabase::instance()->database());
+        query.prepare(QSL("SELECT id, server, %1 FROM site_settings WHERE %1 != ?").arg(column));
+        query.addBindValue(SiteSettingsManager::Default);
+        query.exec();
 
-    while (query.next()) {
-        int id = query.value(0).toInt();
-        if (m_removed.contains(feature) && m_removed[feature].contains(id)) {
-            continue;
-        }
+        while (query.next()) {
+            SiteData siteData;
+            siteData.id = query.value(0).toInt();
+            siteData.host = query.value(1).toString();
+            siteData.perm = static_cast<SiteSettingsManager::Permission>(query.value(2).toInt());
+            m_data[feature].append(siteData);
 
-        auto* item = new QTreeWidgetItem(ui->treeWidget);
-        item->setText(0, query.value(1).toString());
-
-        auto perm = static_cast<SiteSettingsManager::Permission>(query.value(2).toInt());
-        if (perm == SiteSettingsManager::Allow) {
-            item->setText(1, tr("Allow"));
+            createEntry(siteData);
         }
-        else {
-            item->setText(1, tr("Deny"));
+    }
+    else {
+        for (auto siteData : m_data[feature]) {
+            createEntry(siteData);
         }
-        item->setData(0, Qt::UserRole + 10, id);
-        ui->treeWidget->addTopLevelItem(item);
     }
 }
 
@@ -84,6 +81,24 @@ void HTML5PermissionsDialog::featureIndexChanged()
     showFeaturePermissions(currentFeature());
 }
 
+void HTML5PermissionsDialog::createEntry(HTML5PermissionsDialog::SiteData& siteData)
+{
+    if (m_removed.contains(currentFeature()) && m_removed[currentFeature()].contains(siteData.id)) {
+        return;
+    }
+    auto* item = new QTreeWidgetItem(ui->treeWidget);
+    item->setText(0, siteData.host);
+
+    if (siteData.perm == SiteSettingsManager::Allow) {
+        item->setText(1, tr("Allow"));
+    }
+    else {
+        item->setText(1, tr("Deny"));
+    }
+    item->setData(0, Qt::UserRole + 10, siteData.id);
+    ui->treeWidget->addTopLevelItem(item);
+}
+
 void HTML5PermissionsDialog::removeEntry()
 {
     QTreeWidgetItem* item = ui->treeWidget->currentItem();
diff --git a/src/lib/tools/html5permissions/html5permissionsdialog.h b/src/lib/tools/html5permissions/html5permissionsdialog.h
index 6b390aad5..518953d2b 100644
--- a/src/lib/tools/html5permissions/html5permissionsdialog.h
+++ b/src/lib/tools/html5permissions/html5permissionsdialog.h
@@ -18,6 +18,7 @@
 #ifndef HTML5PERMISSIONSDIALOG_H
 #define HTML5PERMISSIONSDIALOG_H
 
+#include "sitesettingsmanager.h"
 #include <QDialog>
 #include <QStringList>
 #include <QWebEnginePage>
@@ -44,13 +45,19 @@ private Q_SLOTS:
     void saveSettings();
 
 private:
-    enum Role { Allow, Deny };
+    struct SiteData {
+        SiteSettingsManager::Permission perm;
+        int id;
+        QString host;
+    };
+    void createEntry(SiteData &siteData);
 
     QWebEnginePage::Feature currentFeature() const;
     QWebEnginePage::Feature indexToFeature(const int index) const;
 
     Ui::HTML5PermissionsDialog* ui;
 
+    QHash<QWebEnginePage::Feature, QList<SiteData>> m_data;
     QHash<QWebEnginePage::Feature, QVariantList> m_removed;
 };