Merge conflicts resolved.

Added Language parsing.
This commit is contained in:
Mark McDowall
2011-05-08 23:16:26 -07:00
13 changed files with 603 additions and 134 deletions
@@ -164,7 +164,7 @@ namespace NzbDrone.Core.Providers.Indexer
parseResult.EpisodeTitle = episodes[0].Title;
var sabTitle = _sabProvider.GetSabTitle(parseResult);
if (Convert.ToBoolean(_configProvider.UseBlackhole))
if (_configProvider.UseBlackhole)
{
var blackholeDir = _configProvider.BlackholeDirectory;
var folder = !String.IsNullOrEmpty(blackholeDir) ? blackholeDir : Path.Combine(CentralDispatch.AppPath, "App_Data");
@@ -187,6 +187,7 @@ namespace NzbDrone.Core.Providers.Indexer
if (!_sabProvider.AddByUrl(NzbDownloadUrl(feedItem), sabTitle))
{
_logger.Warn("Unable to add item to SAB queue. {0} {1}", NzbDownloadUrl(feedItem), sabTitle);
return;
}
}