From 030c6fb7b759356a13b920eafa0ad4acd848d03c Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 8 Apr 2011 08:20:45 -0700 Subject: [PATCH] Removed ITimerProvider --- NzbDrone.Core/CentralDispatch.cs | 4 +-- NzbDrone.Core/NzbDrone.Core.csproj | 1 - NzbDrone.Core/Providers/ITimerProvider.cs | 19 ----------- NzbDrone.Core/Providers/TimerProvider.cs | 34 ++++++++++---------- NzbDrone.Web/Controllers/SharedController.cs | 4 +-- 5 files changed, 21 insertions(+), 41 deletions(-) delete mode 100644 NzbDrone.Core/Providers/ITimerProvider.cs diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs index 5450655c1..f4239eb42 100644 --- a/NzbDrone.Core/CentralDispatch.cs +++ b/NzbDrone.Core/CentralDispatch.cs @@ -78,7 +78,7 @@ namespace NzbDrone.Core _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); _kernel.Bind().To().InSingletonScope(); - _kernel.Bind().To().InSingletonScope(); + _kernel.Bind().To().InSingletonScope(); _kernel.Bind().ToMethod(c => new SimpleRepository(dbProvider, SimpleRepositoryOptions.RunMigrations)).InSingletonScope(); _kernel.Bind().ToConstant(logRepository).WhenInjectedInto().InSingletonScope(); @@ -90,7 +90,7 @@ namespace NzbDrone.Core //Get the Timers going var config = _kernel.Get(); - var timer = _kernel.Get(); + var timer = _kernel.Get(); timer.SetRssSyncTimer(Convert.ToInt32(config.GetValue("SyncFrequency", "15", true))); timer.StartRssSyncTimer(); } diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj index f2925292f..979940eea 100644 --- a/NzbDrone.Core/NzbDrone.Core.csproj +++ b/NzbDrone.Core/NzbDrone.Core.csproj @@ -190,7 +190,6 @@ - diff --git a/NzbDrone.Core/Providers/ITimerProvider.cs b/NzbDrone.Core/Providers/ITimerProvider.cs deleted file mode 100644 index ca6d56bdb..000000000 --- a/NzbDrone.Core/Providers/ITimerProvider.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace NzbDrone.Core.Providers -{ - public interface ITimerProvider - { - void ResetRssSyncTimer(); - void StartRssSyncTimer(); - void StopRssSyncTimer(); - void SetRssSyncTimer(int minutes); - TimeSpan RssSyncTimeLeft(); - DateTime NextRssSyncTime(); - void StartMinuteTimer(); - void StopMinuteTimer(); - } -} diff --git a/NzbDrone.Core/Providers/TimerProvider.cs b/NzbDrone.Core/Providers/TimerProvider.cs index 2aeccb290..e9b8d6f58 100644 --- a/NzbDrone.Core/Providers/TimerProvider.cs +++ b/NzbDrone.Core/Providers/TimerProvider.cs @@ -8,7 +8,7 @@ using NzbDrone.Core.Model.Notification; namespace NzbDrone.Core.Providers { - public class TimerProvider : ITimerProvider + public class TimerProvider { private readonly IRssSyncProvider _rssSyncProvider; private readonly ISeriesProvider _seriesProvider; @@ -33,15 +33,15 @@ namespace NzbDrone.Core.Providers _minuteTimer = new Timer(60000); } - #region ITimerProvider Members + #region TimerProvider Members - public void ResetRssSyncTimer() + public virtual void ResetRssSyncTimer() { double interval = _rssSyncTimer.Interval; _rssSyncTimer.Interval = interval; } - - public void StartRssSyncTimer() + + public virtual void StartRssSyncTimer() { if (_rssSyncTimer.Interval < 900000) //If Timer is less than 15 minutes, throw an error! This should also be handled when saving the config, though a user could by-pass it by editing the DB directly... TNO (Trust No One) { @@ -53,35 +53,35 @@ namespace NzbDrone.Core.Providers _rssSyncTimer.Start(); _rssSyncNextInterval = DateTime.Now.AddMilliseconds(_rssSyncTimer.Interval); } - - public void StopRssSyncTimer() + + public virtual void StopRssSyncTimer() { _rssSyncTimer.Stop(); } - - public void SetRssSyncTimer(int minutes) + + public virtual void SetRssSyncTimer(int minutes) { long ms = minutes * 60 * 1000; _rssSyncTimer.Interval = ms; } - - public TimeSpan RssSyncTimeLeft() + + public virtual TimeSpan RssSyncTimeLeft() { return _rssSyncNextInterval.Subtract(DateTime.Now); } - - public DateTime NextRssSyncTime() + + public virtual DateTime NextRssSyncTime() { return _rssSyncNextInterval; } - - public void StartMinuteTimer() + + public virtual void StartMinuteTimer() { _minuteTimer.Elapsed += new ElapsedEventHandler(MinuteTimer_Elapsed); _minuteTimer.Start(); } - - public void StopMinuteTimer() + + public virtual void StopMinuteTimer() { _minuteTimer.Stop(); } diff --git a/NzbDrone.Web/Controllers/SharedController.cs b/NzbDrone.Web/Controllers/SharedController.cs index 8a92bfb52..79e235a05 100644 --- a/NzbDrone.Web/Controllers/SharedController.cs +++ b/NzbDrone.Web/Controllers/SharedController.cs @@ -9,9 +9,9 @@ namespace NzbDrone.Web.Controllers { public class SharedController : Controller { - private ITimerProvider _timerProvider; + private TimerProvider _timerProvider; - public SharedController(ITimerProvider timerProvider) + public SharedController(TimerProvider timerProvider) { _timerProvider = timerProvider; }