Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

[AdBlock] Download also whitelist rules from EasyList.

Browse Source
This commit is contained in:
nowrep 2013-02-27 19:51:34 +01:00
parent 7e6d619516
commit 4d82e307ad
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/adblock/adblocksubscription.cpp
View File

@ -172,7 +172,7 @@ void AdBlockSubscription::subscriptionDownloaded()
m_reply = 0; m_reply = 0;
} }
void AdBlockSubscription::saveDownloadedData(QByteArray &data) void AdBlockSubscription::saveDownloadedData(const QByteArray &data)
{ {
QFile file(m_filePath); QFile file(m_filePath);
@ -374,6 +374,11 @@ void AdBlockSubscription::populateCache()
} }
} }
AdBlockSubscription::~AdBlockSubscription()
{
qDeleteAll(m_rules);
}
// AdBlockEasyList // AdBlockEasyList
AdBlockEasyList::AdBlockEasyList(QObject* parent) AdBlockEasyList::AdBlockEasyList(QObject* parent)
@ -388,7 +393,7 @@ bool AdBlockEasyList::canBeRemoved() const
return false; return false;
} }
void AdBlockEasyList::saveDownloadedData(QByteArray &data) void AdBlockEasyList::saveDownloadedData(const QByteArray &data)
{ {
QFile file(filePath()); QFile file(filePath());
@ -399,9 +404,12 @@ void AdBlockEasyList::saveDownloadedData(QByteArray &data)
// Third-party advertisers rules are with start domain (||) placeholder which needs regexps // Third-party advertisers rules are with start domain (||) placeholder which needs regexps
// So we are ignoring it for keeping good performance // So we are ignoring it for keeping good performance
data = data.left(data.indexOf(QLatin1String("!-----------------------------Third-party adverts-----------------------------!"))); // But we will use whitelist rules at the end of list
file.write(data); QByteArray part1 = data.left(data.indexOf(QLatin1String("!-----------------------------Third-party adverts-----------------------------!")));
QByteArray part2 = data.mid(data.indexOf(QLatin1String("!---------------------------------Whitelists----------------------------------!")));
file.write(part1 + part2);
file.close(); file.close();
} }
@ -514,8 +522,3 @@ const AdBlockRule* AdBlockCustomList::replaceRule(AdBlockRule* rule, int offset)
return m_rules[offset]; return m_rules[offset];
} }
AdBlockSubscription::~AdBlockSubscription()
{
qDeleteAll(m_rules);
}

4
src/lib/adblock/adblocksubscription.h
View File

@ -107,7 +107,7 @@ protected slots:
void subscriptionDownloaded(); void subscriptionDownloaded();
protected: protected:
virtual void saveDownloadedData(QByteArray &data); virtual void saveDownloadedData(const QByteArray &data);
void populateCache(); void populateCache();
@ -140,7 +140,7 @@ public:
bool canBeRemoved() const; bool canBeRemoved() const;
protected: protected:
void saveDownloadedData(QByteArray &data); void saveDownloadedData(const QByteArray &data);
}; };
class AdBlockCustomList : public AdBlockSubscription class AdBlockCustomList : public AdBlockSubscription