From 6a9993fa70afcb37a010a06270ef0be9fa9b51fe Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 24 Jun 2014 23:32:26 -0700 Subject: [PATCH] Fixed: Category is not required SABnzbd or NZBGet --- src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs | 8 +++----- src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs index e99382894..6dd047f4c 100644 --- a/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs +++ b/src/NzbDrone.Core/Download/Clients/Nzbget/Nzbget.cs @@ -42,9 +42,8 @@ namespace NzbDrone.Core.Download.Clients.Nzbget { var url = remoteEpisode.Release.DownloadUrl; var title = remoteEpisode.Release.Title + ".nzb"; - - string category = Settings.TvCategory; - int priority = remoteEpisode.IsRecentEpisode() ? Settings.RecentTvPriority : Settings.OlderTvPriority; + var category = Settings.TvCategory; + var priority = remoteEpisode.IsRecentEpisode() ? Settings.RecentTvPriority : Settings.OlderTvPriority; _logger.Info("Adding report [{0}] to the queue.", title); @@ -271,10 +270,9 @@ namespace NzbDrone.Core.Download.Clients.Nzbget _proxy.GetVersion(settings); var config = _proxy.GetConfig(settings); - var categories = GetCategories(config); - if (!categories.Any(v => v.Name == settings.TvCategory)) + if (!settings.TvCategory.IsNullOrWhiteSpace() && !categories.Any(v => v.Name == settings.TvCategory)) { throw new ApplicationException("Category does not exist"); } diff --git a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs index e14c15336..5c5a05e31 100644 --- a/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs +++ b/src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs @@ -222,7 +222,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd { var categories = _proxy.GetCategories(settings); - if (!categories.Any(v => v == settings.TvCategory)) + if (!settings.TvCategory.IsNullOrWhiteSpace() && !categories.Any(v => v == settings.TvCategory)) { throw new ApplicationException("Category does not exist"); }