mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-12-16 13:11:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Allow episode zero (special) and leading zeroes in RSS episode filter.

Browse source 
--HG--
branch : magao-dev
This commit is contained in:
Tim Delaney 2016-11-06 22:51:33 +11:00
parent 2244b7cb66
commit 64f9cbbf54
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/base/rss/rssdownloadrule.cpp
View file

@ -31,6 +31,8 @@
#include <QRegExp> #include <QRegExp>
#include <QDebug> #include <QDebug>
#include <QDir> #include <QDir>
#include <QStringRef>
#include <QVector>
#include "base/preferences.h" #include "base/preferences.h"
#include "base/utils/fs.h" #include "base/utils/fs.h"
@ -97,10 +99,16 @@ bool DownloadRule::matches(const QString &articleTitle) const
QString expStr; QString expStr;
expStr += "s0?" + s + "[ -_\\.]?" + "e0?"; expStr += "s0?" + s + "[ -_\\.]?" + "e0?";
foreach (const QString &ep, eps) { foreach (const QString &epStr, eps) {
if (ep.isEmpty()) if (epStr.isEmpty())
continue; continue;
QStringRef ep( &epStr);
// We need to trim leading zeroes, but if it's all zeros then we want episode zero.
while (ep.size() > 1 && ep.startsWith("0"))
ep = ep.right(ep.size() - 1);
if (ep.indexOf('-') != -1) { // Range detected if (ep.indexOf('-') != -1) { // Range detected
QString partialPattern = "s0?" + s + "[ -_\\.]?" + "e(0?\\d{1,4})"; QString partialPattern = "s0?" + s + "[ -_\\.]?" + "e(0?\\d{1,4})";
QRegExp reg(partialPattern, Qt::CaseInsensitive); QRegExp reg(partialPattern, Qt::CaseInsensitive);
@ -120,7 +128,7 @@ bool DownloadRule::matches(const QString &articleTitle) const
} }
} }
else { // Normal range else { // Normal range
QStringList range = ep.split('-'); QVector<QStringRef> range = ep.split('-');
Q_ASSERT(range.size() == 2); Q_ASSERT(range.size() == 2);
if (range.first().toInt() > range.last().toInt()) if (range.first().toInt() > range.last().toInt())
continue; // Ignore this subrule completely continue; // Ignore this subrule completely

2
src/gui/rss/automatedrssdownloader.cpp
View file

@ -78,7 +78,7 @@ AutomatedRssDownloader::AutomatedRssDownloader(const QWeakPointer<Rss::Manager>
QString tip = "<p>" + tr("Matches articles based on episode filter.") + "</p><p><b>" + tr("Example: ") QString tip = "<p>" + tr("Matches articles based on episode filter.") + "</p><p><b>" + tr("Example: ")
+ "1x2;8-15;5;30-;</b>" + tr(" will match 2, 5, 8 through 15, 30 and onward episodes of season one", "example X will match") + "</p>"; + "1x2;8-15;5;30-;</b>" + tr(" will match 2, 5, 8 through 15, 30 and onward episodes of season one", "example X will match") + "</p>";
tip += "<p>" + tr("Episode filter rules: ") + "</p><ul><li>" + tr("Season number is a mandatory non-zero value") + "</li>" tip += "<p>" + tr("Episode filter rules: ") + "</p><ul><li>" + tr("Season number is a mandatory non-zero value") + "</li>"
+ "<li>" + tr("Episode number is a mandatory non-zero value") + "</li>" + "<li>" + tr("Episode number is a mandatory positive value") + "</li>"
+ "<li>" + tr("Filter must end with semicolon") + "</li>" + "<li>" + tr("Filter must end with semicolon") + "</li>"
+ "<li>" + tr("Three range types for episodes are supported: ") + "</li>" + "<li><ul>" + "<li>" + tr("Three range types for episodes are supported: ") + "</li>" + "<li><ul>"
"<li>" + tr("Single number: <b>1x25;</b> matches episode 25 of season one") + "</li>" "<li>" + tr("Single number: <b>1x25;</b> matches episode 25 of season one") + "</li>"