d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-05 11:24:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2207 from pmzqla/rss-rules

Browse Source 
Fix RSS "OR" condition in "must not contain" rules.
This commit is contained in:
sledgehammer999 2014-11-26 13:37:16 +02:00
commit f61675d98a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rss/automatedrssdownloader.cpp
View File

@ -605,7 +605,7 @@ void AutomatedRssDownloader::updateMustNotLineValidity()
if (ui->checkRegex->isChecked()) if (ui->checkRegex->isChecked())
tokens << text; tokens << text;
else else
tokens << text.split(QRegExp("[\\s|]")); tokens << text.split("|");
foreach (const QString &token, tokens) { foreach (const QString &token, tokens) {
QRegExp reg(token, Qt::CaseInsensitive, ui->checkRegex->isChecked() ? QRegExp::RegExp : QRegExp::Wildcard); QRegExp reg(token, Qt::CaseInsensitive, ui->checkRegex->isChecked() ? QRegExp::RegExp : QRegExp::Wildcard);
if (!reg.isValid()) { if (!reg.isValid()) {

4
src/rss/rssdownloadrule.cpp
View File

@ -133,7 +133,7 @@ void RssDownloadRule::setMustNotContain(const QString &tokens)
if (m_useRegex) if (m_useRegex)
m_mustNotContain = QStringList() << tokens; m_mustNotContain = QStringList() << tokens;
else else
m_mustNotContain = tokens.split(QRegExp("[\\s|]")); m_mustNotContain = tokens.split("|");
} }
RssDownloadRulePtr RssDownloadRule::fromVariantHash(const QVariantHash &rule_hash) RssDownloadRulePtr RssDownloadRule::fromVariantHash(const QVariantHash &rule_hash)
@ -156,7 +156,7 @@ QVariantHash RssDownloadRule::toVariantHash() const
QVariantHash hash; QVariantHash hash;
hash["name"] = m_name; hash["name"] = m_name;
hash["must_contain"] = m_mustContain.join(" "); hash["must_contain"] = m_mustContain.join(" ");
hash["must_not_contain"] = m_mustNotContain.join(" "); hash["must_not_contain"] = m_mustNotContain.join("|");
hash["save_path"] = m_savePath; hash["save_path"] = m_savePath;
hash["affected_feeds"] = m_rssFeeds; hash["affected_feeds"] = m_rssFeeds;
hash["enabled"] = m_enabled; hash["enabled"] = m_enabled;

2
src/rss/rssdownloadrule.h
View File

@ -62,7 +62,7 @@ public:
inline bool isEnabled() const { return m_enabled; } inline bool isEnabled() const { return m_enabled; }
inline void setEnabled(bool enable) { m_enabled = enable; } inline void setEnabled(bool enable) { m_enabled = enable; }
inline QString mustContain() const { return m_mustContain.join(" "); } inline QString mustContain() const { return m_mustContain.join(" "); }
inline QString mustNotContain() const { return m_mustNotContain.join(" "); } inline QString mustNotContain() const { return m_mustNotContain.join("|"); }
inline bool useRegex() const { return m_useRegex; } inline bool useRegex() const { return m_useRegex; }
inline void setUseRegex(bool enabled) { m_useRegex = enabled; } inline void setUseRegex(bool enabled) { m_useRegex = enabled; }
inline QString episodeFilter() const { return m_episodeFilter; } inline QString episodeFilter() const { return m_episodeFilter; }