From 21fd12e1a6ca60ee9980084a73490faa49909239 Mon Sep 17 00:00:00 2001
From: Keivan Beigi <kay.one@gmail.com>
Date: Thu, 12 Sep 2013 15:41:50 -0700
Subject: [PATCH] added scheduled task for UpdateSceneMappingCommand

---
 NzbDrone.Api/NzbDrone.Api.ncrunchproject      |   2 +-
 .../NzbDrone.Common.Test.ncrunchproject       |   2 +-
 .../NzbDrone.Common.ncrunchproject            |   2 +-
 .../TvTests/SeriesServiceFixture.cs           | Bin 2163 -> 1790 bytes
 NzbDrone.Core/Jobs/TaskManager.cs             |   4 +-
 .../DownloadedEpisodesImportService.cs        |   6 +--
 NzbDrone.Core/NzbDrone.Core.ncrunchproject    |   2 +-
 NzbDrone.Core/Tv/SeriesService.cs             |  44 ------------------
 .../NzbDrone.Test.Common.ncrunchproject       |   2 +-
 .../NzbDrone.Test.Dummy.ncrunchproject        |   2 +-
 .../NzbDrone.Update.Test.ncrunchproject       |   2 +-
 .../NzbDrone.Update.ncrunchproject            |   2 +-
 .../ServiceInstall.ncrunchproject             |   2 +-
 .../ServiceUninstall.ncrunchproject           |   2 +-
 14 files changed, 16 insertions(+), 58 deletions(-)

diff --git a/NzbDrone.Api/NzbDrone.Api.ncrunchproject b/NzbDrone.Api/NzbDrone.Api.ncrunchproject
index 6a13a8251..1a2228e7f 100644
--- a/NzbDrone.Api/NzbDrone.Api.ncrunchproject
+++ b/NzbDrone.Api/NzbDrone.Api.ncrunchproject
@@ -12,7 +12,7 @@
   <PreventSigningOfAssembly>false</PreventSigningOfAssembly>
   <AnalyseExecutionTimes>true</AnalyseExecutionTimes>
   <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
-  <DefaultTestTimeout>500</DefaultTestTimeout>
+  <DefaultTestTimeout>5000</DefaultTestTimeout>
   <UseBuildConfiguration>Debug</UseBuildConfiguration>
   <UseBuildPlatform>x86</UseBuildPlatform>
   <ProxyProcessPath></ProxyProcessPath>
diff --git a/NzbDrone.Common.Test/NzbDrone.Common.Test.ncrunchproject b/NzbDrone.Common.Test/NzbDrone.Common.Test.ncrunchproject
index f86981c3e..792b5fb01 100644
--- a/NzbDrone.Common.Test/NzbDrone.Common.Test.ncrunchproject
+++ b/NzbDrone.Common.Test/NzbDrone.Common.Test.ncrunchproject
@@ -12,7 +12,7 @@
   <PreventSigningOfAssembly>false</PreventSigningOfAssembly>
   <AnalyseExecutionTimes>true</AnalyseExecutionTimes>
   <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
-  <DefaultTestTimeout>500</DefaultTestTimeout>
+  <DefaultTestTimeout>5000</DefaultTestTimeout>
   <UseBuildConfiguration>Debug</UseBuildConfiguration>
   <UseBuildPlatform>x86</UseBuildPlatform>
   <ProxyProcessPath></ProxyProcessPath>
diff --git a/NzbDrone.Common/NzbDrone.Common.ncrunchproject b/NzbDrone.Common/NzbDrone.Common.ncrunchproject
index 6a13a8251..1a2228e7f 100644
--- a/NzbDrone.Common/NzbDrone.Common.ncrunchproject
+++ b/NzbDrone.Common/NzbDrone.Common.ncrunchproject
@@ -12,7 +12,7 @@
   <PreventSigningOfAssembly>false</PreventSigningOfAssembly>
   <AnalyseExecutionTimes>true</AnalyseExecutionTimes>
   <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
-  <DefaultTestTimeout>500</DefaultTestTimeout>
+  <DefaultTestTimeout>5000</DefaultTestTimeout>
   <UseBuildConfiguration>Debug</UseBuildConfiguration>
   <UseBuildPlatform>x86</UseBuildPlatform>
   <ProxyProcessPath></ProxyProcessPath>
