From 5825451aef1a762bfaeff2d37c09b3790deee7b1 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Tue, 26 Jun 2018 19:51:52 +0200 Subject: Socket messages are json formatted --- src/webengine/urlinterceptor.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'src/webengine/urlinterceptor.cpp') diff --git a/src/webengine/urlinterceptor.cpp b/src/webengine/urlinterceptor.cpp index 815018b..4fc23e0 100644 --- a/src/webengine/urlinterceptor.cpp +++ b/src/webengine/urlinterceptor.cpp @@ -9,7 +9,6 @@ #include "urlinterceptor.h" #include #include -#include UrlRequestInterceptor::UrlRequestInterceptor(const QString &path, QObject *parent) : QWebEngineUrlRequestInterceptor(parent) @@ -18,28 +17,20 @@ UrlRequestInterceptor::UrlRequestInterceptor(const QString &path, QObject *paren const QStringList hostFiles = hostsD.entryList(QDir::Files); for(const QString &file : hostFiles) { const QString absPath = hostsD.absoluteFilePath(file); - QtConcurrent::run([this, absPath]() { - auto r = parse(absPath); + auto r = parse(absPath); #ifdef QT_DEBUG - qDebug("Parsed %i rules from %s", r.count(), qUtf8Printable(absPath)); + qDebug("Parsed %i rules from %s", r.count(), qUtf8Printable(absPath)); #endif - rulesLock.lock(); - rules.unite(r); - rulesLock.unlock(); - }); + rules.unite(r); } } -UrlRequestInterceptor::~UrlRequestInterceptor() = default; - void UrlRequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo &info) { - rulesLock.lock(); if(rules.contains(info.requestUrl().host())) { info.block(rules.value(info.requestUrl().host()).isBlocking); } - rulesLock.unlock(); } QHash parse(const QString &filename) @@ -88,4 +79,4 @@ QHash parse(const QString &filename) } return rules; -}; +} -- cgit v1.2.1