FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save work.

Browse Source
This commit is contained in:
Martin Rotter 2017-07-19 21:22:26 +02:00
parent 1de3862c79
commit c2e1100ff6
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/binaries

@ -1 +1 @@
Subproject commit 1bb36a305e8a23de1e4f3609d8fc4dfeb85ba6fe Subproject commit aea11879635d0d6b029a7f6d49d1f31dd95b3c05

20
src/network-web/adblock/adblockrule.cpp
View File

@ -58,8 +58,7 @@
#include <QWebEngineUrlRequestInfo> #include <QWebEngineUrlRequestInfo>
static QString toSecondLevelDomain(const QUrl &url) static QString toSecondLevelDomain(const QUrl &url) {
{
const QString topLevelDomain = url.topLevelDomain(); const QString topLevelDomain = url.topLevelDomain();
const QString urlHost = url.host(); const QString urlHost = url.host();
@ -69,12 +68,12 @@ static QString toSecondLevelDomain(const QUrl &url)
QString domain = urlHost.left(urlHost.size() - topLevelDomain.size()); QString domain = urlHost.left(urlHost.size() - topLevelDomain.size());
if (domain.count(QSL('.')) == 0) { if (domain.count(QL1C('.')) == 0) {
return urlHost; return urlHost;
} }
while (domain.count(QSL('.')) != 0) { while (domain.count(QL1C('.')) != 0) {
domain = domain.mid(domain.indexOf(QSL('.')) + 1); domain = domain.mid(domain.indexOf(QL1C('.')) + 1);
} }
return domain + topLevelDomain; return domain + topLevelDomain;
@ -90,7 +89,7 @@ AdBlockRule::~AdBlockRule() {
delete m_regExp; delete m_regExp;
} }
AdBlockRule* AdBlockRule::copy() const { AdBlockRule *AdBlockRule::copy() const {
AdBlockRule *rule = new AdBlockRule(); AdBlockRule *rule = new AdBlockRule();
rule->m_subscription = m_subscription; rule->m_subscription = m_subscription;
@ -157,7 +156,7 @@ bool AdBlockRule::isException() const {
} }
bool AdBlockRule::isComment() const { bool AdBlockRule::isComment() const {
return m_filter.startsWith(QSL('!')); return m_filter.startsWith(QL1C('!'));
} }
bool AdBlockRule::isEnabled() const { bool AdBlockRule::isEnabled() const {
@ -267,6 +266,7 @@ bool AdBlockRule::matchDomain(const QString &domain) const {
return false; return false;
} }
} }
return true; return true;
} }
else { else {
@ -531,8 +531,9 @@ void AdBlockRule::parseDomains(const QString &domains, const QChar &separator) {
} }
bool AdBlockRule::filterIsOnlyDomain(const QString &filter) const { bool AdBlockRule::filterIsOnlyDomain(const QString &filter) const {
if (!filter.endsWith(QL1C('^')) || !filter.startsWith(QL1S("||"))) if (!filter.endsWith(QL1C('^')) || !filter.startsWith(QL1S("||"))) {
return false; return false;
}
for (int i = 0; i < filter.size(); ++i) { for (int i = 0; i < filter.size(); ++i) {
switch (filter.at(i).toLatin1()) { switch (filter.at(i).toLatin1()) {
@ -543,6 +544,7 @@ bool AdBlockRule::filterIsOnlyDomain(const QString &filter) const {
case '&': case '&':
case '*': case '*':
return false; return false;
default: default:
break; break;
} }
@ -557,8 +559,10 @@ bool AdBlockRule::filterIsOnlyEndsMatch(const QString &filter) const {
case '^': case '^':
case '*': case '*':
return false; return false;
case '|': case '|':
return i == filter.size() - 1; return i == filter.size() - 1;
default: default:
break; break;
} }