mirror/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-01-30 16:53:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improve root folder health check

Browse Source 
Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
Signed-off-by: Robin Dadswell <robin@dadswell.email>
This commit is contained in:
Qstick
2020-12-12 21:28:59 -05:00
committed by nitsua
parent b1cfa90a9f
commit 1fbaefc054
3 changed files with 58 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/NzbDrone.Core.Test/RootFolderTests/GetBestRootFolderPathFixture.cs Normal file
View File

@@ -0,0 +1,48 @@
using System.Linq;
using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Common.Disk;
using NzbDrone.Core.RootFolders;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.RootFolderTests
{
[TestFixture]
public class GetBestRootFolderPathFixture : CoreTest<RootFolderService>
{
private void GivenRootFolders(params string[] paths)
{
Mocker.GetMock<IRootFolderRepository>()
.Setup(s => s.All())
.Returns(paths.Select(p => new RootFolder { Path = p }));
}
[Test]
public void should_return_root_folder_that_is_parent_path()
{
GivenRootFolders(@"C:\Test\Music".AsOsAgnostic(), @"D:\Test\Music".AsOsAgnostic());
Subject.GetBestRootFolderPath(@"C:\Test\Music\Series Title".AsOsAgnostic()).Should().Be(@"C:\Test\Music".AsOsAgnostic());
}
[Test]
public void should_return_root_folder_that_is_grandparent_path()
{
GivenRootFolders(@"C:\Test\Music".AsOsAgnostic(), @"D:\Test\Music".AsOsAgnostic());
Subject.GetBestRootFolderPath(@"C:\Test\Music\S\Series Title".AsOsAgnostic()).Should().Be(@"C:\Test\Music".AsOsAgnostic());
}
[Test]
public void should_get_parent_path_from_diskProvider_if_matching_root_folder_is_not_found()
{
var seriesPath = @"T:\Test\Music\Series Title".AsOsAgnostic();
GivenRootFolders(@"C:\Test\Music".AsOsAgnostic(), @"D:\Test\Music".AsOsAgnostic());
Subject.GetBestRootFolderPath(seriesPath);
Mocker.GetMock<IDiskProvider>()
.Verify(v => v.GetParentFolder(seriesPath), Times.Once);
}
}
}

15
src/NzbDrone.Core/HealthCheck/Checks/RootFolderCheck.cs
View File

@@ -16,21 +16,24 @@ public class RootFolderCheck : HealthCheckBase
private readonly IAuthorService _authorService;
private readonly IImportListFactory _importListFactory;
private readonly IDiskProvider _diskProvider;
private readonly IRootFolderService _rootFolderService;
public RootFolderCheck(IAuthorService authorService, IImportListFactory importListFactory, IDiskProvider diskProvider)
public RootFolderCheck(IArtistService authorService, IImportListFactory importListFactory, IDiskProvider diskProvider, IRootFolderService rootFolderService)
{
_authorService = authorService;
_importListFactory = importListFactory;
_diskProvider = diskProvider;
_rootFolderService = rootFolderService;
}
public override HealthCheck Check()
{
var missingRootFolders = _authorService.GetAllAuthors()
.Select(s => _diskProvider.GetParentFolder(s.Path))
.Distinct()
.Where(s => !_diskProvider.FolderExists(s))
.ToList();
var rootFolders = _artistService.GetAllAuthors()
.Select(s => _rootFolderService.GetBestRootFolderPath(s.Path))
.Distinct();
var missingRootFolders = rootFolders.Where(s => !_diskProvider.FolderExists(s))
.ToList();
missingRootFolders.AddRange(_importListFactory.All()
.Select(s => s.RootFolderPath)

2
src/NzbDrone.Core/RootFolders/RootFolderService.cs
View File

@@ -153,7 +153,7 @@ public string GetBestRootFolderPath(string path)
if (possibleRootFolder == null)
{
return Path.GetDirectoryName(path);
return _diskProvider.GetParentFolder(path);
}
return possibleRootFolder.Path;