mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'markus101'

This commit is contained in:
kay.one 2011-06-26 20:06:26 -07:00
parent 834a5ab6e6 87e9589761
commit b98aab87ae
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NzbDrone.Core.Test/TvDbProviderTest.cs
View File

@ -85,7 +85,7 @@ namespace NzbDrone.Core.Test
}
//assert
seasonsNumbers.Should().HaveCount(7);
seasonsNumbers.Should().HaveCount(8);
seasons[1].Should().HaveCount(23);
seasons[2].Should().HaveCount(19);
seasons[3].Should().HaveCount(16);

4
NzbDrone.Core/Providers/Jobs/PostDownloadScanJob.cs
View File

@ -84,6 +84,10 @@ namespace NzbDrone.Core.Providers.Jobs
var importedFiles = _diskScanProvider.Scan(series, subfolder);
importedFiles.ForEach(file => _diskScanProvider.MoveEpisodeFile(file));
//Delete the folder only if all files were removed
if (_diskProvider.GetFiles(subfolder, "*.*", SearchOption.AllDirectories).Length == 0)
_diskProvider.DeleteFolder(subfolder, false);
}
Logger.Debug("New Download Scan Job completed successfully");

2
NzbDrone.Web/Controllers/AddSeriesController.cs
View File

@ -54,7 +54,7 @@ namespace NzbDrone.Web.Controllers
{
Path = r.Path,
CleanPath = r.Path.Replace(Path.DirectorySeparatorChar, '|').Replace(Path.VolumeSeparatorChar, '^').Replace('\'', '`')
}).ToList();
});
ViewData["RootDirs"] = rootDirs;
ViewData["DirSep"] = Path.DirectorySeparatorChar.ToString().Replace(Path.DirectorySeparatorChar, '|');