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

Fixed some broken tests

This commit is contained in:
Mark McDowall 2013-04-11 09:13:57 -07:00
parent e43cb87620
commit b1e772d852
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NzbDrone.Core.Test/MediaFileTests/MediaFileServiceTest.cs
View File

@ -33,7 +33,7 @@ namespace NzbDrone.Core.Test.MediaFileTests
{ {
var fakeSeries = Builder<Series>.CreateNew() var fakeSeries = Builder<Series>.CreateNew()
.With(s => s.Title = "30 Rock") .With(s => s.Title = "30 Rock")
.With(s => s.RootFolder = new LazyLoaded<RootFolder>(new RootFolder { Path = @"C:\Test\TV" })) .With(s => s.RootFolder = new LazyLoaded<RootFolder>(new RootFolder { Path = @"C:\Test" }))
.With(s => s.FolderName = "30 Rock") .With(s => s.FolderName = "30 Rock")
.With(s => s.SeasonFolder = useSeasonFolder) .With(s => s.SeasonFolder = useSeasonFolder)
.Build(); .Build();

10
NzbDrone.Core/Tv/Series.cs
View File

@ -53,7 +53,15 @@ namespace NzbDrone.Core.Tv
//Todo: Use this to auto link RootFolder and Folder (using the proper path separator) //Todo: Use this to auto link RootFolder and Folder (using the proper path separator)
public string Path public string Path
{ {
get { return System.IO.Path.Combine(RootFolder.Value.Path, FolderName); } get
{
if (RootFolder == null || RootFolder.Value == null || String.IsNullOrWhiteSpace(RootFolder.Value.Path))
{
return null;
}
return System.IO.Path.Combine(RootFolder.Value.Path, FolderName);
}
} }
//Todo: This should be a double since there are timezones that aren't on a full hour offset //Todo: This should be a double since there are timezones that aren't on a full hour offset