From 5ff9dc3500d9dac1367c2b255ccc97171a599b6d Mon Sep 17 00:00:00 2001
From: Leonardo Galli <leonardo.galli@bluewin.ch>
Date: Sat, 7 Oct 2017 20:09:22 +0200
Subject: [PATCH] Added: Option to omit year from indexer searches when
 searching by title. Also added option to force a movie search by title
 instead of imdb id. Fixes #1912

---
 .../Indexers/Newznab/NewznabRequestGenerator.cs   | 15 ++++++++++-----
 .../Indexers/Newznab/NewznabSettings.cs           | 10 +++++++++-
 .../Indexers/Torznab/TorznabSettings.cs           |  2 +-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs
index 4ceec5b9e0..0b8f199e01 100644
--- a/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs
+++ b/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs
@@ -52,24 +52,29 @@ public IndexerPageableRequestChain GetSearchRequests(MovieSearchCriteria searchC
         {
             var pageableRequests = new IndexerPageableRequestChain();
 
-            if (SupportsMovieSearch && searchCriteria.Movie.ImdbId.IsNotNullOrWhiteSpace())
+            if (!Settings.SearchByTitle && SupportsMovieSearch && searchCriteria.Movie.ImdbId.IsNotNullOrWhiteSpace())
             {
                 pageableRequests.Add(GetPagedRequests(MaxPages, Settings.Categories, "movie", $"&imdbid={searchCriteria.Movie.ImdbId.Substring(2)}"));
             }
             else
             {
-                var searchTitle = System.Web.HttpUtility.UrlPathEncode(Parser.Parser.ReplaceGermanUmlauts(Parser.Parser.NormalizeTitle(searchCriteria.Movie.Title)));
                 var altTitles = searchCriteria.Movie.AlternativeTitles.Take(5).Select(t => t.Title).ToList();
+                altTitles.Add(searchCriteria.Movie.Title);
 
-                var realMaxPages = (int)MaxPages / (altTitles.Count() + 1);
+                var realMaxPages = (int)MaxPages / (altTitles.Count());
 
-                pageableRequests.Add(GetPagedRequests(MaxPages - (altTitles.Count() * realMaxPages), Settings.Categories, "search", $"&q={searchTitle}%20{searchCriteria.Movie.Year}"));
+                //pageableRequests.Add(GetPagedRequests(MaxPages - (altTitles.Count() * realMaxPages), Settings.Categories, "search", $"&q={searchTitle}%20{searchCriteria.Movie.Year}"));
 
                 //Also use alt titles for searching.
                 foreach (String altTitle in altTitles)
                 {
                     var searchAltTitle = System.Web.HttpUtility.UrlPathEncode(Parser.Parser.ReplaceGermanUmlauts(Parser.Parser.NormalizeTitle(altTitle)));
-                    pageableRequests.Add(GetPagedRequests(realMaxPages, Settings.Categories, "search", $"&q={searchAltTitle}%20{searchCriteria.Movie.Year}"));
+                    var queryString = $"&q={searchAltTitle}";
+                    if (!Settings.RemoveYear)
+                    {
+                        queryString += $"%20{searchCriteria.Movie.Year}";
+                    }
+                    pageableRequests.Add(GetPagedRequests(realMaxPages, Settings.Categories, "search", queryString));
                 }
             }
 
diff --git a/src/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs b/src/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs
index 0dde1d7abb..27a77271b5 100644
--- a/src/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs
+++ b/src/NzbDrone.Core/Indexers/Newznab/NewznabSettings.cs
@@ -79,7 +79,15 @@ public NewznabSettings()
         [FieldDefinition(4, Label = "Additional Parameters", HelpText = "Additional Newznab parameters", Advanced = true)]
         public string AdditionalParameters { get; set; }
 
-        // Field 5 is used by TorznabSettings MinimumSeeders
+        [FieldDefinition(5, Label = "Remove year from search string",
+            HelpText = "Should Radarr remove the year after the title when searching this indexer?", Advanced = true, Type = FieldType.Checkbox)]
+        public bool RemoveYear { get; set; }
+
+        [FieldDefinition(6, Label = "Search by Title",
+            HelpText = "By default, Radarr will try to search by IMDB ID if your indexer supports that. However, some indexers are not very good at tagging their releases correctly, so you can force Radarr to search that indexer by title instead.",
+            Advanced = true, Type = FieldType.Checkbox)]
+        public bool SearchByTitle { get; set; }
+        // Field 7 is used by TorznabSettings MinimumSeeders
         // If you need to add another field here, update TorznabSettings as well and this comment
 
         public virtual NzbDroneValidationResult Validate()
diff --git a/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs b/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs
index 65bdb034af..8652555c9f 100644
--- a/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs
+++ b/src/NzbDrone.Core/Indexers/Torznab/TorznabSettings.cs
@@ -56,7 +56,7 @@ public TorznabSettings()
             MinimumSeeders = IndexerDefaults.MINIMUM_SEEDERS;
         }
 
-        [FieldDefinition(5, Type = FieldType.Textbox, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)]
+        [FieldDefinition(7, Type = FieldType.Textbox, Label = "Minimum Seeders", HelpText = "Minimum number of seeders required.", Advanced = true)]
         public int MinimumSeeders { get; set; }
 
         public override NzbDroneValidationResult Validate()