d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-03-10 12:21:12 +00:00
Code Issues Projects Releases Wiki Activity

Change named of getter function.

Browse Source
This commit is contained in:
sledgehammer999 2017-03-08 00:16:25 +02:00
parent aa51907387
commit 729fbb2e50
No known key found for this signature in database
GPG Key ID: 6E4A2D025B7CC9A2
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/base/rss/rssdownloadrule.cpp
View File

@ -59,7 +59,7 @@ DownloadRule::~DownloadRule()
delete m_cachedRegexes; delete m_cachedRegexes;
} }
QRegularExpression DownloadRule::getRegex(const QString &expression, bool isRegex) const QRegularExpression DownloadRule::cachedRegex(const QString &expression, bool isRegex) const
{ {
// Use a cache of regexes so we don't have to continually recompile - big performance increase. // Use a cache of regexes so we don't have to continually recompile - big performance increase.
// The cache is cleared whenever the regex/wildcard, must or must not contain fields or // The cache is cleared whenever the regex/wildcard, must or must not contain fields or
@ -82,14 +82,14 @@ bool DownloadRule::matches(const QString &articleTitle, const QString &expressio
return true; return true;
} }
else if (m_useRegex) { else if (m_useRegex) {
QRegularExpression reg(getRegex(expression)); QRegularExpression reg(cachedRegex(expression));
return reg.match(articleTitle).hasMatch(); return reg.match(articleTitle).hasMatch();
} }
else { else {
// Only match if every wildcard token (separated by spaces) is present in the article name. // Only match if every wildcard token (separated by spaces) is present in the article name.
// Order of wildcard tokens is unimportant (if order is important, they should have used *). // Order of wildcard tokens is unimportant (if order is important, they should have used *).
foreach (const QString &wildcard, expression.split(whitespace, QString::SplitBehavior::SkipEmptyParts)) { foreach (const QString &wildcard, expression.split(whitespace, QString::SplitBehavior::SkipEmptyParts)) {
QRegularExpression reg(getRegex(wildcard, false)); QRegularExpression reg(cachedRegex(wildcard, false));
if (!reg.match(articleTitle).hasMatch()) if (!reg.match(articleTitle).hasMatch())
return false; return false;
@ -147,7 +147,7 @@ bool DownloadRule::matches(const QString &articleTitle) const
if (!m_episodeFilter.isEmpty()) { if (!m_episodeFilter.isEmpty()) {
qDebug() << "Checking episode filter:" << m_episodeFilter; qDebug() << "Checking episode filter:" << m_episodeFilter;
QRegularExpression f(getRegex("(^\\d{1,4})x(.*;$)")); QRegularExpression f(cachedRegex("(^\\d{1,4})x(.*;$)"));
QRegularExpressionMatch matcher = f.match(m_episodeFilter); QRegularExpressionMatch matcher = f.match(m_episodeFilter);
bool matched = matcher.hasMatch(); bool matched = matcher.hasMatch();
@ -169,7 +169,7 @@ bool DownloadRule::matches(const QString &articleTitle) const
if (ep.indexOf('-') != -1) { // Range detected if (ep.indexOf('-') != -1) { // Range detected
QString partialPattern1 = "\\bs0?(\\d{1,4})[ -_\\.]?e(0?\\d{1,4})(?:\\D|\\b)"; QString partialPattern1 = "\\bs0?(\\d{1,4})[ -_\\.]?e(0?\\d{1,4})(?:\\D|\\b)";
QString partialPattern2 = "\\b(\\d{1,4})x(0?\\d{1,4})(?:\\D|\\b)"; QString partialPattern2 = "\\b(\\d{1,4})x(0?\\d{1,4})(?:\\D|\\b)";
QRegularExpression reg(getRegex(partialPattern1)); QRegularExpression reg(cachedRegex(partialPattern1));
if (ep.endsWith('-')) { // Infinite range if (ep.endsWith('-')) { // Infinite range
int epOurs = ep.left(ep.size() - 1).toInt(); int epOurs = ep.left(ep.size() - 1).toInt();
@ -179,7 +179,7 @@ bool DownloadRule::matches(const QString &articleTitle) const
matched = matcher.hasMatch(); matched = matcher.hasMatch();
if (!matched) { if (!matched) {
reg = QRegularExpression(getRegex(partialPattern2)); reg = QRegularExpression(cachedRegex(partialPattern2));
matcher = reg.match(articleTitle); matcher = reg.match(articleTitle);
matched = matcher.hasMatch(); matched = matcher.hasMatch();
} }
@ -208,7 +208,7 @@ bool DownloadRule::matches(const QString &articleTitle) const
matched = matcher.hasMatch(); matched = matcher.hasMatch();
if (!matched) { if (!matched) {
reg = QRegularExpression(getRegex(partialPattern2)); reg = QRegularExpression(cachedRegex(partialPattern2));
matcher = reg.match(articleTitle); matcher = reg.match(articleTitle);
matched = matcher.hasMatch(); matched = matcher.hasMatch();
} }
@ -226,7 +226,7 @@ bool DownloadRule::matches(const QString &articleTitle) const
} }
else { // Single number else { // Single number
QString expStr("\\b(?:s0?" + s + "[ -_\\.]?" + "e0?" + ep + "|" + s + "x" + "0?" + ep + ")(?:\\D|\\b)"); QString expStr("\\b(?:s0?" + s + "[ -_\\.]?" + "e0?" + ep + "|" + s + "x" + "0?" + ep + ")(?:\\D|\\b)");
QRegularExpression reg(getRegex(expStr)); QRegularExpression reg(cachedRegex(expStr));
if (reg.match(articleTitle).hasMatch()) { if (reg.match(articleTitle).hasMatch()) {
qDebug() << "Matched episode:" << ep; qDebug() << "Matched episode:" << ep;
qDebug() << "Matched article:" << articleTitle; qDebug() << "Matched article:" << articleTitle;

2
src/base/rss/rssdownloadrule.h
View File

@ -93,7 +93,7 @@ namespace Rss
private: private:
bool matches(const QString &articleTitle, const QString &expression) const; bool matches(const QString &articleTitle, const QString &expression) const;
QRegularExpression getRegex(const QString &expression, bool isRegex = true) const; QRegularExpression cachedRegex(const QString &expression, bool isRegex = true) const;
QString m_name; QString m_name;
QStringList m_mustContain; QStringList m_mustContain;