From 9f4dfa16d19da846018b32e446671c1a254afccf Mon Sep 17 00:00:00 2001 From: faush01 Date: Tue, 6 Aug 2013 17:38:16 +1000 Subject: [PATCH] remove query selection logic and rename param to tvRageId --- NzbDrone.Core/Indexers/IIndexer.cs | 8 ++-- NzbDrone.Core/Indexers/IndexerBase.cs | 8 ++-- NzbDrone.Core/Indexers/Newznab/Newznab.cs | 44 ++++--------------- .../Indexers/Newznab/NewznabSettings.cs | 3 -- NzbDrone.Core/Indexers/NzbClub/NzbClub.cs | 8 ++-- .../Indexers/Omgwtfnzbs/Omgwtfnzbs.cs | 8 ++-- NzbDrone.Core/Indexers/Wombles/Wombles.cs | 8 ++-- 7 files changed, 28 insertions(+), 59 deletions(-) diff --git a/NzbDrone.Core/Indexers/IIndexer.cs b/NzbDrone.Core/Indexers/IIndexer.cs index ef59bd08e..d43659eed 100644 --- a/NzbDrone.Core/Indexers/IIndexer.cs +++ b/NzbDrone.Core/Indexers/IIndexer.cs @@ -17,9 +17,9 @@ public interface IIndexer IParseFeed Parser { get; } - IEnumerable GetEpisodeSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeNumber); - IEnumerable GetDailyEpisodeSearchUrls(string seriesTitle, int rageTvId, DateTime date); - IEnumerable GetSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber); - IEnumerable GetPartialSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeWildcard); + IEnumerable GetEpisodeSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeNumber); + IEnumerable GetDailyEpisodeSearchUrls(string seriesTitle, int tvRageId, DateTime date); + IEnumerable GetSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber); + IEnumerable GetPartialSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeWildcard); } } \ No newline at end of file diff --git a/NzbDrone.Core/Indexers/IndexerBase.cs b/NzbDrone.Core/Indexers/IndexerBase.cs index 11cbe8bc2..02a084670 100644 --- a/NzbDrone.Core/Indexers/IndexerBase.cs +++ b/NzbDrone.Core/Indexers/IndexerBase.cs @@ -34,10 +34,10 @@ public virtual IParseFeed Parser } public abstract IEnumerable RecentFeed { get; } - public abstract IEnumerable GetEpisodeSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeNumber); - public abstract IEnumerable GetDailyEpisodeSearchUrls(string seriesTitle, int rageTvId, DateTime date); - public abstract IEnumerable GetSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber); - public abstract IEnumerable GetPartialSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeWildcard); + public abstract IEnumerable GetEpisodeSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeNumber); + public abstract IEnumerable GetDailyEpisodeSearchUrls(string seriesTitle, int tvRageId, DateTime date); + public abstract IEnumerable GetSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber); + public abstract IEnumerable GetPartialSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeWildcard); } diff --git a/NzbDrone.Core/Indexers/Newznab/Newznab.cs b/NzbDrone.Core/Indexers/Newznab/Newznab.cs index 5f18f3417..7036f01e5 100644 --- a/NzbDrone.Core/Indexers/Newznab/Newznab.cs +++ b/NzbDrone.Core/Indexers/Newznab/Newznab.cs @@ -84,52 +84,24 @@ public override IEnumerable RecentFeed } } - public override IEnumerable GetEpisodeSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeNumber) + public override IEnumerable GetEpisodeSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeNumber) { - if (Settings.UseRageTvId) - { - return RecentFeed.Select(url => String.Format("{0}&limit=100&rid={1}&season={2}&ep={3}", url, rageTvId, seasonNumber, episodeNumber)); - } - else - { - return RecentFeed.Select(url => String.Format("{0}&limit=100&q={1}&season={2}&ep={3}", url, NewsnabifyTitle(seriesTitle), seasonNumber, episodeNumber)); - } + return RecentFeed.Select(url => String.Format("{0}&limit=100&rid={1}&season={2}&ep={3}", url, tvRageId, seasonNumber, episodeNumber)); } - public override IEnumerable GetDailyEpisodeSearchUrls(string seriesTitle, int rageTvId, DateTime date) + public override IEnumerable GetDailyEpisodeSearchUrls(string seriesTitle, int tvRageId, DateTime date) { - if (Settings.UseRageTvId) - { - return RecentFeed.Select(url => String.Format("{0}&limit=100&rid={1}&season={2:yyyy}&ep={2:MM/dd}", url, rageTvId, date)).ToList(); - } - else - { - return RecentFeed.Select(url => String.Format("{0}&limit=100&q={1}&season={2:yyyy}&ep={2:MM/dd}", url, NewsnabifyTitle(seriesTitle), date)).ToList(); - } + return RecentFeed.Select(url => String.Format("{0}&limit=100&rid={1}&season={2:yyyy}&ep={2:MM/dd}", url, tvRageId, date)).ToList(); } - public override IEnumerable GetSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber) + public override IEnumerable GetSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber) { - if (Settings.UseRageTvId) - { - return RecentFeed.Select(url => String.Format("{0}&limit=100&rid={1}&season={2}", url, rageTvId, seasonNumber)); - } - else - { - return RecentFeed.Select(url => String.Format("{0}&limit=100&q={1}&season={2}", url, NewsnabifyTitle(seriesTitle), seasonNumber)); - } + return RecentFeed.Select(url => String.Format("{0}&limit=100&rid={1}&season={2}", url, tvRageId, seasonNumber)); } - public override IEnumerable GetPartialSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeWildcard) + public override IEnumerable GetPartialSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeWildcard) { - if (Settings.UseRageTvId) - { - return RecentFeed.Select(url => String.Format("{0}&limit=100&rid={1}&season={2}&q=E{3}", url, rageTvId, seasonNumber, episodeWildcard)); - } - else - { - return RecentFeed.Select(url => String.Format("{0}&limit=100&q={1}+S{2:00}E{3}", url, NewsnabifyTitle(seriesTitle), seasonNumber, episodeWildcard)); - } + return RecentFeed.Select(url => String.Format("{0}&limit=100&rid={1}&season={2}&q=E{3}", url, tvRageId, seasonNumber, episodeWildcard)); } public override string Name diff --git a/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs b/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs index c728f1fae..10291e2c6 100644 --- a/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs +++ b/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs @@ -10,7 +10,6 @@ public class NewznabSettings : IIndexerSetting public NewznabSettings() { Categories = new [] { 5030, 5040 }; - UseRageTvId = true; } [FieldDefinition(0, Label = "URL")] @@ -21,8 +20,6 @@ public NewznabSettings() public IEnumerable Categories { get; set; } - public bool UseRageTvId { get; set; } - public bool IsValid { get diff --git a/NzbDrone.Core/Indexers/NzbClub/NzbClub.cs b/NzbDrone.Core/Indexers/NzbClub/NzbClub.cs index d7dbb9d92..c1ca60e59 100644 --- a/NzbDrone.Core/Indexers/NzbClub/NzbClub.cs +++ b/NzbDrone.Core/Indexers/NzbClub/NzbClub.cs @@ -35,7 +35,7 @@ public override IEnumerable RecentFeed } } - public override IEnumerable GetEpisodeSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeNumber) + public override IEnumerable GetEpisodeSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeNumber) { var searchUrls = new List(); @@ -47,7 +47,7 @@ public override IEnumerable GetEpisodeSearchUrls(string seriesTitle, int return searchUrls; } - public override IEnumerable GetSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber) + public override IEnumerable GetSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber) { var searchUrls = new List(); @@ -59,7 +59,7 @@ public override IEnumerable GetSeasonSearchUrls(string seriesTitle, int return searchUrls; } - public override IEnumerable GetDailyEpisodeSearchUrls(string seriesTitle, int rageTvId, DateTime date) + public override IEnumerable GetDailyEpisodeSearchUrls(string seriesTitle, int tvRageId, DateTime date) { var searchUrls = new List(); @@ -71,7 +71,7 @@ public override IEnumerable GetDailyEpisodeSearchUrls(string seriesTitle return searchUrls; } - public override IEnumerable GetPartialSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeWildcard) + public override IEnumerable GetPartialSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeWildcard) { var searchUrls = new List(); diff --git a/NzbDrone.Core/Indexers/Omgwtfnzbs/Omgwtfnzbs.cs b/NzbDrone.Core/Indexers/Omgwtfnzbs/Omgwtfnzbs.cs index f01f17df4..445744c66 100644 --- a/NzbDrone.Core/Indexers/Omgwtfnzbs/Omgwtfnzbs.cs +++ b/NzbDrone.Core/Indexers/Omgwtfnzbs/Omgwtfnzbs.cs @@ -20,7 +20,7 @@ public override IEnumerable RecentFeed } } - public override IEnumerable GetEpisodeSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeNumber) + public override IEnumerable GetEpisodeSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeNumber) { var searchUrls = new List(); @@ -32,7 +32,7 @@ public override IEnumerable GetEpisodeSearchUrls(string seriesTitle, int return searchUrls; } - public override IEnumerable GetDailyEpisodeSearchUrls(string seriesTitle, int rageTvId, DateTime date) + public override IEnumerable GetDailyEpisodeSearchUrls(string seriesTitle, int tvRageId, DateTime date) { var searchUrls = new List(); @@ -44,7 +44,7 @@ public override IEnumerable GetDailyEpisodeSearchUrls(string seriesTitle return searchUrls; } - public override IEnumerable GetSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber) + public override IEnumerable GetSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber) { var searchUrls = new List(); @@ -56,7 +56,7 @@ public override IEnumerable GetSeasonSearchUrls(string seriesTitle, int return searchUrls; } - public override IEnumerable GetPartialSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeWildcard) + public override IEnumerable GetPartialSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeWildcard) { var searchUrls = new List(); diff --git a/NzbDrone.Core/Indexers/Wombles/Wombles.cs b/NzbDrone.Core/Indexers/Wombles/Wombles.cs index 9fa42dff6..29a787088 100644 --- a/NzbDrone.Core/Indexers/Wombles/Wombles.cs +++ b/NzbDrone.Core/Indexers/Wombles/Wombles.cs @@ -23,22 +23,22 @@ public override IEnumerable RecentFeed get { yield return "http://nzb.isasecret.com/rss/?sec=TV&fr=false"; } } - public override IEnumerable GetEpisodeSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeNumber) + public override IEnumerable GetEpisodeSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeNumber) { return new List(); } - public override IEnumerable GetSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber) + public override IEnumerable GetSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber) { return new List(); } - public override IEnumerable GetDailyEpisodeSearchUrls(string seriesTitle, int rageTvId, DateTime date) + public override IEnumerable GetDailyEpisodeSearchUrls(string seriesTitle, int tvRageId, DateTime date) { return new List(); } - public override IEnumerable GetPartialSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeWildcard) + public override IEnumerable GetPartialSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeWildcard) { return new List(); }