Reworking URL filter

1 files changed, 8 insertions, 9 deletions

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<BlockerRule*> m_urlWhitelist; // exception rules
-    QVector<BlockerRule*> m_urlBlacklist; // block rules
+    QVector<BlockerRule*> m_rules;
 
 };