Fixed: Root folder existence for import lists health check

pull/7359/head
Bogdan 4 months ago committed by Mark McDowall
parent 8d4ba77b12
commit 832de3e75e

@ -1,13 +1,20 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using NzbDrone.Common.Disk; using NzbDrone.Common.Disk;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Datastore.Events;
using NzbDrone.Core.ImportLists; using NzbDrone.Core.ImportLists;
using NzbDrone.Core.Localization; using NzbDrone.Core.Localization;
using NzbDrone.Core.MediaFiles.Events; using NzbDrone.Core.MediaFiles.Events;
using NzbDrone.Core.RootFolders;
using NzbDrone.Core.ThingiProvider.Events;
using NzbDrone.Core.Tv.Events; using NzbDrone.Core.Tv.Events;
namespace NzbDrone.Core.HealthCheck.Checks namespace NzbDrone.Core.HealthCheck.Checks
{ {
[CheckOn(typeof(ProviderUpdatedEvent<IImportList>))]
[CheckOn(typeof(ProviderDeletedEvent<IImportList>))]
[CheckOn(typeof(ModelEvent<RootFolder>))]
[CheckOn(typeof(SeriesDeletedEvent))] [CheckOn(typeof(SeriesDeletedEvent))]
[CheckOn(typeof(SeriesMovedEvent))] [CheckOn(typeof(SeriesMovedEvent))]
[CheckOn(typeof(EpisodeImportedEvent), CheckOnCondition.FailedOnly)] [CheckOn(typeof(EpisodeImportedEvent), CheckOnCondition.FailedOnly)]
@ -16,17 +23,21 @@ namespace NzbDrone.Core.HealthCheck.Checks
{ {
private readonly IImportListFactory _importListFactory; private readonly IImportListFactory _importListFactory;
private readonly IDiskProvider _diskProvider; private readonly IDiskProvider _diskProvider;
private readonly IRootFolderService _rootFolderService;
public ImportListRootFolderCheck(IImportListFactory importListFactory, IDiskProvider diskProvider, ILocalizationService localizationService) public ImportListRootFolderCheck(IImportListFactory importListFactory, IDiskProvider diskProvider, IRootFolderService rootFolderService, ILocalizationService localizationService)
: base(localizationService) : base(localizationService)
{ {
_importListFactory = importListFactory; _importListFactory = importListFactory;
_diskProvider = diskProvider; _diskProvider = diskProvider;
_rootFolderService = rootFolderService;
} }
public override HealthCheck Check() public override HealthCheck Check()
{ {
var importLists = _importListFactory.All(); var importLists = _importListFactory.All();
var rootFolders = _rootFolderService.All();
var missingRootFolders = new Dictionary<string, List<ImportListDefinition>>(); var missingRootFolders = new Dictionary<string, List<ImportListDefinition>>();
foreach (var importList in importLists) foreach (var importList in importLists)
@ -40,7 +51,10 @@ namespace NzbDrone.Core.HealthCheck.Checks
continue; continue;
} }
if (!_diskProvider.FolderExists(rootFolderPath)) if (rootFolderPath.IsNullOrWhiteSpace() ||
!rootFolderPath.IsPathValid(PathValidationType.CurrentOs) ||
!rootFolders.Any(r => r.Path.PathEquals(rootFolderPath)) ||
!_diskProvider.FolderExists(rootFolderPath))
{ {
missingRootFolders.Add(rootFolderPath, new List<ImportListDefinition> { importList }); missingRootFolders.Add(rootFolderPath, new List<ImportListDefinition> { importList });
} }

Loading…
Cancel
Save