summaryrefslogtreecommitdiff
path: root/src/adblock/adblockmanager.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-03-19 11:00:18 +0100
committerAndrea Diamantini <adjam7@gmail.com>2010-03-19 11:00:18 +0100
commitf51c660a207364b9b5ff400a29e8ff1dba721e61 (patch)
tree09331e790bc3e79d4826d7463617d7d65e158ef5 /src/adblock/adblockmanager.cpp
parentSVN_SILENT made messages (.desktop file) (diff)
downloadrekonq-f51c660a207364b9b5ff400a29e8ff1dba721e61.tar.xz
abp (Ad Block Plus) fake protocol support
This will let rekonq to automatically add abp subscriptions from the adblockplus.org site (or wherever someone provides abp urls) Anyway, consider that the raccomended way to manage adblock (by me and by abp developers) is just adding the EasyList subscription. rekonq just does it by default!!
Diffstat (limited to 'src/adblock/adblockmanager.cpp')
-rw-r--r--src/adblock/adblockmanager.cpp42
1 files changed, 29 insertions, 13 deletions
diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
index d2c2b013..66e11277 100644
--- a/src/adblock/adblockmanager.cpp
+++ b/src/adblock/adblockmanager.cpp
@@ -60,7 +60,7 @@ AdBlockManager::~AdBlockManager()
}
-void AdBlockManager::loadSettings()
+void AdBlockManager::loadSettings(bool checkUpdateDate)
{
_index = 0;
_buffer.clear();
@@ -92,7 +92,7 @@ void AdBlockManager::loadSettings()
QDateTime lastUpdate = ReKonfig::lastUpdate(); // the day of the implementation.. :)
int days = ReKonfig::updateInterval();
- if( today > lastUpdate.addDays( days ) )
+ if( !checkUpdateDate || today > lastUpdate.addDays( days ) )
{
ReKonfig::setLastUpdate( today );
@@ -101,10 +101,10 @@ void AdBlockManager::loadSettings()
}
// else
- QStringList names = ReKonfig::subscriptionNames();
- foreach(const QString &name, names)
+ QStringList titles = ReKonfig::subscriptionTitles();
+ foreach(const QString &title, titles)
{
- rules = rulesGroup.readEntry( name + "-rules" , QStringList() );
+ rules = rulesGroup.readEntry( title + "-rules" , QStringList() );
loadRules(rules);
}
}
@@ -208,13 +208,11 @@ void AdBlockManager::applyHidingRules(WebPage *page)
void AdBlockManager::updateNextSubscription()
{
- kDebug() << "OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO";
-
- QStringList subUrlStrings = ReKonfig::subscriptionUrls();
+ QStringList locations = ReKonfig::subscriptionLocations();
- if( _index < subUrlStrings.size() )
+ if( _index < locations.size() )
{
- QString urlString = subUrlStrings.at(_index);
+ QString urlString = locations.at(_index);
kDebug() << "DOWNLOADING FROM " << urlString;
KUrl subUrl = KUrl( urlString );
@@ -276,10 +274,28 @@ void AdBlockManager::saveRules(const QStringList &rules)
cleanedRules << r;
}
- QStringList names = ReKonfig::subscriptionNames();
- QString name = names.at(_index) + "-rules";
+ QStringList titles = ReKonfig::subscriptionTitles();
+ QString title = titles.at(_index) + "-rules";
KSharedConfig::Ptr config = KGlobal::config();
KConfigGroup cg( config , "rules" );
- cg.writeEntry( name, cleanedRules );
+ cg.writeEntry( title, cleanedRules );
+}
+
+
+void AdBlockManager::addSubscription(const QString &title, const QString &location)
+{
+ QStringList titles = ReKonfig::subscriptionTitles();
+ if( titles.contains(title) )
+ return;
+
+ QStringList locations = ReKonfig::subscriptionLocations();
+ if( locations.contains(location) )
+ return;
+
+ titles << title;
+ locations << location;
+
+ ReKonfig::setSubscriptionTitles(titles);
+ ReKonfig::setSubscriptionLocations(locations);
}