From ed7430d2352b3f87991f68fbc0acfe4dbae39b56 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Fri, 27 Jan 2017 17:14:49 +0100
Subject: URL blocking whitelist

---
 src/webengine/blockersubscription.cpp | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

(limited to 'src/webengine/blockersubscription.cpp')

diff --git a/src/webengine/blockersubscription.cpp b/src/webengine/blockersubscription.cpp
index 5a0664b..c7f647b 100644
--- a/src/webengine/blockersubscription.cpp
+++ b/src/webengine/blockersubscription.cpp
@@ -24,6 +24,9 @@ int BlockerSubscription::loadFromFile(const QString &file)
         return -1;
     }
 
+    // clear all lists
+    m_urlBlacklist.clear();
+    m_urlWhitelist.clear();
     int rules = 0;
 
     while(!subscription.atEnd()) {
@@ -33,14 +36,23 @@ int BlockerSubscription::loadFromFile(const QString &file)
                 parseComment(line);
             } else {
                 // The line is not a comment
-                BlockerRule *rule = new BlockerRule(line, this);
-                m_urlBlacklist.append(rule);
+
                 rules++;
+                BlockerRule *rule = new BlockerRule(line, this);
+
+                if(rule->isValid()) {
+                    if(rule->isException()) {
+                        m_urlWhitelist.append(rule);
+                    } else {
+                        m_urlBlacklist.append(rule);
+                    }
+                }
+
             }
         }
     }
 
-    qDebug("Loaded %i rules from subscription %s", rules, qUtf8Printable(file));
+    qDebug("Loaded %i/%i rules from subscription %s", m_urlBlacklist.count() + m_urlWhitelist.count(), rules, qUtf8Printable(file));
     return rules;
 }
 
@@ -74,6 +86,16 @@ const QDateTime BlockerSubscription::expires()
     return m_expires;
 }
 
+const QList<BlockerRule*> BlockerSubscription::urlBlacklist()
+{
+    return m_urlBlacklist;
+}
+
+const QList<BlockerRule*> BlockerSubscription::urlWhitelist()
+{
+    return m_urlWhitelist;
+}
+
 void BlockerSubscription::parseComment(const QString &line)
 {
     if(line.startsWith("! Title: ")) {
-- 
cgit v1.2.1