diff --git a/NzbDrone.Core.Test/SeriesProviderTest.cs b/NzbDrone.Core.Test/SeriesProviderTest.cs index 9064eb8d5..bced5c070 100644 Binary files a/NzbDrone.Core.Test/SeriesProviderTest.cs and b/NzbDrone.Core.Test/SeriesProviderTest.cs differ diff --git a/NzbDrone.Core/Providers/SeriesProvider.cs b/NzbDrone.Core/Providers/SeriesProvider.cs index 127e9f08a..9a022a14c 100644 --- a/NzbDrone.Core/Providers/SeriesProvider.cs +++ b/NzbDrone.Core/Providers/SeriesProvider.cs @@ -60,17 +60,6 @@ namespace NzbDrone.Core.Providers return GetAllSeries().Any(c => c.SeriesId == id && c.Monitored); } - public virtual TvdbSeries MapPathToSeries(string path) - { - var seriesPath = new DirectoryInfo(path); - var searchResults = _tvDbProvider.GetSeries(seriesPath.Name); - - if (searchResults == null) - return null; - - return _tvDbProvider.GetSeries(searchResults.Id, false); - } - public virtual Series UpdateSeriesInfo(int seriesId) { var tvDbSeries = _tvDbProvider.GetSeries(seriesId, true); diff --git a/NzbDrone.Core/Providers/TvDbProvider.cs b/NzbDrone.Core/Providers/TvDbProvider.cs index 7b3a91ac1..9225a9c69 100644 --- a/NzbDrone.Core/Providers/TvDbProvider.cs +++ b/NzbDrone.Core/Providers/TvDbProvider.cs @@ -38,43 +38,6 @@ namespace NzbDrone.Core.Providers } - public virtual TvdbSearchResult GetSeries(string title) - { - lock (_handler) - { - var searchResults = SearchSeries(title); - if (searchResults.Count == 0) - return null; - - foreach (var tvdbSearchResult in searchResults) - { - if (IsTitleMatch(tvdbSearchResult.SeriesName, title)) - { - Logger.Debug("Search for '{0}' was successful", title); - return tvdbSearchResult; - } - } - } - return null; - } - - public virtual int GetBestMatch(List searchResults, string title) - { - if (searchResults.Count == 0) - return 0; - - foreach (var tvdbSearchResult in searchResults) - { - if (IsTitleMatch(tvdbSearchResult.SeriesName, title)) - { - Logger.Debug("Search for '{0}' was successful", title); - return tvdbSearchResult.Id; - } - } - - return searchResults[0].Id; - } - public virtual TvdbSeries GetSeries(int id, bool loadEpisodes) { lock (_handler) @@ -116,34 +79,5 @@ namespace NzbDrone.Core.Providers } } - /// - /// Determines whether a title in a search result is equal to the title searched for. - /// - /// Name of the directory. - /// The TVDB title. - /// - /// true if the titles are found to be same; otherwise, false. - /// - public static bool IsTitleMatch(string directoryName, string tvdbTitle) - { - var result = false; - - if (String.IsNullOrEmpty(directoryName)) - throw new ArgumentException("directoryName"); - if (String.IsNullOrEmpty(tvdbTitle)) - throw new ArgumentException("tvdbTitle"); - - if (String.Equals(directoryName, tvdbTitle, StringComparison.CurrentCultureIgnoreCase)) - { - result = true; - } - else if (String.Equals(CleanUpRegex.Replace(directoryName, ""), CleanUpRegex.Replace(tvdbTitle, ""), - StringComparison.InvariantCultureIgnoreCase)) - result = true; - - Logger.Debug("Match between '{0}' and '{1}' was {2}", tvdbTitle, directoryName, result); - - return result; - } } } \ No newline at end of file