Merge branch 'kay.one' of github.com:NzbDrone/NzbDrone into markus

Conflicts:
	NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs

NzbDrone.Common/EnviromentProvider.cs

@@ -25,7 +25,6 @@ namespace NzbDrone.Common
             {
                 if (isInDebug || Debugger.IsAttached) return false;
 
-                Console.WriteLine(processName);
                 if (processName.Contains("nunit")) return false;
                 if (processName.Contains("jetbrain")) return false;
                 if (processName.Contains("resharper")) return false;

NzbDrone.Common/IISProvider.cs

@@ -118,7 +118,7 @@ namespace NzbDrone.Common
         private void OnOutputDataReceived(object s, DataReceivedEventArgs e)
         {
             if (e == null || String.IsNullOrWhiteSpace(e.Data) || e.Data.StartsWith("Request started:") ||
-                e.Data.StartsWith("Request ended:") || e.Data == ("IncrementMessages called") || e.Data == "iisexpress" || e.Data == "nzbdrone")
+                e.Data.StartsWith("Request ended:") || e.Data == ("IncrementMessages called"))
                 return;
 
             Console.WriteLine(e.Data);

NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs

@@ -4,10 +4,12 @@ using System.Linq;
 using System;
 using System.Collections.Generic;
 using System.Threading;
+using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Core.Jobs;
 using NzbDrone.Core.Model;
+using NzbDrone.Core.Repository;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
 using NzbDrone.Test.Common.AutoMoq;
@@ -282,6 +284,27 @@ namespace NzbDrone.Core.Test.ProviderTests.JobProviderTests
             timers[0].Enable.Should().BeTrue();
         }
 
+        [Test]
+        public void inti_should_removed_jobs_that_no_longer_exist()
+        {
+            IList<IJob> fakeJobs = new List<IJob> { fakeJob };
+            Mocker.SetConstant(fakeJobs);
+            
+            WithRealDb();
+            var deletedJob = Builder<JobDefinition>.CreateNew().Build();
+            Db.Insert(deletedJob);
+            var jobProvider = Mocker.Resolve<JobProvider>();
+            
+            //Act
+            jobProvider.Initialize();
+
+            //Assert
+            var registeredJobs = Db.Fetch<JobDefinition>();
+            registeredJobs.Should().HaveCount(1);
+            registeredJobs.Should().NotContain(c => c.Name == deletedJob.Name);
+
+        }
+
         [Test]
         public void jobs_with_zero_interval_are_registered_as_disabled()
         {
@@ -296,24 +319,6 @@ namespace NzbDrone.Core.Test.ProviderTests.JobProviderTests
             jobProvider.All().First().Enable.Should().BeFalse();
         }
 
-        [Test]
-        public void Get_Next_Execution_Time()
-        {
-            IList<IJob> BaseFakeJobs = new List<IJob> { fakeJob };
-            Mocker.SetConstant(BaseFakeJobs);
-
-            //Act
-            var jobProvider = Mocker.Resolve<JobProvider>();
-            jobProvider.Initialize();
-            jobProvider.QueueScheduled();
-            WaitForQueue();
-
-            //Assert
-            var next = jobProvider.NextScheduledRun(typeof(FakeJob));
-            jobProvider.All().Should().HaveCount(1);
-            jobProvider.All().First().LastExecution.Should().Be(next.AddMinutes(-fakeJob.DefaultInterval));
-        }
-
         [Test]
         public void disabled_jobs_arent_run_by_scheduler()
         {
@@ -432,4 +437,4 @@ namespace NzbDrone.Core.Test.ProviderTests.JobProviderTests
     }
 
 
-}
+}

NzbDrone.Core/Jobs/JobProvider.cs

@@ -64,40 +64,45 @@ namespace NzbDrone.Core.Jobs
             }
         }
 
-        /// <summary>
-        /// Returns a list of all registered jobs
-        /// </summary>
         public virtual List<JobDefinition> All()
         {
             return _database.Fetch<JobDefinition>().ToList();
         }
 
-        /// <summary>
-        /// Initializes jobs in the database using the IJob instances that are
-        /// registered using ninject
-        /// </summary>
         public virtual void Initialize()
         {
-            logger.Debug("Initializing jobs. Count {0}", _jobs.Count());
-            var currentTimer = All();
+            var currentJobs = All();
+            logger.Debug("Initializing jobs. Available: {0} Existing:{1}", _jobs.Count(), currentJobs.Count);
 
-            foreach (var timer in _jobs)
+            foreach (var currentJob in currentJobs)
             {
-                var timerProviderLocal = timer;
-                if (!currentTimer.Exists(c => c.TypeName == timerProviderLocal.GetType().ToString()))
+                if (!_jobs.Any(c => c.Name == currentJob.Name))
+                {
+                    logger.Debug("Removing job from database '{0}'", currentJob.Name);
+                    _database.Delete(currentJob);
+                }
+            }
+
+            foreach (var job in _jobs)
+            {
+                var jobLocal = job;
+                if (!currentJobs.Exists(c => c.TypeName == jobLocal.GetType().ToString()))
                 {
                     var settings = new JobDefinition
                                        {
-                                           Enable = timerProviderLocal.DefaultInterval > 0,
-                                           TypeName = timer.GetType().ToString(),
-                                           Name = timerProviderLocal.Name,
-                                           Interval = timerProviderLocal.DefaultInterval,
+                                           Enable = jobLocal.DefaultInterval > 0,
+                                           TypeName = job.GetType().ToString(),
+                                           Name = jobLocal.Name,
+                                           Interval = jobLocal.DefaultInterval,
                                            LastExecution = DateTime.Now
                                        };
 
                     SaveDefinition(settings);
                 }
             }
+
+
+
         }
 
         /// <summary>
@@ -141,17 +146,6 @@ namespace NzbDrone.Core.Jobs
             logger.Trace("{0} Scheduled tasks have been added to the queue", pendingJobTypes.Count);
         }
 
-        /// <summary>
-        /// Gets the next scheduled run time for a specific job
-        /// (Estimated due to schedule timer)
-        /// </summary>
-        /// <returns>DateTime of next scheduled job execution</returns>
-        public virtual DateTime NextScheduledRun(Type jobType)
-        {
-            var job = All().Where(t => t.TypeName == jobType.ToString()).Single();
-            return job.LastExecution.AddMinutes(job.Interval);
-        }
-
         public virtual void QueueJob(Type jobType, int targetId = 0, int secondaryTargetId = 0)
         {
             var queueItem = new JobQueueItem

NzbDrone/ApplicationServer.cs

@@ -64,17 +64,6 @@ namespace NzbDrone
                     Logger.ErrorException("Failed to open URL in default browser.", e);
                 }
             }
-            else
-            {
-                try
-                {
-                    _webClient.DownloadString(_iisProvider.AppUrl);
-                }
-                catch (Exception e)
-                {
-                    Logger.ErrorException("Failed to load home page.", e);
-                }
-            }
 
             _monitoringProvider.Start();
         }

NzbDrone/NzbDrone.csproj

@@ -94,7 +94,13 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
+    <None Include="ServiceInstall.bat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
+    <None Include="ServiceUninstall.bat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Content Include="NzbDrone.ico" />

NzbDrone/ServiceInstall.bat

@@ -0,0 +1,4 @@
+@ECHO OFF
+nzbdrone.exe /i
+net start nzbdrone
+pause

NzbDrone/ServiceUninstall.bat

@@ -0,0 +1,4 @@
+@ECHO OFF
+net stop nzbdrone
+nzbdrone.exe /u
+pause