mirror/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2024-12-30 19:56:54 +00:00
Code Issues Releases Wiki Activity

Verify disk scan won't scan if root folder doesn't exist

Browse source
This commit is contained in:
Mark McDowall 2014-07-24 18:02:47 -07:00
parent 638c149b62
commit 08b2e293d3
4 changed files with 48 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs Normal file
View file

@ -0,0 +1,44 @@
using System;
using System.IO;
using FizzWare.NBuilder;
using Moq;
using NUnit.Framework;
using NzbDrone.Common.Disk;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.MediaFiles.Commands;
using NzbDrone.Core.Messaging.Commands;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Core.Tv;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
{
[TestFixture]
public class ScanFixture : CoreTest<DiskScanService>
{
private Series _series;
[SetUp]
public void Setup()
{
_series = Builder<Series>.CreateNew()
.With(s => s.Path = @"C:\Test\TV\Series")
.Build();
Mocker.GetMock<IDiskProvider>()
.Setup(s => s.GetParentFolder(It.IsAny<String>()))
.Returns((String path) => Directory.GetParent(path).FullName);
}
[Test]
public void should_not_scan_if_series_root_folder_does_not_exist()
{
Subject.Scan(_series);
ExceptionVerification.ExpectedWarns(1);
Mocker.GetMock<ICommandExecutor>()
.Verify(v => v.PublishCommand(It.IsAny<CleanMediaFileDb>()), Times.Never());
}
}
}

1
src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
View file

@ -155,6 +155,7 @@
<Compile Include="JobTests\TestJobs.cs" />
<Compile Include="MediaCoverTests\CoverExistsSpecificationFixture.cs" />
<Compile Include="MediaCoverTests\MediaCoverServiceFixture.cs" />
<Compile Include="MediaFiles\DiskScanServiceTests\ScanFixture.cs" />
<Compile Include="MediaFiles\EpisodeFileMovingServiceTests\MoveEpisodeFileFixture.cs" />
<Compile Include="MediaFiles\EpisodeImport\Specifications\FullSeasonSpecificationFixture.cs" />
<Compile Include="MediaFiles\EpisodeImport\Specifications\FreeSpaceSpecificationFixture.cs" />

4
src/NzbDrone.Core/Configuration/ConfigFileProvider.cs
View file

@ -168,9 +168,9 @@ namespace NzbDrone.Core.Configuration
{
get
{
var urlBase = GetValue("UrlBase", "");
var urlBase = GetValue("UrlBase", "").Trim('/');
if (String.IsNullOrEmpty(urlBase))
if (urlBase.IsNullOrWhiteSpace())
{
return urlBase;
}

4
src/NzbDrone.Core/MediaFiles/DiskScanService.cs
View file

@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics;
using System.IO;
using System.Linq;
using NLog;