Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Use Series Folder Format to improve unmapped folders within root folders

This commit is contained in:
Mark McDowall 2023-02-04 15:18:32 -08:00
parent 119addd75f
commit 81d2b18ce1
8 changed files with 86 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/AddSeries/ImportSeries/Import/ImportSeriesRow.js
View File

@ -10,6 +10,7 @@ import styles from './ImportSeriesRow.css';
function ImportSeriesRow(props) {
const {
id,
relativePath,
monitor,
qualityProfileId,
seasonFolder,
@ -32,7 +33,7 @@ function ImportSeriesRow(props) {
/>
<VirtualTableRowCell className={styles.folder}>
{id}
{relativePath}
</VirtualTableRowCell>
<VirtualTableRowCell className={styles.monitor}>
@ -84,6 +85,7 @@ function ImportSeriesRow(props) {
ImportSeriesRow.propTypes = {
id: PropTypes.string.isRequired,
relativePath: PropTypes.string.isRequired,
monitor: PropTypes.string.isRequired,
qualityProfileId: PropTypes.number.isRequired,
seriesType: PropTypes.string.isRequired,

2
frontend/src/AddSeries/ImportSeries/Import/ImportSeriesTable.js
View File

@ -32,7 +32,7 @@ class ImportSeriesTable extends Component {
unmappedFolders.forEach((unmappedFolder) => {
const id = unmappedFolder.name;
onSeriesLookup(id, unmappedFolder.path);
onSeriesLookup(id, unmappedFolder.path, unmappedFolder.relativePath);
onSetImportSeriesValue({
id,

3
frontend/src/AddSeries/ImportSeries/Import/ImportSeriesTableConnector.js
View File

@ -26,10 +26,11 @@ function createMapStateToProps() {
function createMapDispatchToProps(dispatch, props) {
return {
onSeriesLookup(name, path) {
onSeriesLookup(name, path, relativePath) {
dispatch(queueLookupSeries({
name,
path,
relativePath,
term: name
}));
},

2
frontend/src/Store/Actions/importSeriesActions.js
View File

@ -67,6 +67,7 @@ export const actionHandlers = handleThunks({
const {
name,
path,
relativePath,
term,
topOfQueue = false
} = payload;
@ -76,6 +77,7 @@ export const actionHandlers = handleThunks({
id: name,
term,
path,
relativePath,
isFetching: false,
isPopulated: false,
error: null

51
src/NzbDrone.Core.Test/RootFolderTests/RootFolderServiceFixture.cs
View File

@ -7,6 +7,7 @@ using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Common.Disk;
using NzbDrone.Core.Organizer;
using NzbDrone.Core.RootFolders;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Tv;
@ -17,9 +18,13 @@ namespace NzbDrone.Core.Test.RootFolderTests
[TestFixture]
public class RootFolderServiceFixture : CoreTest<RootFolderService>
{
private NamingConfig _namingConfig;
[SetUp]
public void Setup()
{
_namingConfig = NamingConfig.Default;
Mocker.GetMock<IDiskProvider>()
.Setup(m => m.FolderExists(It.IsAny<string>()))
.Returns(true);
@ -31,6 +36,10 @@ namespace NzbDrone.Core.Test.RootFolderTests
Mocker.GetMock<IRootFolderRepository>()
.Setup(s => s.All())
.Returns(new List<RootFolder>());
Mocker.GetMock<INamingConfigService>()
.Setup(c => c.GetConfig())
.Returns(_namingConfig);
}
private void WithNonExistingFolder()
@ -140,5 +149,47 @@ namespace NzbDrone.Core.Test.RootFolderTests
unmappedFolders.Count.Should().BeGreaterThan(0);
unmappedFolders.Should().NotContain(u => u.Name == subFolder);
}
[Test]
public void should_get_unmapped_folders_inside_letter_subfolder()
{
_namingConfig.SeriesFolderFormat = "{Series TitleFirstCharacter}\\{Series Title}";
var rootFolderPath = @"C:\Test\TV".AsOsAgnostic();
var rootFolder = Builder<RootFolder>.CreateNew()
.With(r => r.Path = rootFolderPath)
.Build();
var subFolderPath = Path.Combine(rootFolderPath, "S");
var subFolders = new[]
{
"Series1",
"Series2",
"Series3",
};
var folders = subFolders.Select(f => Path.Combine(subFolderPath, f)).ToArray();
Mocker.GetMock<IRootFolderRepository>()
.Setup(s => s.Get(It.IsAny<int>()))
.Returns(rootFolder);
Mocker.GetMock<ISeriesRepository>()
.Setup(s => s.AllSeriesPaths())
.Returns(new Dictionary<int, string>());
Mocker.GetMock<IDiskProvider>()
.Setup(s => s.GetDirectories(rootFolder.Path))
.Returns(new[] { subFolderPath });
Mocker.GetMock<IDiskProvider>()
.Setup(s => s.GetDirectories(subFolderPath))
.Returns(folders);
var unmappedFolders = Subject.Get(rootFolder.Id, false).UnmappedFolders;
unmappedFolders.Count.Should().Be(3);
}
}
}

1
src/NzbDrone.Core/RootFolders/RootFolder.cs
View File

@ -6,7 +6,6 @@ namespace NzbDrone.Core.RootFolders
public class RootFolder : ModelBase
{
public string Path { get; set; }
public bool Accessible { get; set; }
public long? FreeSpace { get; set; }
public long? TotalSpace { get; set; }

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

@ -7,6 +7,7 @@ using NLog;
using NzbDrone.Common;
using NzbDrone.Common.Disk;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Organizer;
using NzbDrone.Core.Tv;
namespace NzbDrone.Core.RootFolders
@ -26,6 +27,7 @@ namespace NzbDrone.Core.RootFolders
private readonly IRootFolderRepository _rootFolderRepository;
private readonly IDiskProvider _diskProvider;
private readonly ISeriesRepository _seriesRepository;
private readonly INamingConfigService _namingConfigService;
private readonly Logger _logger;
private static readonly HashSet<string> SpecialFolders = new HashSet<string>
@ -44,11 +46,13 @@ namespace NzbDrone.Core.RootFolders
public RootFolderService(IRootFolderRepository rootFolderRepository,
IDiskProvider diskProvider,
ISeriesRepository seriesRepository,
INamingConfigService namingConfigService,
Logger logger)
{
_rootFolderRepository = rootFolderRepository;
_diskProvider = diskProvider;
_seriesRepository = seriesRepository;
_namingConfigService = namingConfigService;
_logger = logger;
}
@ -139,13 +143,28 @@ namespace NzbDrone.Core.RootFolders
return results;
}
var subFolderDepth = _namingConfigService.GetConfig().SeriesFolderFormat.Count(f => f == Path.DirectorySeparatorChar);
var possibleSeriesFolders = _diskProvider.GetDirectories(path).ToList();
if (subFolderDepth > 0)
{
for (int i = 0; i < subFolderDepth; i++)
{
possibleSeriesFolders = possibleSeriesFolders.SelectMany(_diskProvider.GetDirectories).ToList();
}
}
var unmappedFolders = possibleSeriesFolders.Except(seriesPaths.Select(s => s.Value), PathEqualityComparer.Instance).ToList();
foreach (string unmappedFolder in unmappedFolders)
foreach (var unmappedFolder in unmappedFolders)
{
var di = new DirectoryInfo(unmappedFolder.Normalize());
results.Add(new UnmappedFolder { Name = di.Name, Path = di.FullName });
results.Add(new UnmappedFolder
{
Name = di.Name,
Path = di.FullName,
RelativePath = path.GetRelativePath(di.FullName)
});
}
var setToRemove = SpecialFolders;
@ -181,8 +200,8 @@ namespace NzbDrone.Core.RootFolders
private void GetDetails(RootFolder rootFolder, Dictionary<int, string> seriesPaths, bool timeout)
{
Task.Run(() =>
{
// Task.Run(() =>
// {
if (_diskProvider.FolderExists(rootFolder.Path))
{
rootFolder.Accessible = true;
@ -190,7 +209,8 @@ namespace NzbDrone.Core.RootFolders
rootFolder.TotalSpace = _diskProvider.GetTotalSize(rootFolder.Path);
rootFolder.UnmappedFolders = GetUnmappedFolders(rootFolder.Path, seriesPaths);
}
}).Wait(timeout ? 5000 : -1);
// }).Wait(timeout ? 5000 : -1);
}
}
}

3
src/NzbDrone.Core/RootFolders/UnmappedFolder.cs
View File

@ -1,8 +1,9 @@
namespace NzbDrone.Core.RootFolders
namespace NzbDrone.Core.RootFolders
{
public class UnmappedFolder
{
public string Name { get; set; }
public string Path { get; set; }
public string RelativePath { get; set; }
}
}