Merge branch 'master' of git://github.com/kayone/NzbDrone

Conflicts:
	NzbDrone.Core.Test/SeriesProviderTest.cs
This commit is contained in:
Mark McDowall 2011-06-20 00:16:01 -07:00
commit d416ec0147
18 changed files with 417 additions and 1102 deletions

View file

@ -80,17 +80,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);