From ff6841e410635d5411ac509ff86f4a9432eb970a Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Wed, 21 Jun 2017 19:35:32 +0200 Subject: [PATCH] Fixed: Added permanent Health Check warning to ensure Drone Factory is no longer used. --- .../Checks/DeprecatedDroneFactoryCheck.cs | 30 +++++++++++++++++++ src/NzbDrone.Core/NzbDrone.Core.csproj | 1 + .../DroneFactory/DroneFactoryViewTemplate.hbs | 3 ++ 3 files changed, 34 insertions(+) create mode 100644 src/NzbDrone.Core/HealthCheck/Checks/DeprecatedDroneFactoryCheck.cs diff --git a/src/NzbDrone.Core/HealthCheck/Checks/DeprecatedDroneFactoryCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/DeprecatedDroneFactoryCheck.cs new file mode 100644 index 000000000..2278cdc53 --- /dev/null +++ b/src/NzbDrone.Core/HealthCheck/Checks/DeprecatedDroneFactoryCheck.cs @@ -0,0 +1,30 @@ +using NzbDrone.Common.Disk; +using NzbDrone.Common.Extensions; +using NzbDrone.Core.Configuration; +using NzbDrone.Core.Configuration.Events; + +namespace NzbDrone.Core.HealthCheck.Checks +{ + [CheckOn(typeof(ConfigSavedEvent))] + public class DeprecatedDroneFactoryCheck : HealthCheckBase + { + private readonly IConfigService _configService; + + public DeprecatedDroneFactoryCheck(IConfigService configService) + { + _configService = configService; + } + + public override HealthCheck Check() + { + var droneFactoryFolder = _configService.DownloadedEpisodesFolder; + + if (droneFactoryFolder.IsNullOrWhiteSpace()) + { + return new HealthCheck(GetType()); + } + + return new HealthCheck(GetType(), HealthCheckResult.Warning, "Drone Factory is deprecated and should not be used", "#drone-factory-is-deprecated"); + } + } +} diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index ec0356692..3fe77287a 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -566,6 +566,7 @@ + diff --git a/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs b/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs index 9043ad2f5..b7c39170c 100644 --- a/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs +++ b/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs @@ -1,5 +1,8 @@
Drone Factory Options +
+ Drone Factory is deprecated and should be disabled, use Wanted->Manual Import to manually import arbitrary directories. See Wiki. +