diff --git a/NzbDrone.Core.Test/TvTests/SeriesServiceFixture.cs b/NzbDrone.Core.Test/TvTests/SeriesServiceFixture.cs
index 99ead26478dedb4431ac865690430f04c0ebd5b7..aea6ff92871e0d04a729a2807515c5208c010243 100644
GIT binary patch
delta 28
kcmew?@Q-(b%|;J4#>w@J(UbQuac!1mTE@8f5X(kp0G{6pN&o-=

delta 285
zcmeyz`&nRu4YO~4;YMSAMtR@-<ZK(y;MAhb)Z(Djg8bsllKi4dI|UHinwM*`0b{N<
zh^=6&08*M-r01Smf<u#rruF82#(j*FA2KTNWERKg=I4P-OHG-q%_Qv%GDR;qwWPE_
zBU!=LP9Yg&l7^v?rY0|!0vgZ@0;(&@E7nL$%ua<kP7~ysenyFKJztoyKsS{Xm8JqE
uP)!IfP0C75F46NWhARcxqZgc!Uz(Gmp{eJTssYjnG7@HS?Pho8?aTnL$X6o(

diff --git a/NzbDrone.Core/Jobs/TaskManager.cs b/NzbDrone.Core/Jobs/TaskManager.cs
index 723eaea25..6337260d8 100644
--- a/NzbDrone.Core/Jobs/TaskManager.cs
+++ b/NzbDrone.Core/Jobs/TaskManager.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using NLog;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Configuration.Events;
+using NzbDrone.Core.DataAugmentation.Scene;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Instrumentation.Commands;
 using NzbDrone.Core.Lifecycle;
@@ -50,6 +51,7 @@ namespace NzbDrone.Core.Jobs
                     new ScheduledTask{ Interval = 1, TypeName = typeof(DownloadedEpisodesScanCommand).FullName},
                     new ScheduledTask{ Interval = 60, TypeName = typeof(ApplicationUpdateCommand).FullName},
                     new ScheduledTask{ Interval = 1*60, TypeName = typeof(TrimLogCommand).FullName},
+                    new ScheduledTask{ Interval = 3*60, TypeName = typeof(UpdateSceneMappingCommand).FullName},
                     new ScheduledTask{ Interval = 1, TypeName = typeof(TrackedCommandCleanupCommand).FullName}
                 };
 
@@ -89,7 +91,7 @@ namespace NzbDrone.Core.Jobs
 
         public void HandleAsync(ConfigSavedEvent message)
         {
-            var rss = _scheduledTaskRepository.GetDefinition(typeof (RssSyncCommand));
+            var rss = _scheduledTaskRepository.GetDefinition(typeof(RssSyncCommand));
             rss.Interval = _configService.RssSyncInterval;
             _scheduledTaskRepository.Update(rss);
         }
diff --git a/NzbDrone.Core/MediaFiles/DownloadedEpisodesImportService.cs b/NzbDrone.Core/MediaFiles/DownloadedEpisodesImportService.cs
index 7efc5dc34..d24d9feb3 100644
--- a/NzbDrone.Core/MediaFiles/DownloadedEpisodesImportService.cs
+++ b/NzbDrone.Core/MediaFiles/DownloadedEpisodesImportService.cs
@@ -112,7 +112,7 @@ namespace NzbDrone.Core.MediaFiles
 
             var videoFiles = _diskScanService.GetVideoFiles(subfolderInfo.FullName);
 
-            return ProcessFiles(videoFiles, series);
+            return ProcessFiles(series, videoFiles);
         }
 
         private void ProcessVideoFile(string videoFile)
@@ -131,10 +131,10 @@ namespace NzbDrone.Core.MediaFiles
                 return;
             }
 
-            ProcessFiles(new[] { videoFile }, series);
+            ProcessFiles(series, videoFile);
         }
 
-        private List<ImportDecision> ProcessFiles(IEnumerable<string> videoFiles, Series series)
+        private List<ImportDecision> ProcessFiles(Series series, params string[] videoFiles)
         {
             var decisions = _importDecisionMaker.GetImportDecisions(videoFiles, series, true);
             return _importApprovedEpisodes.Import(decisions, true);
diff --git a/NzbDrone.Core/NzbDrone.Core.ncrunchproject b/NzbDrone.Core/NzbDrone.Core.ncrunchproject
index 9d9968738..b2eed192e 100644
--- a/NzbDrone.Core/NzbDrone.Core.ncrunchproject
+++ b/NzbDrone.Core/NzbDrone.Core.ncrunchproject
@@ -12,7 +12,7 @@
   <PreventSigningOfAssembly>false</PreventSigningOfAssembly>
   <AnalyseExecutionTimes>true</AnalyseExecutionTimes>
   <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
-  <DefaultTestTimeout>500</DefaultTestTimeout>
+  <DefaultTestTimeout>5000</DefaultTestTimeout>
   <UseBuildConfiguration>Debug</UseBuildConfiguration>
   <UseBuildPlatform>x86</UseBuildPlatform>
   <ProxyProcessPath></ProxyProcessPath>
diff --git a/NzbDrone.Core/Tv/SeriesService.cs b/NzbDrone.Core/Tv/SeriesService.cs
index ec7d12899..0693fd4e0 100644
--- a/NzbDrone.Core/Tv/SeriesService.cs
+++ b/NzbDrone.Core/Tv/SeriesService.cs
@@ -14,10 +14,8 @@ namespace NzbDrone.Core.Tv
 {
     public interface ISeriesService
     {
-        bool IsMonitored(int id);
         Series GetSeries(int seriesId);
         Series AddSeries(Series newSeries);
-        void UpdateFromSeriesEditor(IList<Series> editedSeries);
         Series FindByTvdbId(int tvdbId);
         Series FindByTvRageId(int tvRageId);
         Series FindByTitle(string title);
@@ -26,9 +24,6 @@ namespace NzbDrone.Core.Tv
         List<Series> GetAllSeries();
         Series UpdateSeries(Series series);
         bool SeriesPathExists(string folder);
-        List<Series> GetSeriesInList(IEnumerable<int> seriesIds);
-        Series FindBySlug(string slug);
-        List<String> GetSeriesPaths();
     }
 
     public class SeriesService : ISeriesService
@@ -55,11 +50,6 @@ namespace NzbDrone.Core.Tv
             _logger = logger;
         }
 
-        public bool IsMonitored(int id)
-        {
-            return _seriesRepository.Get(id).Monitored;
-        }
-
         public Series GetSeries(int seriesId)
         {
             return _seriesRepository.Get(seriesId);
@@ -88,24 +78,6 @@ namespace NzbDrone.Core.Tv
             return newSeries;
         }
 
-        public void UpdateFromSeriesEditor(IList<Series> editedSeries)
-        {
-            var allSeries = _seriesRepository.All();
-
-            foreach (var series in allSeries)
-            {
-                //Only update parameters that can be changed in MassEdit
-                var edited = editedSeries.Single(s => s.Id == series.Id);
-                series.QualityProfileId = edited.QualityProfileId;
-                series.Monitored = edited.Monitored;
-                series.SeasonFolder = edited.SeasonFolder;
-                series.Path = edited.Path;
-
-                _seriesRepository.Update(series);
-            }
-
-        }
-
         public Series FindByTvdbId(int tvdbId)
         {
             return _seriesRepository.FindByTvdbId(tvdbId);
@@ -116,17 +88,6 @@ namespace NzbDrone.Core.Tv
             return _seriesRepository.FindByTvRageId(tvRageId);
         }
 
-        public Series FindBySlug(string slug)
-        {
-            var series = _seriesRepository.FindBySlug(slug);
-            return series;
-        }
-
-        public List<string> GetSeriesPaths()
-        {
-            return _seriesRepository.GetSeriesPaths();
-        }
-
         public Series FindByTitle(string title)
         {
             var tvdbId = _sceneMappingService.GetTvDbId(title);
@@ -170,10 +131,5 @@ namespace NzbDrone.Core.Tv
         {
             return _seriesRepository.SeriesPathExists(folder);
         }
-
-        public List<Series> GetSeriesInList(IEnumerable<int> seriesIds)
-        {
-            return _seriesRepository.Get(seriesIds).ToList();
-        }
     }
 }
diff --git a/NzbDrone.Test.Common/NzbDrone.Test.Common.ncrunchproject b/NzbDrone.Test.Common/NzbDrone.Test.Common.ncrunchproject
index 6a13a8251..1a2228e7f 100644
--- a/NzbDrone.Test.Common/NzbDrone.Test.Common.ncrunchproject
+++ b/NzbDrone.Test.Common/NzbDrone.Test.Common.ncrunchproject
@@ -12,7 +12,7 @@
   <PreventSigningOfAssembly>false</PreventSigningOfAssembly>
   <AnalyseExecutionTimes>true</AnalyseExecutionTimes>
   <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
-  <DefaultTestTimeout>500</DefaultTestTimeout>
+  <DefaultTestTimeout>5000</DefaultTestTimeout>
   <UseBuildConfiguration>Debug</UseBuildConfiguration>
   <UseBuildPlatform>x86</UseBuildPlatform>
   <ProxyProcessPath></ProxyProcessPath>
diff --git a/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.ncrunchproject b/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.ncrunchproject
index 6a13a8251..1a2228e7f 100644
--- a/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.ncrunchproject
+++ b/NzbDrone.Test.Dummy/NzbDrone.Test.Dummy.ncrunchproject
@@ -12,7 +12,7 @@
   <PreventSigningOfAssembly>false</PreventSigningOfAssembly>
   <AnalyseExecutionTimes>true</AnalyseExecutionTimes>
   <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
-  <DefaultTestTimeout>500</DefaultTestTimeout>
+  <DefaultTestTimeout>5000</DefaultTestTimeout>
   <UseBuildConfiguration>Debug</UseBuildConfiguration>
   <UseBuildPlatform>x86</UseBuildPlatform>
   <ProxyProcessPath></ProxyProcessPath>
diff --git a/NzbDrone.Update.Test/NzbDrone.Update.Test.ncrunchproject b/NzbDrone.Update.Test/NzbDrone.Update.Test.ncrunchproject
index 6a13a8251..1a2228e7f 100644
--- a/NzbDrone.Update.Test/NzbDrone.Update.Test.ncrunchproject
+++ b/NzbDrone.Update.Test/NzbDrone.Update.Test.ncrunchproject
@@ -12,7 +12,7 @@
   <PreventSigningOfAssembly>false</PreventSigningOfAssembly>
   <AnalyseExecutionTimes>true</AnalyseExecutionTimes>
   <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
-  <DefaultTestTimeout>500</DefaultTestTimeout>
+  <DefaultTestTimeout>5000</DefaultTestTimeout>
   <UseBuildConfiguration>Debug</UseBuildConfiguration>
   <UseBuildPlatform>x86</UseBuildPlatform>
   <ProxyProcessPath></ProxyProcessPath>
diff --git a/NzbDrone.Update/NzbDrone.Update.ncrunchproject b/NzbDrone.Update/NzbDrone.Update.ncrunchproject
index 6a13a8251..1a2228e7f 100644
--- a/NzbDrone.Update/NzbDrone.Update.ncrunchproject
+++ b/NzbDrone.Update/NzbDrone.Update.ncrunchproject
@@ -12,7 +12,7 @@
   <PreventSigningOfAssembly>false</PreventSigningOfAssembly>
   <AnalyseExecutionTimes>true</AnalyseExecutionTimes>
   <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
-  <DefaultTestTimeout>500</DefaultTestTimeout>
+  <DefaultTestTimeout>5000</DefaultTestTimeout>
   <UseBuildConfiguration>Debug</UseBuildConfiguration>
   <UseBuildPlatform>x86</UseBuildPlatform>
   <ProxyProcessPath></ProxyProcessPath>
diff --git a/ServiceHelpers/ServiceInstall/ServiceInstall.ncrunchproject b/ServiceHelpers/ServiceInstall/ServiceInstall.ncrunchproject
index 9d9968738..b2eed192e 100644
--- a/ServiceHelpers/ServiceInstall/ServiceInstall.ncrunchproject
+++ b/ServiceHelpers/ServiceInstall/ServiceInstall.ncrunchproject
@@ -12,7 +12,7 @@
   <PreventSigningOfAssembly>false</PreventSigningOfAssembly>
   <AnalyseExecutionTimes>true</AnalyseExecutionTimes>
   <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
-  <DefaultTestTimeout>500</DefaultTestTimeout>
+  <DefaultTestTimeout>5000</DefaultTestTimeout>
   <UseBuildConfiguration>Debug</UseBuildConfiguration>
   <UseBuildPlatform>x86</UseBuildPlatform>
   <ProxyProcessPath></ProxyProcessPath>
diff --git a/ServiceHelpers/ServiceUninstall/ServiceUninstall.ncrunchproject b/ServiceHelpers/ServiceUninstall/ServiceUninstall.ncrunchproject
index 9d9968738..b2eed192e 100644
--- a/ServiceHelpers/ServiceUninstall/ServiceUninstall.ncrunchproject
+++ b/ServiceHelpers/ServiceUninstall/ServiceUninstall.ncrunchproject
@@ -12,7 +12,7 @@
   <PreventSigningOfAssembly>false</PreventSigningOfAssembly>
   <AnalyseExecutionTimes>true</AnalyseExecutionTimes>
   <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
-  <DefaultTestTimeout>500</DefaultTestTimeout>
+  <DefaultTestTimeout>5000</DefaultTestTimeout>
   <UseBuildConfiguration>Debug</UseBuildConfiguration>
   <UseBuildPlatform>x86</UseBuildPlatform>
   <ProxyProcessPath></ProxyProcessPath>