mirror of
https://github.com/Radarr/Radarr
synced 2024-12-27 18:30:45 +00:00
Fixed: Do not scan series folder if root folder is empty
This commit is contained in:
parent
b2cfc065b9
commit
d277420849
2 changed files with 40 additions and 11 deletions
|
@ -30,8 +30,8 @@ public void Setup()
|
||||||
.Build();
|
.Build();
|
||||||
|
|
||||||
Mocker.GetMock<IDiskProvider>()
|
Mocker.GetMock<IDiskProvider>()
|
||||||
.Setup(s => s.GetParentFolder(It.IsAny<String>()))
|
.Setup(s => s.GetParentFolder(It.IsAny<string>()))
|
||||||
.Returns((String path) => Directory.GetParent(path).FullName);
|
.Returns((string path) => Directory.GetParent(path).FullName);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -39,14 +39,18 @@ public void Setup()
|
||||||
private void GivenParentFolderExists()
|
private void GivenParentFolderExists()
|
||||||
{
|
{
|
||||||
Mocker.GetMock<IDiskProvider>()
|
Mocker.GetMock<IDiskProvider>()
|
||||||
.Setup(s => s.FolderExists(It.IsAny<String>()))
|
.Setup(s => s.FolderExists(It.IsAny<string>()))
|
||||||
.Returns(true);
|
.Returns(true);
|
||||||
|
|
||||||
|
Mocker.GetMock<IDiskProvider>()
|
||||||
|
.Setup(s => s.GetDirectories(It.IsAny<string>()))
|
||||||
|
.Returns(new string[] { @"C:\Test\TV\Series2".AsOsAgnostic() });
|
||||||
}
|
}
|
||||||
|
|
||||||
private void GivenFiles(IEnumerable<String> files)
|
private void GivenFiles(IEnumerable<string> files)
|
||||||
{
|
{
|
||||||
Mocker.GetMock<IDiskProvider>()
|
Mocker.GetMock<IDiskProvider>()
|
||||||
.Setup(s => s.GetFiles(It.IsAny<String>(), SearchOption.AllDirectories))
|
.Setup(s => s.GetFiles(It.IsAny<string>(), SearchOption.AllDirectories))
|
||||||
.Returns(files.ToArray());
|
.Returns(files.ToArray());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -61,12 +65,31 @@ public void should_not_scan_if_series_root_folder_does_not_exist()
|
||||||
.Verify(v => v.PublishCommand(It.IsAny<CleanMediaFileDb>()), Times.Never());
|
.Verify(v => v.PublishCommand(It.IsAny<CleanMediaFileDb>()), Times.Never());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void should_not_scan_if_series_root_folder_is_empty()
|
||||||
|
{
|
||||||
|
Mocker.GetMock<IDiskProvider>()
|
||||||
|
.Setup(s => s.FolderExists(It.IsAny<string>()))
|
||||||
|
.Returns(true);
|
||||||
|
|
||||||
|
Mocker.GetMock<IDiskProvider>()
|
||||||
|
.Setup(s => s.GetDirectories(It.IsAny<string>()))
|
||||||
|
.Returns(new string[0]);
|
||||||
|
|
||||||
|
Subject.Scan(_series);
|
||||||
|
|
||||||
|
ExceptionVerification.ExpectedWarns(1);
|
||||||
|
|
||||||
|
Mocker.GetMock<ICommandExecutor>()
|
||||||
|
.Verify(v => v.PublishCommand(It.IsAny<CleanMediaFileDb>()), Times.Never());
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void should_not_scan_extras_subfolder()
|
public void should_not_scan_extras_subfolder()
|
||||||
{
|
{
|
||||||
GivenParentFolderExists();
|
GivenParentFolderExists();
|
||||||
|
|
||||||
GivenFiles(new List<String>
|
GivenFiles(new List<string>
|
||||||
{
|
{
|
||||||
Path.Combine(_series.Path, "EXTRAS", "file1.mkv").AsOsAgnostic(),
|
Path.Combine(_series.Path, "EXTRAS", "file1.mkv").AsOsAgnostic(),
|
||||||
Path.Combine(_series.Path, "Extras", "file2.mkv").AsOsAgnostic(),
|
Path.Combine(_series.Path, "Extras", "file2.mkv").AsOsAgnostic(),
|
||||||
|
@ -78,7 +101,7 @@ public void should_not_scan_extras_subfolder()
|
||||||
Subject.Scan(_series);
|
Subject.Scan(_series);
|
||||||
|
|
||||||
Mocker.GetMock<IMakeImportDecision>()
|
Mocker.GetMock<IMakeImportDecision>()
|
||||||
.Verify(v => v.GetImportDecisions(It.Is<List<String>>(l => l.Count == 1), _series, false, (QualityModel)null), Times.Once());
|
.Verify(v => v.GetImportDecisions(It.Is<List<string>>(l => l.Count == 1), _series, false, (QualityModel)null), Times.Once());
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
|
@ -86,7 +109,7 @@ public void should_not_scan_AppleDouble_subfolder()
|
||||||
{
|
{
|
||||||
GivenParentFolderExists();
|
GivenParentFolderExists();
|
||||||
|
|
||||||
GivenFiles(new List<String>
|
GivenFiles(new List<string>
|
||||||
{
|
{
|
||||||
Path.Combine(_series.Path, ".AppleDouble", "file1.mkv").AsOsAgnostic(),
|
Path.Combine(_series.Path, ".AppleDouble", "file1.mkv").AsOsAgnostic(),
|
||||||
Path.Combine(_series.Path, ".appledouble", "file2.mkv").AsOsAgnostic(),
|
Path.Combine(_series.Path, ".appledouble", "file2.mkv").AsOsAgnostic(),
|
||||||
|
@ -96,7 +119,7 @@ public void should_not_scan_AppleDouble_subfolder()
|
||||||
Subject.Scan(_series);
|
Subject.Scan(_series);
|
||||||
|
|
||||||
Mocker.GetMock<IMakeImportDecision>()
|
Mocker.GetMock<IMakeImportDecision>()
|
||||||
.Verify(v => v.GetImportDecisions(It.Is<List<String>>(l => l.Count == 1), _series, false, (QualityModel)null), Times.Once());
|
.Verify(v => v.GetImportDecisions(It.Is<List<string>>(l => l.Count == 1), _series, false, (QualityModel)null), Times.Once());
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
|
@ -105,7 +128,7 @@ public void should_scan_extras_series_and_subfolders()
|
||||||
GivenParentFolderExists();
|
GivenParentFolderExists();
|
||||||
_series.Path = @"C:\Test\TV\Extras".AsOsAgnostic();
|
_series.Path = @"C:\Test\TV\Extras".AsOsAgnostic();
|
||||||
|
|
||||||
GivenFiles(new List<String>
|
GivenFiles(new List<string>
|
||||||
{
|
{
|
||||||
Path.Combine(_series.Path, "Extras", "file1.mkv").AsOsAgnostic(),
|
Path.Combine(_series.Path, "Extras", "file1.mkv").AsOsAgnostic(),
|
||||||
Path.Combine(_series.Path, ".AppleDouble", "file2.mkv").AsOsAgnostic(),
|
Path.Combine(_series.Path, ".AppleDouble", "file2.mkv").AsOsAgnostic(),
|
||||||
|
@ -118,7 +141,7 @@ public void should_scan_extras_series_and_subfolders()
|
||||||
Subject.Scan(_series);
|
Subject.Scan(_series);
|
||||||
|
|
||||||
Mocker.GetMock<IMakeImportDecision>()
|
Mocker.GetMock<IMakeImportDecision>()
|
||||||
.Verify(v => v.GetImportDecisions(It.Is<List<String>>(l => l.Count == 4), _series, false, (QualityModel)null), Times.Once());
|
.Verify(v => v.GetImportDecisions(It.Is<List<string>>(l => l.Count == 4), _series, false, (QualityModel)null), Times.Once());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,6 +69,12 @@ public void Scan(Series series)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_diskProvider.GetDirectories(rootFolder).Empty())
|
||||||
|
{
|
||||||
|
_logger.Warn("Series' root folder ({0}) is empty.", rootFolder);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
_logger.ProgressInfo("Scanning disk for {0}", series.Title);
|
_logger.ProgressInfo("Scanning disk for {0}", series.Title);
|
||||||
_commandExecutor.PublishCommand(new CleanMediaFileDb(series.Id));
|
_commandExecutor.PublishCommand(new CleanMediaFileDb(series.Id));
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue