From 34f7b9ca7dde3b3828ac079ce3b6d1e8a721cfe4 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Sun, 8 May 2011 14:49:15 -0700 Subject: [PATCH] removed some warnings, logging tweaks --- NzbDrone.Core.Test/MediaFileProviderTests.cs | 2 -- .../XbmcNotificationProvider.cs | 22 +++++++------------ .../Providers/Indexer/IndexerProviderBase.cs | 1 + NzbDrone.Core/Providers/SabProvider.cs | 4 +++- 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/NzbDrone.Core.Test/MediaFileProviderTests.cs b/NzbDrone.Core.Test/MediaFileProviderTests.cs index d6764f6ca..becfc86b0 100644 --- a/NzbDrone.Core.Test/MediaFileProviderTests.cs +++ b/NzbDrone.Core.Test/MediaFileProviderTests.cs @@ -135,8 +135,6 @@ namespace NzbDrone.Core.Test //Constants const string fileName = @"WEEDS.S03E01.DUAL.BDRip.XviD.AC3.-HELLYWOOD.avi"; - const int seasonNumber = 3; - const int episodeNumner = 1; const int size = 12345; //Fakes diff --git a/NzbDrone.Core/Providers/ExternalNotification/XbmcNotificationProvider.cs b/NzbDrone.Core/Providers/ExternalNotification/XbmcNotificationProvider.cs index 9e84f9fcb..bcb2bd369 100644 --- a/NzbDrone.Core/Providers/ExternalNotification/XbmcNotificationProvider.cs +++ b/NzbDrone.Core/Providers/ExternalNotification/XbmcNotificationProvider.cs @@ -1,23 +1,17 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using NLog; -using NzbDrone.Core.Helpers; using NzbDrone.Core.Providers.Core; namespace NzbDrone.Core.Providers.ExternalNotification { public class XbmcNotificationProvider : ExternalNotificationProviderBase { - private readonly Logger _logger; private readonly XbmcProvider _xbmcProvider; public XbmcNotificationProvider(ConfigProvider configProvider, XbmcProvider xbmcProvider, - ExternalNotificationProvider externalNotificationProvider) : base(configProvider, externalNotificationProvider) + ExternalNotificationProvider externalNotificationProvider) + : base(configProvider, externalNotificationProvider) { _xbmcProvider = xbmcProvider; - _logger = LogManager.GetLogger(GetType().ToString()); } public override string Name @@ -27,13 +21,13 @@ namespace NzbDrone.Core.Providers.ExternalNotification public override void OnGrab(string message) { - var header = "NzbDrone [TV] - Grabbed"; + const string header = "NzbDrone [TV] - Grabbed"; if (Convert.ToBoolean(_configProvider.GetValue("XbmcEnabled", false, true))) { if (Convert.ToBoolean(_configProvider.GetValue("XbmcNotifyOnGrab", false, true))) { - _logger.Trace("Sending Notifcation to XBMC"); + _logger.Trace("Sending Notification to XBMC"); _xbmcProvider.Notify(header, message); return; } @@ -45,13 +39,13 @@ namespace NzbDrone.Core.Providers.ExternalNotification public override void OnDownload(string message, int seriesId) { - var header = "NzbDrone [TV] - Downloaded"; + const string header = "NzbDrone [TV] - Downloaded"; if (Convert.ToBoolean(_configProvider.GetValue("XbmcEnabled", false, true))) { if (Convert.ToBoolean(_configProvider.GetValue("XbmcNotifyOnDownload", false, true))) { - _logger.Trace("Sending Notifcation to XBMC"); + _logger.Trace("Sending Notification to XBMC"); _xbmcProvider.Notify(header, message); } @@ -73,11 +67,11 @@ namespace NzbDrone.Core.Providers.ExternalNotification public override void OnRename(string message, int seriesId) { - var header = "NzbDrone [TV] - Renamed"; + const string header = "NzbDrone [TV] - Renamed"; if (Convert.ToBoolean(_configProvider.GetValue("XbmcNotifyOnRename", false, true))) { - _logger.Trace("Sending Notifcation to XBMC"); + _logger.Trace("Sending Notification to XBMC"); _xbmcProvider.Notify(header, message); } diff --git a/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs b/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs index 5c8107e49..12762290d 100644 --- a/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs +++ b/NzbDrone.Core/Providers/Indexer/IndexerProviderBase.cs @@ -180,6 +180,7 @@ namespace NzbDrone.Core.Providers.Indexer if (!_sabProvider.AddByUrl(NzbDownloadUrl(feedItem), sabTitle)) { + _logger.Warn("Unable to add item to SAB queue. {0} {1}", NzbDownloadUrl(feedItem), sabTitle); return; } } diff --git a/NzbDrone.Core/Providers/SabProvider.cs b/NzbDrone.Core/Providers/SabProvider.cs index d58e2335e..64dd10dde 100644 --- a/NzbDrone.Core/Providers/SabProvider.cs +++ b/NzbDrone.Core/Providers/SabProvider.cs @@ -42,11 +42,13 @@ namespace NzbDrone.Core.Providers Logger.Info("Adding report [{0}] to the queue.", title); string response = _httpProvider.DownloadString(request).Replace("\n", String.Empty); - Logger.Debug("Queue Repsonse: [{0}]", response); + Logger.Debug("Queue Response: [{0}]", response); if (response == "ok") return true; + Logger.Warn("SAB returned unexpected response '{0}'", response); + return false; }