remove query selection logic and rename param to tvRageId

NzbDrone.Core/Indexers/IIndexer.cs

@@ -17,9 +17,9 @@ namespace NzbDrone.Core.Indexers
 
         IParseFeed Parser { get; }
 
-        IEnumerable<string> GetEpisodeSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeNumber);
-        IEnumerable<string> GetDailyEpisodeSearchUrls(string seriesTitle, int rageTvId, DateTime date);
-        IEnumerable<string> GetSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber);
-        IEnumerable<string> GetPartialSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeWildcard);
+        IEnumerable<string> GetEpisodeSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeNumber);
+        IEnumerable<string> GetDailyEpisodeSearchUrls(string seriesTitle, int tvRageId, DateTime date);
+        IEnumerable<string> GetSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber);
+        IEnumerable<string> GetPartialSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeWildcard);
     }
 }

NzbDrone.Core/Indexers/IndexerBase.cs

@@ -34,10 +34,10 @@ namespace NzbDrone.Core.Indexers
         }
 
         public abstract IEnumerable<string> RecentFeed { get; }
-        public abstract IEnumerable<string> GetEpisodeSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeNumber);
-        public abstract IEnumerable<string> GetDailyEpisodeSearchUrls(string seriesTitle, int rageTvId, DateTime date);
-        public abstract IEnumerable<string> GetSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber);
-        public abstract IEnumerable<string> GetPartialSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeWildcard);
+        public abstract IEnumerable<string> GetEpisodeSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeNumber);
+        public abstract IEnumerable<string> GetDailyEpisodeSearchUrls(string seriesTitle, int tvRageId, DateTime date);
+        public abstract IEnumerable<string> GetSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber);
+        public abstract IEnumerable<string> GetPartialSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeWildcard);
     }
 
 

NzbDrone.Core/Indexers/Newznab/Newznab.cs

@@ -84,52 +84,24 @@ namespace NzbDrone.Core.Indexers.Newznab
             }
         }
 
-        public override IEnumerable<string> GetEpisodeSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeNumber)
+        public override IEnumerable<string> 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<string> GetDailyEpisodeSearchUrls(string seriesTitle, int rageTvId, DateTime date)
+        public override IEnumerable<string> 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<string> GetSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber)
+        public override IEnumerable<string> 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<string> GetPartialSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeWildcard)
+        public override IEnumerable<string> 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

NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs

@@ -10,7 +10,6 @@ namespace NzbDrone.Core.Indexers.Newznab
         public NewznabSettings()
         {
             Categories = new [] { 5030, 5040 };
-            UseRageTvId = true;
         }
 
         [FieldDefinition(0, Label = "URL")]
@@ -21,8 +20,6 @@ namespace NzbDrone.Core.Indexers.Newznab
 
         public IEnumerable<Int32> Categories { get; set; }
 
-        public bool UseRageTvId { get; set; }
-
         public bool IsValid
         {
             get

NzbDrone.Core/Indexers/NzbClub/NzbClub.cs

@@ -35,7 +35,7 @@ namespace NzbDrone.Core.Indexers.NzbClub
             }
         }
 
-        public override IEnumerable<string> GetEpisodeSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeNumber)
+        public override IEnumerable<string> GetEpisodeSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeNumber)
         {
             var searchUrls = new List<string>();
 
@@ -47,7 +47,7 @@ namespace NzbDrone.Core.Indexers.NzbClub
             return searchUrls;
         }
 
-        public override IEnumerable<string> GetSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber)
+        public override IEnumerable<string> GetSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber)
         {
             var searchUrls = new List<string>();
 
@@ -59,7 +59,7 @@ namespace NzbDrone.Core.Indexers.NzbClub
             return searchUrls;
         }
 
-        public override IEnumerable<string> GetDailyEpisodeSearchUrls(string seriesTitle, int rageTvId, DateTime date)
+        public override IEnumerable<string> GetDailyEpisodeSearchUrls(string seriesTitle, int tvRageId, DateTime date)
         {
             var searchUrls = new List<String>();
 
@@ -71,7 +71,7 @@ namespace NzbDrone.Core.Indexers.NzbClub
             return searchUrls;
         }
 
-        public override IEnumerable<string> GetPartialSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeWildcard)
+        public override IEnumerable<string> GetPartialSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeWildcard)
         {
             var searchUrls = new List<String>();
 

NzbDrone.Core/Indexers/Omgwtfnzbs/Omgwtfnzbs.cs

@@ -20,7 +20,7 @@ namespace NzbDrone.Core.Indexers.Omgwtfnzbs
             }
         }
 
-        public override IEnumerable<string> GetEpisodeSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeNumber)
+        public override IEnumerable<string> GetEpisodeSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeNumber)
         {
             var searchUrls = new List<string>();
 
@@ -32,7 +32,7 @@ namespace NzbDrone.Core.Indexers.Omgwtfnzbs
             return searchUrls;
         }
 
-        public override IEnumerable<string> GetDailyEpisodeSearchUrls(string seriesTitle, int rageTvId, DateTime date)
+        public override IEnumerable<string> GetDailyEpisodeSearchUrls(string seriesTitle, int tvRageId, DateTime date)
         {
             var searchUrls = new List<String>();
 
@@ -44,7 +44,7 @@ namespace NzbDrone.Core.Indexers.Omgwtfnzbs
             return searchUrls;
         }
 
-        public override IEnumerable<string> GetSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber)
+        public override IEnumerable<string> GetSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber)
         {
             var searchUrls = new List<String>();
 
@@ -56,7 +56,7 @@ namespace NzbDrone.Core.Indexers.Omgwtfnzbs
             return searchUrls;
         }
 
-        public override IEnumerable<string> GetPartialSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeWildcard)
+        public override IEnumerable<string> GetPartialSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeWildcard)
         {
             var searchUrls = new List<String>();
 

NzbDrone.Core/Indexers/Wombles/Wombles.cs

@@ -23,22 +23,22 @@ namespace NzbDrone.Core.Indexers.Wombles
             get { yield return "http://nzb.isasecret.com/rss/?sec=TV&fr=false"; }
         }
 
-        public override IEnumerable<string> GetEpisodeSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeNumber)
+        public override IEnumerable<string> GetEpisodeSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeNumber)
         {
             return new List<string>();
         }
 
-        public override IEnumerable<string> GetSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber)
+        public override IEnumerable<string> GetSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber)
         {
             return new List<string>();
         }
 
-        public override IEnumerable<string> GetDailyEpisodeSearchUrls(string seriesTitle, int rageTvId, DateTime date)
+        public override IEnumerable<string> GetDailyEpisodeSearchUrls(string seriesTitle, int tvRageId, DateTime date)
         {
             return new List<string>();
         }
 
-        public override IEnumerable<string> GetPartialSeasonSearchUrls(string seriesTitle, int rageTvId, int seasonNumber, int episodeWildcard)
+        public override IEnumerable<string> GetPartialSeasonSearchUrls(string seriesTitle, int tvRageId, int seasonNumber, int episodeWildcard)
         {
             return new List<string>();
         }