From 1a9e09332261d18ee892fc3613f16a0e80d115e0 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Sun, 21 May 2017 20:24:57 +0200 Subject: Reworking URL filter --- src/blocker/blockersubscription.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/blocker/blockersubscription.h') diff --git a/src/blocker/blockersubscription.h b/src/blocker/blockersubscription.h index a0e051a..26ef7e2 100644 --- a/src/blocker/blockersubscription.h +++ b/src/blocker/blockersubscription.h @@ -29,7 +29,7 @@ namespace Ui { class SubscriptionForm; } -class BlockerSubscription : public QWidget +class FilterCollection : public QWidget { Q_OBJECT @@ -40,25 +40,24 @@ public: QString pattern; }; - explicit BlockerSubscription(const QUrl url, QWidget *parent = 0); - ~BlockerSubscription(); + explicit FilterCollection(const QString path, QWidget *parent = 0); + ~FilterCollection(); QString name() const; MatchResult match(QWebEngineUrlRequestInfo &info); private slots: - void update(QFile *cache); - void load(QIODevice *dev); + void load(const QJsonObject &json); private: - void parseComment(const QString &line); + + BlockerRule* createRule(const QJsonObject &obj); Ui::SubscriptionForm *ui; QString m_name; - QUrl m_url; + QString m_path; - QVector m_urlWhitelist; // exception rules - QVector m_urlBlacklist; // block rules + QVector m_rules; }; -- cgit v1.2.1