fixed rebase issues.

NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs

@@ -13,8 +13,8 @@ namespace NzbDrone.Core.DecisionEngine
 {
     public interface IMakeDownloadDecision
     {
-        List<DownloadDecision> GetRssDecision(List<ReportInfo> reports);
-        List<DownloadDecision> GetSearchDecision(List<ReportInfo> reports, SearchCriteriaBase searchCriteriaBase);
+        List<DownloadDecision> GetRssDecision(List<ReleaseInfo> reports);
+        List<DownloadDecision> GetSearchDecision(List<ReleaseInfo> reports, SearchCriteriaBase searchCriteriaBase);
     }
 
     public class DownloadDecisionMaker : IMakeDownloadDecision
@@ -30,17 +30,17 @@ namespace NzbDrone.Core.DecisionEngine
             _logger = logger;
         }
 
-        public List<DownloadDecision> GetRssDecision(List<ReportInfo> reports)
+        public List<DownloadDecision> GetRssDecision(List<ReleaseInfo> reports)
         {
             return GetDecisions(reports).ToList();
         }
 
-        public List<DownloadDecision> GetSearchDecision(List<ReportInfo> reports, SearchCriteriaBase searchCriteriaBase)
+        public List<DownloadDecision> GetSearchDecision(List<ReleaseInfo> reports, SearchCriteriaBase searchCriteriaBase)
         {
             return GetDecisions(reports, searchCriteriaBase).ToList();
         }
 
-        private IEnumerable<DownloadDecision> GetDecisions(List<ReportInfo> reports, SearchCriteriaBase searchCriteria = null)
+        private IEnumerable<DownloadDecision> GetDecisions(List<ReleaseInfo> reports, SearchCriteriaBase searchCriteria = null)
         {
             if (reports.Any())
             {

NzbDrone.Core/IndexerSearch/NzbSearchService.cs

@@ -131,12 +131,10 @@ namespace NzbDrone.Core.IndexerSearch
         private List<DownloadDecision> Dispatch(Func<IIndexer, IEnumerable<ReleaseInfo>> searchAction, SearchCriteriaBase criteriaBase)
         {
             var indexers = _indexerService.GetAvailableIndexers().ToList();
-            var reports = new List<ReportInfo>();
             var reports = new List<ReleaseInfo>();
 
             _logger.ProgressInfo("Searching {0} indexers for {1}", indexers.Count, criteriaBase);
 
-            var reports = new List<ReportInfo>();
             var taskList = new List<Task>();
             var taskFactory = new TaskFactory(TaskCreationOptions.LongRunning, TaskContinuationOptions.None);
 

NzbDrone.Core/Indexers/NzbClub/NzbClubParser.cs

@@ -2,8 +2,6 @@ using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Xml.Linq;
-using NLog;
-using NzbDrone.Core.Parser.Model;
 
 namespace NzbDrone.Core.Indexers.NzbClub
 {
@@ -15,7 +13,7 @@ namespace NzbDrone.Core.Indexers.NzbClub
 
         protected override long GetSize(XElement item)
         {
-            logger = LogManager.GetCurrentClassLogger();
+            var match = SizeRegex.Match(item.Description());
 
             if (match.Success && match.Groups["size"].Success)
             {