From a866c419e1eb04558ea0c3242e31ad0da0799474 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Sun, 24 Feb 2013 12:34:24 -0800 Subject: [PATCH] removed ExternalNotification.OnRename since it wasn't being used. --- NzbDrone.Core/Providers/DiskScanProvider.cs | 10 +--------- .../ExternalNotification/ExternalNotificationBase.cs | 9 --------- NzbDrone.Core/Providers/ExternalNotification/Growl.cs | 4 ---- NzbDrone.Core/Providers/ExternalNotification/Plex.cs | 5 ----- NzbDrone.Core/Providers/ExternalNotification/Prowl.cs | 5 ----- NzbDrone.Core/Providers/ExternalNotification/Smtp.cs | 5 +---- .../Providers/ExternalNotification/Twitter.cs | 5 ----- NzbDrone.Core/Providers/ExternalNotification/Xbmc.cs | 5 ----- .../Providers/ExternalNotificationProvider.cs | 8 -------- 9 files changed, 2 insertions(+), 54 deletions(-) diff --git a/NzbDrone.Core/Providers/DiskScanProvider.cs b/NzbDrone.Core/Providers/DiskScanProvider.cs index 677b7c057..a80f2d721 100644 --- a/NzbDrone.Core/Providers/DiskScanProvider.cs +++ b/NzbDrone.Core/Providers/DiskScanProvider.cs @@ -5,8 +5,6 @@ using NLog; using NzbDrone.Common; using NzbDrone.Core.Configuration; -using NzbDrone.Core.Datastore; -using NzbDrone.Core.Download; using NzbDrone.Core.Tv; using NzbDrone.Core.Model; @@ -20,7 +18,6 @@ public class DiskScanProvider private readonly IEpisodeService _episodeService; private readonly MediaFileProvider _mediaFileProvider; private readonly ExternalNotificationProvider _externalNotificationProvider; - private readonly DownloadProvider _downloadProvider; private readonly SignalRProvider _signalRProvider; private readonly IConfigService _configService; private readonly RecycleBinProvider _recycleBinProvider; @@ -28,7 +25,7 @@ public class DiskScanProvider private readonly ISeriesRepository _seriesRepository; public DiskScanProvider(DiskProvider diskProvider, IEpisodeService episodeService, MediaFileProvider mediaFileProvider, - ExternalNotificationProvider externalNotificationProvider, DownloadProvider downloadProvider, + ExternalNotificationProvider externalNotificationProvider, SignalRProvider signalRProvider, IConfigService configService, RecycleBinProvider recycleBinProvider, MediaInfoProvider mediaInfoProvider, ISeriesRepository seriesRepository) { @@ -36,7 +33,6 @@ public DiskScanProvider(DiskProvider diskProvider, IEpisodeService episodeServic _episodeService = episodeService; _mediaFileProvider = mediaFileProvider; _externalNotificationProvider = externalNotificationProvider; - _downloadProvider = downloadProvider; _signalRProvider = signalRProvider; _configService = configService; _recycleBinProvider = recycleBinProvider; @@ -241,10 +237,6 @@ public virtual EpisodeFile MoveEpisodeFile(EpisodeFile episodeFile, bool newDown foreach (var episode in episodes) _signalRProvider.UpdateEpisodeStatus(episode.OID, EpisodeStatusType.Ready, parseResult.Quality); } - else - { - _externalNotificationProvider.OnRename(message, series); - } return episodeFile; } diff --git a/NzbDrone.Core/Providers/ExternalNotification/ExternalNotificationBase.cs b/NzbDrone.Core/Providers/ExternalNotification/ExternalNotificationBase.cs index a5ff34a1a..687a398d4 100644 --- a/NzbDrone.Core/Providers/ExternalNotification/ExternalNotificationBase.cs +++ b/NzbDrone.Core/Providers/ExternalNotification/ExternalNotificationBase.cs @@ -1,8 +1,6 @@ using NLog; using NzbDrone.Core.Configuration; using NzbDrone.Core.Tv; -using NzbDrone.Core.Providers.Core; -using NzbDrone.Core.Repository; namespace NzbDrone.Core.Providers.ExternalNotification { @@ -35,13 +33,6 @@ protected ExternalNotificationBase(IConfigService configService) /// The Series for the new download public abstract void OnDownload(string message, Series series); - /// - /// Performs the on rename action - /// - /// The message to send to the receiver - /// The Series for the new download - public abstract void OnRename(string message, Series series); - /// /// Performs the after rename action, this will be handled after all renaming for episode/season/series /// diff --git a/NzbDrone.Core/Providers/ExternalNotification/Growl.cs b/NzbDrone.Core/Providers/ExternalNotification/Growl.cs index a3af9d79d..c69105553 100644 --- a/NzbDrone.Core/Providers/ExternalNotification/Growl.cs +++ b/NzbDrone.Core/Providers/ExternalNotification/Growl.cs @@ -68,10 +68,6 @@ public override void OnDownload(string message, Series series) } } - public override void OnRename(string message, Series series) - { - - } public override void AfterRename(string message, Series series) { diff --git a/NzbDrone.Core/Providers/ExternalNotification/Plex.cs b/NzbDrone.Core/Providers/ExternalNotification/Plex.cs index cfba4a919..63e9dc713 100644 --- a/NzbDrone.Core/Providers/ExternalNotification/Plex.cs +++ b/NzbDrone.Core/Providers/ExternalNotification/Plex.cs @@ -46,11 +46,6 @@ public override void OnDownload(string message, Series series) UpdateIfEnabled(); } - public override void OnRename(string message, Series series) - { - - } - public override void AfterRename(string message, Series series) { UpdateIfEnabled(); diff --git a/NzbDrone.Core/Providers/ExternalNotification/Prowl.cs b/NzbDrone.Core/Providers/ExternalNotification/Prowl.cs index 239e2b674..8fc5963e1 100644 --- a/NzbDrone.Core/Providers/ExternalNotification/Prowl.cs +++ b/NzbDrone.Core/Providers/ExternalNotification/Prowl.cs @@ -67,11 +67,6 @@ public override void OnDownload(string message, Series series) } } - public override void OnRename(string message, Series series) - { - - } - public override void AfterRename(string message, Series series) { diff --git a/NzbDrone.Core/Providers/ExternalNotification/Smtp.cs b/NzbDrone.Core/Providers/ExternalNotification/Smtp.cs index af7811dcd..bab398ac7 100644 --- a/NzbDrone.Core/Providers/ExternalNotification/Smtp.cs +++ b/NzbDrone.Core/Providers/ExternalNotification/Smtp.cs @@ -43,10 +43,7 @@ public override void OnDownload(string message, Series series) } } - public override void OnRename(string message, Series series) - { - - } + public override void AfterRename(string message, Series series) { diff --git a/NzbDrone.Core/Providers/ExternalNotification/Twitter.cs b/NzbDrone.Core/Providers/ExternalNotification/Twitter.cs index 9fa75713c..8b9070c0f 100644 --- a/NzbDrone.Core/Providers/ExternalNotification/Twitter.cs +++ b/NzbDrone.Core/Providers/ExternalNotification/Twitter.cs @@ -39,11 +39,6 @@ public override void OnDownload(string message, Series series) } } - public override void OnRename(string message, Series series) - { - - } - public override void AfterRename(string message, Series series) { diff --git a/NzbDrone.Core/Providers/ExternalNotification/Xbmc.cs b/NzbDrone.Core/Providers/ExternalNotification/Xbmc.cs index 97cb4a99f..309621b9c 100644 --- a/NzbDrone.Core/Providers/ExternalNotification/Xbmc.cs +++ b/NzbDrone.Core/Providers/ExternalNotification/Xbmc.cs @@ -45,11 +45,6 @@ public override void OnDownload(string message, Series series) UpdateAndClean(series); } - public override void OnRename(string message, Series series) - { - - } - public override void AfterRename(string message, Series series) { UpdateAndClean(series); diff --git a/NzbDrone.Core/Providers/ExternalNotificationProvider.cs b/NzbDrone.Core/Providers/ExternalNotificationProvider.cs index 09718ace3..1f8ed07aa 100644 --- a/NzbDrone.Core/Providers/ExternalNotificationProvider.cs +++ b/NzbDrone.Core/Providers/ExternalNotificationProvider.cs @@ -95,14 +95,6 @@ public virtual void OnDownload(string message, Series series) } } - public virtual void OnRename(string message, Series series) - { - foreach (var notifier in _notifiers.Where(i => GetSettings(i.GetType()).Enable)) - { - notifier.OnRename(message, series); - } - } - public virtual void AfterRename(string message, Series series) { foreach (var notifier in _notifiers.Where(i => GetSettings(i.GetType()).Enable))