From 32bdb73f707f0d7cdfd7a6b1890d69187e95c8eb Mon Sep 17 00:00:00 2001
From: Tim Delaney <timothy.c.delaney@gmail.com>
Date: Mon, 7 Nov 2016 07:18:06 +1100
Subject: [PATCH] RSS allow infinite range to extend beyond current season.
 Closes #800, #3876, #6170.

--HG--
branch : magao-dev
---
 src/base/rss/rssdownloadrule.cpp       | 15 +++++++++------
 src/gui/rss/automatedrssdownloader.cpp |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/base/rss/rssdownloadrule.cpp b/src/base/rss/rssdownloadrule.cpp
index f0d8d7584..1f5e67fc8 100644
--- a/src/base/rss/rssdownloadrule.cpp
+++ b/src/base/rss/rssdownloadrule.cpp
@@ -96,6 +96,7 @@ bool DownloadRule::matches(const QString &articleTitle) const
 
         QString s = f.cap(1);
         QStringList eps = f.cap(2).split(";");
+        int sOurs = s.toInt();
 
         foreach (const QString &epStr, eps) {
             if (epStr.isEmpty())
@@ -108,8 +109,8 @@ bool DownloadRule::matches(const QString &articleTitle) const
                 ep = ep.right(ep.size() - 1);
 
             if (ep.indexOf('-') != -1) { // Range detected
-                QString partialPattern1 = "\\bs0?" + s + "[ -_\\.]?" + "e(0?\\d{1,4})(?:\\D|\\b)";
-                QString partialPattern2 = "\\b" + s + "x" + "(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)";
                 QRegExp reg(partialPattern1, Qt::CaseInsensitive);
 
                 if (ep.endsWith('-')) { // Infinite range
@@ -124,8 +125,9 @@ bool DownloadRule::matches(const QString &articleTitle) const
                     }
 
                     if (pos != -1) {
-                        int epTheirs = reg.cap(1).toInt();
-                        if (epTheirs >= epOurs) {
+                        int sTheirs = reg.cap(1).toInt();
+                        int epTheirs = reg.cap(2).toInt();
+                        if (((sTheirs == sOurs) && (epTheirs >= epOurs)) || (sTheirs > sOurs)) {
                             qDebug() << "Matched episode:" << ep;
                             qDebug() << "Matched article:" << articleTitle;
                             return true;
@@ -150,8 +152,9 @@ bool DownloadRule::matches(const QString &articleTitle) const
                     }
 
                     if (pos != -1) {
-                        int epTheirs = reg.cap(1).toInt();
-                        if ((epOursFirst <= epTheirs) && (epOursLast >= epTheirs)) {
+                        int sTheirs = reg.cap(1).toInt();
+                        int epTheirs = reg.cap(2).toInt();
+                        if ((sTheirs == sOurs) && ((epOursFirst <= epTheirs) && (epOursLast >= epTheirs))) {
                             qDebug() << "Matched episode:" << ep;
                             qDebug() << "Matched article:" << articleTitle;
                             return true;
diff --git a/src/gui/rss/automatedrssdownloader.cpp b/src/gui/rss/automatedrssdownloader.cpp
index 9931457c7..790953f73 100644
--- a/src/gui/rss/automatedrssdownloader.cpp
+++ b/src/gui/rss/automatedrssdownloader.cpp
@@ -83,7 +83,7 @@ AutomatedRssDownloader::AutomatedRssDownloader(const QWeakPointer<Rss::Manager>
            + "<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("Normal range: <b>1x25-40;</b> matches episodes 25 through 40 of season one") + "</li>"
-           + "<li>" + tr("Infinite range: <b>1x25-;</b> matches episodes 25 and upward of season one") + "</li>" + "</ul></li></ul>";
+           + "<li>" + tr("Infinite range: <b>1x25-;</b> matches episodes 25 and upward of season one, and all episodes of later seasons") + "</li>" + "</ul></li></ul>";
     ui->lineEFilter->setToolTip(tip);
     initCategoryCombobox();
     loadFeedList();