From d1287f43964633035938f4f4d4133bb6d9da7b3e Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Mon, 10 Feb 2020 20:58:39 +0200
Subject: staging: smolblok

smolblok is a replacement for the current lib/urlfilter AdBlockPlus
and hostlist format filter parser. It is a library that uses plugins to
provide support for different filter formats.

staging/adblock: AdBlockPlus parser plugin
plugins/smolblok_hostlist: hostlist format parser plugin

Headers will be installed to include/smolbote/

Remove lib/urlfilter
---
 lib/urlfilter/hostlist/hostlist.cpp | 79 -------------------------------------
 lib/urlfilter/hostlist/hostlist.h   | 44 ---------------------
 2 files changed, 123 deletions(-)
 delete mode 100644 lib/urlfilter/hostlist/hostlist.cpp
 delete mode 100644 lib/urlfilter/hostlist/hostlist.h

(limited to 'lib/urlfilter/hostlist')

diff --git a/lib/urlfilter/hostlist/hostlist.cpp b/lib/urlfilter/hostlist/hostlist.cpp
deleted file mode 100644
index bec79ea..0000000
--- a/lib/urlfilter/hostlist/hostlist.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * This file is part of smolbote. It's copyrighted by the contributors recorded
- * in the version control history of the file, available from its original
- * location: https://neueland.iserlohn-fortress.net/gitea/aqua/smolbote
- *
- * SPDX-License-Identifier: GPL-3.0
- */
-
-#include "hostlist.h"
-#include <QIODevice>
-#include <QTextStream>
-#include <QDebug>
-
-HostList::HostList(QIODevice *device)
-{
-    Q_ASSERT(device->isOpen());
-
-    QTextStream list(device);
-    while (!list.atEnd()) {
-        parseLine(list.readLine());
-    }
-
-    qDebug() << m_metadata;
-}
-
-QString HostList::metadata(const QString& key) const
-{
-    return m_metadata.value(key);
-}
-
-int HostList::ruleCount() const
-{
-    return rules.size();
-}
-
-std::pair<UrlFilter::MatchResult, QString> HostList::match(const QUrl& firstParty, const QUrl& requestUrl, QWebEngineUrlRequestInfo::ResourceType type) const
-{
-    Q_UNUSED(firstParty);
-    Q_UNUSED(type);
-
-    const QString domain = requestUrl.host();
-    const uint domainHash = qHash(domain);
-
-    for(const Rule &r : rules) {
-        if(r.domainHash == domainHash)
-            return std::make_pair(r.action, r.redirect);
-    }
-
-    return std::make_pair(UrlFilter::NotMatched, QString());
-}
-
-void HostList::parseLine(const QString& line)
-{
-    // check comment
-    if(line.startsWith(QLatin1String("#")))
-        return;
-
-    QString parsedLine = line.trimmed();
-
-    // malformed rule
-    if(!parsedLine.contains(QLatin1String(" ")))
-        return;
-
-    const QStringList parts = parsedLine.split(QLatin1String(" "));
-    const QString &redirect = parts.at(0);
-    const auto action = (redirect == QLatin1String("0.0.0.0")) ? UrlFilter::Block : UrlFilter::Redirect;
-
-    for(int i = 1; i < parts.size(); i++) {
-        const QString &domain = parts.at(i);
-        Rule r;
-        r.action = action;
-        r.domainHash = qHash(domain);
-        if(action == UrlFilter::Redirect)
-            r.redirect = redirect;
-
-        rules.emplace_back(std::move(r));
-    }
-}
-
diff --git a/lib/urlfilter/hostlist/hostlist.h b/lib/urlfilter/hostlist/hostlist.h
deleted file mode 100644
index d4a8d87..0000000
--- a/lib/urlfilter/hostlist/hostlist.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * This file is part of smolbote. It's copyrighted by the contributors recorded
- * in the version control history of the file, available from its original
- * location: https://neueland.iserlohn-fortress.net/gitea/aqua/smolbote
- *
- * SPDX-License-Identifier: GPL-3.0
- */
-
-#ifndef SMOLBOTE_URLFILTER_HOSTLIST
-#define SMOLBOTE_URLFILTER_HOSTLIST
-
-#include "urlfilter.h"
-#include <QHash>
-#include <vector>
-#include <QWebEngineUrlRequestInfo>
-
-class QIODevice;
-class HostList : public UrlFilter
-{
-public:
-
-    HostList(QIODevice *device);
-    ~HostList() = default;
-
-    QString metadata(const QString &key) const override;
-    int ruleCount() const;
-    std::pair<MatchResult, QString> match(const QUrl &firstParty, const QUrl &requestUrl, QWebEngineUrlRequestInfo::ResourceType type) const override;
-
-protected:
-    void parseLine(const QString &line);
-
-private:
-    QHash<QString, QString> m_metadata;
-
-    struct Rule {
-        UrlFilter::MatchResult action = UrlFilter::NotMatched;
-        uint domainHash;
-        QString redirect;
-    };
-
-    std::vector<Rule> rules;
-};
-
-#endif // SMOLBOTE_URLFILTER_HOSTLIST
-- 
cgit v1.2.1