Replace member variables by usage of Request

Emdek · Emdek · commit 6737e5d60726 · 2019-11-06T22:13:06.000+01:00
diff --git a/src/core/AdblockContentFiltersProfile.cpp b/src/core/AdblockContentFiltersProfile.cpp
@@ -344,7 +344,7 @@ void AdblockContentFiltersProfile::deleteNode(Node *node) const
 	delete node;
 }
 
-ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstring(const Node *node, const QString &subString, QString currentRule, NetworkManager::ResourceType resourceType)
+ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstring(const Node *node, const QString &subString, QString currentRule, const Request &request) const
 {
 	ContentFiltersManager::CheckResult result;
 	ContentFiltersManager::CheckResult currentResult;
@@ -354,7 +354,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstri
 		const QChar treeChar(subString.at(i));
 		bool childrenExists(false);
 
-		currentResult = evaluateRulesInNode(node, currentRule, resourceType);
+		currentResult = evaluateRulesInNode(node, currentRule, request);
 
 		if (currentResult.isBlocked)
 		{
@@ -375,7 +375,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstri
 
 				for (int k = 0; k < wildcardSubString.length(); ++k)
 				{
-					currentResult = checkUrlSubstring(nextNode, wildcardSubString.right(wildcardSubString.length() - k), (currentRule + wildcardSubString.left(k)), resourceType);
+					currentResult = checkUrlSubstring(nextNode, wildcardSubString.right(wildcardSubString.length() - k), (currentRule + wildcardSubString.left(k)), request);
 
 					if (currentResult.isBlocked)
 					{
@@ -390,7 +390,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstri
 
 			if (nextNode->value == QLatin1Char('^') && !treeChar.isDigit() && !treeChar.isLetter() && !m_separators.contains(treeChar))
 			{
-				currentResult = checkUrlSubstring(nextNode, subString.mid(i), currentRule, resourceType);
+				currentResult = checkUrlSubstring(nextNode, subString.mid(i), currentRule, request);
 
 				if (currentResult.isBlocked)
 				{
@@ -420,7 +420,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstri
 		currentRule += treeChar;
 	}
 
-	currentResult = evaluateRulesInNode(node, currentRule, resourceType);
+	currentResult = evaluateRulesInNode(node, currentRule, request);
 
 	if (currentResult.isBlocked)
 	{
@@ -435,7 +435,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstri
 	{
 		if (node->children.at(i)->value == QLatin1Char('^'))
 		{
-			currentResult = evaluateRulesInNode(node, currentRule, resourceType);
+			currentResult = evaluateRulesInNode(node, currentRule, request);
 
 			if (currentResult.isBlocked)
 			{
@@ -451,41 +451,41 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstri
 	return result;
 }
 
-ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkRuleMatch(const ContentBlockingRule *rule, const QString &currentRule, NetworkManager::ResourceType resourceType) const
+ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkRuleMatch(const ContentBlockingRule *rule, const QString &currentRule, const Request &request) const
 {
 	switch (rule->ruleMatch)
 	{
 		case StartMatch:
-			if (!m_requestUrl.startsWith(currentRule))
+			if (!request.requestUrl.startsWith(currentRule))
 			{
 				return {};
 			}
 
 			break;
 		case EndMatch:
-			if (!m_requestUrl.endsWith(currentRule))
+			if (!request.requestUrl.endsWith(currentRule))
 			{
 				return {};
 			}
 
 			break;
 		case ExactMatch:
-			if (m_requestUrl != currentRule)
+			if (request.requestUrl != currentRule)
 			{
 				return {};
 			}
 
 			break;
 		default:
-			if (!m_requestUrl.contains(currentRule))
+			if (!request.requestUrl.contains(currentRule))
 			{
 				return {};
 			}
 
 			break;
 	}
 
-	const QStringList requestSubdomainList(ContentFiltersManager::createSubdomainList(m_requestHost));
+	const QStringList requestSubdomainList(ContentFiltersManager::createSubdomainList(request.requestHost));
 
 	if (rule->needsDomainCheck && !requestSubdomainList.contains(currentRule.left(currentRule.indexOf(m_domainExpression))))
 	{
@@ -498,19 +498,19 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkRuleMatch(
 
 	if (hasBlockedDomains)
 	{
-		isBlocked = resolveDomainExceptions(m_baseUrlHost, rule->blockedDomains);
+		isBlocked = resolveDomainExceptions(request.baseHost, rule->blockedDomains);
 
 		if (!isBlocked)
 		{
 			return {};
 		}
 	}
 
-	isBlocked = (hasAllowedDomains ? !resolveDomainExceptions(m_baseUrlHost, rule->allowedDomains) : isBlocked);
+	isBlocked = (hasAllowedDomains ? !resolveDomainExceptions(request.baseHost, rule->allowedDomains) : isBlocked);
 
 	if (rule->ruleOptions.testFlag(ThirdPartyExceptionOption) || rule->ruleOptions.testFlag(ThirdPartyOption))
 	{
-		if (m_baseUrlHost.isEmpty() || requestSubdomainList.contains(m_baseUrlHost))
+		if (request.baseHost.isEmpty() || requestSubdomainList.contains(request.baseHost))
 		{
 			isBlocked = rule->ruleOptions.testFlag(ThirdPartyExceptionOption);
 		}
@@ -530,7 +530,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkRuleMatch(
 
 			if (rule->ruleOptions.testFlag(iterator.value()) || (supportsException && rule->ruleOptions.testFlag(static_cast<RuleOption>(iterator.value() * 2))))
 			{
-				if (resourceType == iterator.key())
+				if (request.resourceType == iterator.key())
 				{
 					isBlocked = (isBlocked ? rule->ruleOptions.testFlag(iterator.value()) : isBlocked);
 				}
@@ -545,7 +545,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkRuleMatch(
 			}
 		}
 	}
-	else if (resourceType == NetworkManager::PopupType)
+	else if (request.resourceType == NetworkManager::PopupType)
 	{
 		isBlocked = false;
 	}
@@ -736,15 +736,15 @@ QUrl AdblockContentFiltersProfile::getUpdateUrl() const
 	return m_updateUrl;
 }
 
-ContentFiltersManager::CheckResult AdblockContentFiltersProfile::evaluateRulesInNode(const Node *node, const QString &currentRule, NetworkManager::ResourceType resourceType) const
+ContentFiltersManager::CheckResult AdblockContentFiltersProfile::evaluateRulesInNode(const Node *node, const QString &currentRule, const Request &request) const
 {
 	ContentFiltersManager::CheckResult result;
 
 	for (int i = 0; i < node->rules.count(); ++i)
 	{
 		if (node->rules.at(i))
 		{
-			ContentFiltersManager::CheckResult currentResult(checkRuleMatch(node->rules.at(i), currentRule, resourceType));
+			ContentFiltersManager::CheckResult currentResult(checkRuleMatch(node->rules.at(i), currentRule, request));
 
 			if (currentResult.isBlocked)
 			{
@@ -769,18 +769,11 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrl(const
 		return result;
 	}
 
-	m_baseUrlHost = baseUrl.host();
-	m_requestUrl = requestUrl.url();
-	m_requestHost = requestUrl.host();
+	const Request request(baseUrl, requestUrl, resourceType);
 
-	if (m_requestUrl.startsWith(QLatin1String("//")))
+	for (int i = 0; i < request.requestUrl.length(); ++i)
 	{
-		m_requestUrl = m_requestUrl.mid(2);
-	}
-
-	for (int i = 0; i < m_requestUrl.length(); ++i)
-	{
-		const ContentFiltersManager::CheckResult currentResult(checkUrlSubstring(m_root, m_requestUrl.right(m_requestUrl.length() - i), {}, resourceType));
+		const ContentFiltersManager::CheckResult currentResult(checkUrlSubstring(m_root, request.requestUrl.right(request.requestUrl.length() - i), {}, request));
 
 		if (currentResult.isBlocked)
 		{
diff --git a/src/core/AdblockContentFiltersProfile.h b/src/core/AdblockContentFiltersProfile.h
@@ -122,8 +122,9 @@ class AdblockContentFiltersProfile final : public ContentFiltersProfile
 		QString baseHost;
 		QString requestHost;
 		QString requestUrl;
+		NetworkManager::ResourceType resourceType = NetworkManager::OtherType;
 
-		explicit Request(const QUrl &baseUrlValue, const QUrl &requestUrlValue) : baseHost(baseUrlValue.host()), requestUrl(requestUrlValue.toString()), requestHost(requestUrlValue.host())
+		explicit Request(const QUrl &baseUrlValue, const QUrl &requestUrlValue, NetworkManager::ResourceType resourceTypeValue) : baseHost(baseUrlValue.host()), requestUrl(requestUrlValue.toString()), requestHost(requestUrlValue.host()), resourceType(resourceTypeValue)
 		{
 			if (requestUrl.startsWith(QLatin1String("//")))
 			{
@@ -138,9 +139,9 @@ class AdblockContentFiltersProfile final : public ContentFiltersProfile
 	void parseStyleSheetRule(const QStringList &line, QMultiHash<QString, QString> &list) const;
 	void addRule(ContentBlockingRule *rule, const QString &ruleString) const;
 	void deleteNode(Node *node) const;
-	ContentFiltersManager::CheckResult checkUrlSubstring(const Node *node, const QString &subString, QString currentRule, NetworkManager::ResourceType resourceType);
-	ContentFiltersManager::CheckResult checkRuleMatch(const ContentBlockingRule *rule, const QString &currentRule, NetworkManager::ResourceType resourceType) const;
-	ContentFiltersManager::CheckResult evaluateRulesInNode(const Node *node, const QString &currentRule, NetworkManager::ResourceType resourceType) const;
+	ContentFiltersManager::CheckResult checkUrlSubstring(const Node *node, const QString &subString, QString currentRule, const Request &request) const;
+	ContentFiltersManager::CheckResult checkRuleMatch(const ContentBlockingRule *rule, const QString &currentRule, const Request &request) const;
+	ContentFiltersManager::CheckResult evaluateRulesInNode(const Node *node, const QString &currentRule, const Request &request) const;
 	bool loadRules();
 	bool resolveDomainExceptions(const QString &url, const QStringList &ruleList) const;
 
@@ -151,9 +152,6 @@ protected slots:
 private:
 	Node *m_root;
 	DataFetchJob *m_dataFetchJob;
-	QString m_requestUrl;
-	QString m_requestHost;
-	QString m_baseUrlHost;
 	QString m_name;
 	QString m_title;
 	QUrl m_updateUrl;

Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ void AdblockContentFiltersProfile::deleteNode(Node *node) const`
`344`	`344`	`delete node;`
`345`	`345`	`}`
`346`	`346`
`347`		`-ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstring(const Node *node, const QString &subString, QString currentRule, NetworkManager::ResourceType resourceType)`
	`347`	`+ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstring(const Node *node, const QString &subString, QString currentRule, const Request &request) const`
`348`	`348`	`{`
`349`	`349`	`ContentFiltersManager::CheckResult result;`
`350`	`350`	`ContentFiltersManager::CheckResult currentResult;`
`@@ -354,7 +354,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstri`
`354`	`354`	`const QChar treeChar(subString.at(i));`
`355`	`355`	`bool childrenExists(false);`
`356`	`356`
`357`		`- currentResult = evaluateRulesInNode(node, currentRule, resourceType);`
	`357`	`+ currentResult = evaluateRulesInNode(node, currentRule, request);`
`358`	`358`
`359`	`359`	`if (currentResult.isBlocked)`
`360`	`360`	`{`
`@@ -375,7 +375,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstri`
`375`	`375`
`376`	`376`	`for (int k = 0; k < wildcardSubString.length(); ++k)`
`377`	`377`	`{`
`378`		`- currentResult = checkUrlSubstring(nextNode, wildcardSubString.right(wildcardSubString.length() - k), (currentRule + wildcardSubString.left(k)), resourceType);`
	`378`	`+ currentResult = checkUrlSubstring(nextNode, wildcardSubString.right(wildcardSubString.length() - k), (currentRule + wildcardSubString.left(k)), request);`
`379`	`379`
`380`	`380`	`if (currentResult.isBlocked)`
`381`	`381`	`{`
`@@ -390,7 +390,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstri`
`390`	`390`
`391`	`391`	`if (nextNode->value == QLatin1Char('^') && !treeChar.isDigit() && !treeChar.isLetter() && !m_separators.contains(treeChar))`
`392`	`392`	`{`
`393`		`- currentResult = checkUrlSubstring(nextNode, subString.mid(i), currentRule, resourceType);`
	`393`	`+ currentResult = checkUrlSubstring(nextNode, subString.mid(i), currentRule, request);`
`394`	`394`
`395`	`395`	`if (currentResult.isBlocked)`
`396`	`396`	`{`
`@@ -420,7 +420,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstri`
`420`	`420`	`currentRule += treeChar;`
`421`	`421`	`}`
`422`	`422`
`423`		`- currentResult = evaluateRulesInNode(node, currentRule, resourceType);`
	`423`	`+ currentResult = evaluateRulesInNode(node, currentRule, request);`
`424`	`424`
`425`	`425`	`if (currentResult.isBlocked)`
`426`	`426`	`{`
`@@ -435,7 +435,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstri`
`435`	`435`	`{`
`436`	`436`	`if (node->children.at(i)->value == QLatin1Char('^'))`
`437`	`437`	`{`
`438`		`- currentResult = evaluateRulesInNode(node, currentRule, resourceType);`
	`438`	`+ currentResult = evaluateRulesInNode(node, currentRule, request);`
`439`	`439`
`440`	`440`	`if (currentResult.isBlocked)`
`441`	`441`	`{`
`@@ -451,41 +451,41 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrlSubstri`
`451`	`451`	`return result;`
`452`	`452`	`}`
`453`	`453`
`454`		`-ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkRuleMatch(const ContentBlockingRule *rule, const QString &currentRule, NetworkManager::ResourceType resourceType) const`
	`454`	`+ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkRuleMatch(const ContentBlockingRule *rule, const QString &currentRule, const Request &request) const`
`455`	`455`	`{`
`456`	`456`	`switch (rule->ruleMatch)`
`457`	`457`	`{`
`458`	`458`	`case StartMatch:`
`459`		`- if (!m_requestUrl.startsWith(currentRule))`
	`459`	`+ if (!request.requestUrl.startsWith(currentRule))`
`460`	`460`	`{`
`461`	`461`	`return {};`
`462`	`462`	`}`
`463`	`463`
`464`	`464`	`break;`
`465`	`465`	`case EndMatch:`
`466`		`- if (!m_requestUrl.endsWith(currentRule))`
	`466`	`+ if (!request.requestUrl.endsWith(currentRule))`
`467`	`467`	`{`
`468`	`468`	`return {};`
`469`	`469`	`}`
`470`	`470`
`471`	`471`	`break;`
`472`	`472`	`case ExactMatch:`
`473`		`- if (m_requestUrl != currentRule)`
	`473`	`+ if (request.requestUrl != currentRule)`
`474`	`474`	`{`
`475`	`475`	`return {};`
`476`	`476`	`}`
`477`	`477`
`478`	`478`	`break;`
`479`	`479`	`default:`
`480`		`- if (!m_requestUrl.contains(currentRule))`
	`480`	`+ if (!request.requestUrl.contains(currentRule))`
`481`	`481`	`{`
`482`	`482`	`return {};`
`483`	`483`	`}`
`484`	`484`
`485`	`485`	`break;`
`486`	`486`	`}`
`487`	`487`
`488`		`- const QStringList requestSubdomainList(ContentFiltersManager::createSubdomainList(m_requestHost));`
	`488`	`+ const QStringList requestSubdomainList(ContentFiltersManager::createSubdomainList(request.requestHost));`
`489`	`489`
`490`	`490`	`if (rule->needsDomainCheck && !requestSubdomainList.contains(currentRule.left(currentRule.indexOf(m_domainExpression))))`
`491`	`491`	`{`
`@@ -498,19 +498,19 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkRuleMatch(`
`498`	`498`
`499`	`499`	`if (hasBlockedDomains)`
`500`	`500`	`{`
`501`		`- isBlocked = resolveDomainExceptions(m_baseUrlHost, rule->blockedDomains);`
	`501`	`+ isBlocked = resolveDomainExceptions(request.baseHost, rule->blockedDomains);`
`502`	`502`
`503`	`503`	`if (!isBlocked)`
`504`	`504`	`{`
`505`	`505`	`return {};`
`506`	`506`	`}`
`507`	`507`	`}`
`508`	`508`
`509`		`- isBlocked = (hasAllowedDomains ? !resolveDomainExceptions(m_baseUrlHost, rule->allowedDomains) : isBlocked);`
	`509`	`+ isBlocked = (hasAllowedDomains ? !resolveDomainExceptions(request.baseHost, rule->allowedDomains) : isBlocked);`
`510`	`510`
`511`	`511`	`if (rule->ruleOptions.testFlag(ThirdPartyExceptionOption) \|\| rule->ruleOptions.testFlag(ThirdPartyOption))`
`512`	`512`	`{`
`513`		`- if (m_baseUrlHost.isEmpty() \|\| requestSubdomainList.contains(m_baseUrlHost))`
	`513`	`+ if (request.baseHost.isEmpty() \|\| requestSubdomainList.contains(request.baseHost))`
`514`	`514`	`{`
`515`	`515`	`isBlocked = rule->ruleOptions.testFlag(ThirdPartyExceptionOption);`
`516`	`516`	`}`
`@@ -530,7 +530,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkRuleMatch(`
`530`	`530`
`531`	`531`	`if (rule->ruleOptions.testFlag(iterator.value()) \|\| (supportsException && rule->ruleOptions.testFlag(static_cast<RuleOption>(iterator.value() * 2))))`
`532`	`532`	`{`
`533`		`- if (resourceType == iterator.key())`
	`533`	`+ if (request.resourceType == iterator.key())`
`534`	`534`	`{`
`535`	`535`	`isBlocked = (isBlocked ? rule->ruleOptions.testFlag(iterator.value()) : isBlocked);`
`536`	`536`	`}`
`@@ -545,7 +545,7 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkRuleMatch(`
`545`	`545`	`}`
`546`	`546`	`}`
`547`	`547`	`}`
`548`		`- else if (resourceType == NetworkManager::PopupType)`
	`548`	`+ else if (request.resourceType == NetworkManager::PopupType)`
`549`	`549`	`{`
`550`	`550`	`isBlocked = false;`
`551`	`551`	`}`
`@@ -736,15 +736,15 @@ QUrl AdblockContentFiltersProfile::getUpdateUrl() const`
`736`	`736`	`return m_updateUrl;`
`737`	`737`	`}`
`738`	`738`
`739`		`-ContentFiltersManager::CheckResult AdblockContentFiltersProfile::evaluateRulesInNode(const Node *node, const QString &currentRule, NetworkManager::ResourceType resourceType) const`
	`739`	`+ContentFiltersManager::CheckResult AdblockContentFiltersProfile::evaluateRulesInNode(const Node *node, const QString &currentRule, const Request &request) const`
`740`	`740`	`{`
`741`	`741`	`ContentFiltersManager::CheckResult result;`
`742`	`742`
`743`	`743`	`for (int i = 0; i < node->rules.count(); ++i)`
`744`	`744`	`{`
`745`	`745`	`if (node->rules.at(i))`
`746`	`746`	`{`
`747`		`- ContentFiltersManager::CheckResult currentResult(checkRuleMatch(node->rules.at(i), currentRule, resourceType));`
	`747`	`+ ContentFiltersManager::CheckResult currentResult(checkRuleMatch(node->rules.at(i), currentRule, request));`
`748`	`748`
`749`	`749`	`if (currentResult.isBlocked)`
`750`	`750`	`{`
`@@ -769,18 +769,11 @@ ContentFiltersManager::CheckResult AdblockContentFiltersProfile::checkUrl(const`
`769`	`769`	`return result;`
`770`	`770`	`}`
`771`	`771`
`772`		`- m_baseUrlHost = baseUrl.host();`
`773`		`- m_requestUrl = requestUrl.url();`
`774`		`- m_requestHost = requestUrl.host();`
	`772`	`+ const Request request(baseUrl, requestUrl, resourceType);`
`775`	`773`
`776`		`- if (m_requestUrl.startsWith(QLatin1String("//")))`
	`774`	`+ for (int i = 0; i < request.requestUrl.length(); ++i)`
`777`	`775`	`{`
`778`		`- m_requestUrl = m_requestUrl.mid(2);`
`779`		`- }`
`780`		`-`
`781`		`- for (int i = 0; i < m_requestUrl.length(); ++i)`
`782`		`- {`
`783`		`- const ContentFiltersManager::CheckResult currentResult(checkUrlSubstring(m_root, m_requestUrl.right(m_requestUrl.length() - i), {}, resourceType));`
	`776`	`+ const ContentFiltersManager::CheckResult currentResult(checkUrlSubstring(m_root, request.requestUrl.right(request.requestUrl.length() - i), {}, request));`
`784`	`777`
`785`	`778`	`if (currentResult.isBlocked)`
`786`	`779`	`{`