minor sync cleanup.

NzbDrone.Core/Indexers/FetchAndParseRssService.cs

@@ -0,0 +1,56 @@
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using NLog;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.Indexers
+{
+    public interface IFetchAndParseRss
+    {
+        List<ReportInfo> Fetch();
+    }
+
+    public class FetchAndParseRssService : IFetchAndParseRss
+    {
+        private readonly IIndexerService _indexerService;
+        private readonly IFetchFeedFromIndexers _feedFetcher;
+        private readonly Logger _logger;
+
+        public FetchAndParseRssService(IIndexerService indexerService, IFetchFeedFromIndexers feedFetcher, Logger logger)
+        {
+            _indexerService = indexerService;
+            _feedFetcher = feedFetcher;
+            _logger = logger;
+        }
+
+        public List<ReportInfo> Fetch()
+        {
+            var result = new List<ReportInfo>();
+
+            var indexers = _indexerService.GetAvailableIndexers();
+
+            if (!indexers.Any())
+            {
+                _logger.Warn("No available indexers. check your configuration.");
+                return result;
+            }
+
+            _logger.Debug("Available indexers {0}", indexers.Count);
+
+            Parallel.ForEach(indexers, indexer =>
+                {
+                    var indexerFeed = _feedFetcher.FetchRss(indexer);
+
+                    lock (result)
+                    {
+                        result.AddRange(indexerFeed);
+                    }
+                });
+
+            _logger.Debug("Found {0} reports", result.Count);
+
+            return result;
+        }
+    }
+}

NzbDrone.Core/Indexers/RssSyncService.cs

@@ -1,23 +1,18 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using NLog;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Download;
-using NzbDrone.Core.Model;
-using NzbDrone.Core.Parser;
-using NzbDrone.Core.Parser.Model;
 
 namespace NzbDrone.Core.Indexers
 {
 
-    public interface ISyncRss
+    public interface IRssSyncService
     {
         void Sync();
     }
 
-    public class RssSyncService : ISyncRss
+    public class RssSyncService : IRssSyncService
     {
         private readonly IFetchAndParseRss _rssFetcherAndParser;
         private readonly IMakeDownloadDecision _downloadDecisionMaker;
@@ -40,6 +35,8 @@ namespace NzbDrone.Core.Indexers
             var parseResults = _rssFetcherAndParser.Fetch();
             var decisions = _downloadDecisionMaker.GetRssDecision(parseResults);
 
+            //TODO: this will download multiple of same episode if they show up in RSS. need to
+            
             var qualifiedReports = decisions
                          .Where(c => c.Approved)
                          .Select(c => c.Episode)
@@ -48,6 +45,7 @@ namespace NzbDrone.Core.Indexers
                          .ThenBy(c => c.Report.Age);
 
 
+
             foreach (var episodeParseResult in qualifiedReports)
             {
                 try
@@ -60,44 +58,7 @@ namespace NzbDrone.Core.Indexers
                 }
             }
 
-            _logger.Info("RSS Sync Completed. Reports found {0}, Fetches attempted {1}", parseResults.Count, qualifiedReports);
-        }
-    }
-
-
-    public interface IFetchAndParseRss
-    {
-        List<ReportInfo> Fetch();
-    }
-
-    public class FetchAndParseRssService : IFetchAndParseRss
-    {
-        private readonly IIndexerService _indexerService;
-        private readonly IFetchFeedFromIndexers _feedFetcher;
-
-        public FetchAndParseRssService(IIndexerService indexerService, IFetchFeedFromIndexers feedFetcher)
-        {
-            _indexerService = indexerService;
-            _feedFetcher = feedFetcher;
-        }
-
-        public List<ReportInfo> Fetch()
-        {
-            var result = new List<ReportInfo>();
-
-            var indexers = _indexerService.GetAvailableIndexers();
-
-            Parallel.ForEach(indexers, indexer =>
-            {
-                var indexerFeed = _feedFetcher.FetchRss(indexer);
-
-                lock (result)
-                {
-                    result.AddRange(indexerFeed);
-                }
-            });
-
-            return result;
+            _logger.Info("RSS Sync Completed. Reports found: {0}, Fetches attempted: {1}", parseResults.Count, qualifiedReports.Count());
         }
     }
 }

NzbDrone.Core/Jobs/Implementations/RssSyncJob.cs

@@ -7,13 +7,13 @@ namespace NzbDrone.Core.Jobs.Implementations
 {
     public class RssSyncJob : IJob
     {
-        private readonly ISyncRss _syncRssService;
+        private readonly IRssSyncService _rssSyncServiceService;
         private readonly IConfigService _configService;
 
 
-        public RssSyncJob(ISyncRss syncRssService, IConfigService configService)
+        public RssSyncJob(IRssSyncService rssSyncServiceService, IConfigService configService)
         {
-            _syncRssService = syncRssService;
+            _rssSyncServiceService = rssSyncServiceService;
             _configService = configService;
         }
 
@@ -29,7 +29,7 @@ namespace NzbDrone.Core.Jobs.Implementations
 
         public void Start(ProgressNotification notification, dynamic options)
         {
-            _syncRssService.Sync();
+            _rssSyncServiceService.Sync();
         }
     }
 }

NzbDrone.Core/NzbDrone.Core.csproj

@@ -234,6 +234,7 @@
     <Compile Include="Download\DownloadClientProvider.cs" />
     <Compile Include="Download\DownloadClientType.cs" />
     <Compile Include="Download\SabQueueItem.cs" />
+    <Compile Include="Indexers\FetchAndParseRssService.cs" />
     <Compile Include="Indexers\IIndexerBase.cs" />
     <Compile Include="Indexers\IndexerSettingUpdatedEvent.cs" />
     <Compile Include="Indexers\IndexerWithSetting.cs" />