From f507a7a5557c7cca9570c684920e055c5251b08e Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Wed, 18 Jul 2018 10:07:51 +0200
Subject: AdBlockRule: move matching logic to FilterRule

---
 src/webengine/urlinterceptor.cpp | 21 ---------------------
 src/webengine/urlinterceptor.h   |  4 ----
 2 files changed, 25 deletions(-)

(limited to 'src/webengine')

diff --git a/src/webengine/urlinterceptor.cpp b/src/webengine/urlinterceptor.cpp
index 1b44c47..a66ab57 100644
--- a/src/webengine/urlinterceptor.cpp
+++ b/src/webengine/urlinterceptor.cpp
@@ -39,24 +39,7 @@ UrlRequestInterceptor::UrlRequestInterceptor(const std::unique_ptr<Configuration
         }
     }
 
-    QFile rules(config->value<QString>("filter.json-path").value());
-    if(rules.open(QIODevice::ReadOnly | QIODevice::Text)) {
-        auto doc = QJsonDocument::fromJson(rules.readAll()).object();
 
-        Q_ASSERT(doc.value("domains").isArray());
-        for(QJsonValue d : doc.value("domains").toArray()) {
-            domain.addDomain(d.toString());
-        }
-
-        Q_ASSERT(doc.value("rules").isArray());
-        for(QJsonValue rule : doc.value("rules").toArray()) {
-            auto p = std::make_unique<FilterRule>(rule.toObject());
-            parseJson(p, rule.toObject());
-            domain.addRule(p);
-        }
-
-        rules.close();
-    }
 
 }
 
@@ -72,10 +55,6 @@ void UrlRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo &info)
         return;
     }
 
-    if(domain.hasMatch(info.requestUrl().host())) {
-        domain.process(info);
-    }
-
 #ifdef QT_DEBUG
 //    qDebug("request>>>");
 //    qDebug("firstParty url=%s", qUtf8Printable(info.firstPartyUrl().toString()));
diff --git a/src/webengine/urlinterceptor.h b/src/webengine/urlinterceptor.h
index 06a4b97..2f91e30 100644
--- a/src/webengine/urlinterceptor.h
+++ b/src/webengine/urlinterceptor.h
@@ -14,8 +14,6 @@
 #include <QVector>
 #include <QByteArray>
 
-#include "web/urlfilter/filterdomain.h"
-
 typedef std::pair<std::string, std::string> Header;
 
 class Configuration;
@@ -35,8 +33,6 @@ public:
 private:
     QHash<QString, HostRule> rules;
     std::vector<Header> m_headers;
-
-    FilterDomain domain;
 };
 
 QHash<QString, UrlRequestInterceptor::HostRule> parse(const QString &filename);
-- 
cgit v1.2.1