From f56bf629919b4517f226f4b3c1e43ad4735078f6 Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Tue, 13 Dec 2011 17:03:49 -0800
Subject: [PATCH] JobProvider.Initialize will now update existing jobs.

---
 .../JobProviderTests/JobProviderFixture.cs    | 27 +++++++++++++++++++
 NzbDrone.Core/Jobs/JobProvider.cs             | 26 +++++++++---------
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs b/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs
index 82b2fe868..2094579bb 100644
--- a/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/JobProviderTests/JobProviderFixture.cs
@@ -326,6 +326,33 @@ namespace NzbDrone.Core.Test.ProviderTests.JobProviderTests
             registeredJobs.Should().NotContain(c => c.TypeName == deletedJob.TypeName);
         }
 
+        [Test]
+        public void init_should_update_existing_job()
+        {
+            IList<IJob> fakeJobs = new List<IJob> { fakeJob };
+            Mocker.SetConstant(fakeJobs);
+
+            WithRealDb();
+            var initialFakeJob = Builder<JobDefinition>.CreateNew()
+                .With(c => c.Name = fakeJob.Name)
+                .With(c => c.TypeName = fakeJob.GetType().ToString())
+                .With(c => c.Interval = 60)
+                .Build();
+
+            var id = Convert.ToInt32(Db.Insert(initialFakeJob));
+
+            var jobProvider = Mocker.Resolve<JobProvider>();
+
+            //Act
+            jobProvider.Initialize();
+
+            //Assert
+            var registeredJobs = Db.Fetch<JobDefinition>();
+            registeredJobs.Should().HaveCount(1);
+            registeredJobs.First().Interval.Should().Be(fakeJob.DefaultInterval);
+            registeredJobs.First().Id.Should().Be(id);
+        }
+
         [Test]
         public void jobs_with_zero_interval_are_registered_as_disabled()
         {
diff --git a/NzbDrone.Core/Jobs/JobProvider.cs b/NzbDrone.Core/Jobs/JobProvider.cs
index 4a8e28e0b..6507f0120 100644
--- a/NzbDrone.Core/Jobs/JobProvider.cs
+++ b/NzbDrone.Core/Jobs/JobProvider.cs
@@ -86,23 +86,23 @@ namespace NzbDrone.Core.Jobs
             foreach (var job in _jobs)
             {
                 var jobLocal = job;
-                if (!currentJobs.Exists(c => c.TypeName == jobLocal.GetType().ToString()))
+
+                var settings = new JobDefinition
                 {
-                    var settings = new JobDefinition
-                                       {
-                                           Enable = jobLocal.DefaultInterval > 0,
-                                           TypeName = job.GetType().ToString(),
-                                           Name = jobLocal.Name,
-                                           Interval = jobLocal.DefaultInterval,
-                                           LastExecution = DateTime.Now
-                                       };
+                    Enable = jobLocal.DefaultInterval > 0,
+                    TypeName = job.GetType().ToString(),
+                    Name = jobLocal.Name,
+                    Interval = jobLocal.DefaultInterval,
+                    LastExecution = DateTime.Now
+                };
 
-                    SaveDefinition(settings);
+                if (currentJobs.Exists(c => c.TypeName == jobLocal.GetType().ToString()))
+                {
+                    settings.Id = currentJobs.Single(c => c.TypeName == jobLocal.GetType().ToString()).Id;
                 }
+
+                SaveDefinition(settings);
             }
-
-
-
         }
 
         /// <summary>