diff --git a/NzbDrone.Core.Test/MediaFileProviderTests.cs b/NzbDrone.Core.Test/MediaFileProviderTests.cs index e99763e0b..1e734652a 100644 --- a/NzbDrone.Core.Test/MediaFileProviderTests.cs +++ b/NzbDrone.Core.Test/MediaFileProviderTests.cs @@ -129,19 +129,16 @@ namespace NzbDrone.Core.Test } [Test] - [Description("Verifies that a new file imported properly")] - public void import_existing_season_file() + public void import_existing_season_file_should_skip() { //Arrange ///////////////////////////////////////// //Constants const string fileName = @"WEEDS.S03E01.DUAL.BDRip.XviD.AC3.-HELLYWOOD.avi"; - const int size = 12345; //Fakes var fakeSeries = Builder.CreateNew().Build(); - var fakeEpisodeFile = Builder.CreateNew().With(s => s.SeriesId = fakeSeries.SeriesId).Build(); //Mocks var mocker = new AutoMoqer(); @@ -149,10 +146,6 @@ namespace NzbDrone.Core.Test mocker.GetMock(MockBehavior.Strict) .Setup(r => r.Exists(It.IsAny(), It.IsAny())).Returns(true).Verifiable(); - mocker.GetMock() - .Setup(e => e.GetSize(fileName)).Returns(size).Verifiable(); - - //Act var result = mocker.Resolve().ImportFile(fakeSeries, fileName); @@ -232,33 +225,23 @@ namespace NzbDrone.Core.Test } [Test] - [Description("Verifies that an existing file will skip import")] public void import_existing_file() { - //Arrange - ///////////////////////////////////////// - - //Constants const string fileName = "WEEDS.S03E01-06.DUAL.BDRip.XviD.AC3.-HELLYWOOD.avi"; - //Fakes var fakeSeries = Builder.CreateNew().Build(); - //Mocks var mocker = new AutoMoqer(); mocker.GetMock(MockBehavior.Strict) .Setup(r => r.Exists(It.IsAny(), It.IsAny())).Returns(true).Verifiable(); mocker.GetMock(MockBehavior.Strict); - mocker.GetMock() - .Setup(e => e.GetSize(fileName)).Returns(500000).Verifiable(); - //Act var result = mocker.Resolve().ImportFile(fakeSeries, fileName); //Assert - Assert.IsNull(result); + result.Should().BeNull(); mocker.GetMock().Verify(r => r.Insert(result), Times.Never()); mocker.VerifyAllMocks(); } @@ -296,7 +279,7 @@ namespace NzbDrone.Core.Test //Assert mocker.VerifyAllMocks(); - Assert.IsNull(result); + result.Should().BeNull(); mocker.GetMock().Verify(r => r.Insert(result), Times.Never()); ExceptionVerification.ExcpectedWarns(1); } @@ -311,7 +294,7 @@ namespace NzbDrone.Core.Test mocker.GetMock() .Setup(c => c.GetEpisodeBySeries(It.IsAny())) - .Returns(new List{new Episode()}); + .Returns(new List { new Episode() }); mocker.Resolve().Scan(new Series()); @@ -319,7 +302,7 @@ namespace NzbDrone.Core.Test } - + [Test] public void get_series_files() { diff --git a/NzbDrone.Core/Providers/MediaFileProvider.cs b/NzbDrone.Core/Providers/MediaFileProvider.cs index 34c6d81fe..4e003eeb7 100644 --- a/NzbDrone.Core/Providers/MediaFileProvider.cs +++ b/NzbDrone.Core/Providers/MediaFileProvider.cs @@ -69,98 +69,90 @@ namespace NzbDrone.Core.Providers { Logger.Trace("Importing file to database [{0}]", filePath); - try + if (_database.Exists("Path =@0", Parser.NormalizePath(filePath))) { - var size = _diskProvider.GetSize(filePath); + Logger.Trace("[{0}] already exists in the database. skipping.", filePath); + return null; + } + + var size = _diskProvider.GetSize(filePath); - //If Size is less than 50MB and contains sample. Check for Size to ensure its not an episode with sample in the title - if (size < 40000000 && filePath.ToLower().Contains("sample")) - { - Logger.Trace("[{0}] appears to be a sample. skipping.", filePath); - return null; - } + //If Size is less than 50MB and contains sample. Check for Size to ensure its not an episode with sample in the title + if (size < 40000000 && filePath.ToLower().Contains("sample")) + { + Logger.Trace("[{0}] appears to be a sample. skipping.", filePath); + return null; + } - //Check to see if file already exists in the database - if (!_database.Exists("Path =@0", Parser.NormalizePath(filePath))) - { - var parseResult = Parser.ParseEpisodeInfo(filePath); + var parseResult = Parser.ParseEpisodeInfo(filePath); - if (parseResult == null) - return null; + if (parseResult == null) + return null; - parseResult.CleanTitle = series.Title;//replaces the nasty path as title to help with logging + parseResult.CleanTitle = series.Title;//replaces the nasty path as title to help with logging - //Stores the list of episodes to add to the EpisodeFile - var episodes = new List(); + //Stores the list of episodes to add to the EpisodeFile + var episodes = new List(); + + //Check for daily shows + if (parseResult.EpisodeNumbers == null) + { + var episode = _episodeProvider.GetEpisode(series.SeriesId, parseResult.AirDate.Date); + + if (episode != null) + { + episodes.Add(episode); + } + else + { + Logger.Warn("Unable to find [{0}] in the database.[{1}]", parseResult, filePath); + } + } + else + { + foreach (var episodeNumber in parseResult.EpisodeNumbers) + { + var episode = _episodeProvider.GetEpisode(series.SeriesId, parseResult.SeasonNumber, + episodeNumber); - //Check for daily shows - if (parseResult.EpisodeNumbers == null) + if (episode != null) { - var episode = _episodeProvider.GetEpisode(series.SeriesId, parseResult.AirDate.Date); - - if (episode != null) - { - episodes.Add(episode); - } - else - { - Logger.Warn("Unable to find [{0}] in the database.[{1}]", parseResult, filePath); - } + episodes.Add(episode); } else { - foreach (var episodeNumber in parseResult.EpisodeNumbers) - { - var episode = _episodeProvider.GetEpisode(series.SeriesId, parseResult.SeasonNumber, - episodeNumber); - - if (episode != null) - { - episodes.Add(episode); - } - else - { - Logger.Warn("Unable to find [{0}] in the database.[{1}]", parseResult, filePath); - } - } + Logger.Warn("Unable to find [{0}] in the database.[{1}]", parseResult, filePath); } - - //Return null if no Episodes exist in the DB for the parsed episodes from file - if (episodes.Count <= 0) - return null; - - var episodeFile = new EpisodeFile(); - episodeFile.DateAdded = DateTime.Now; - episodeFile.SeriesId = series.SeriesId; - episodeFile.Path = Parser.NormalizePath(filePath); - episodeFile.Size = size; - episodeFile.Quality = parseResult.Quality.QualityType; - episodeFile.Proper = parseResult.Quality.Proper; - episodeFile.SeasonNumber = parseResult.SeasonNumber; - var fileId = Convert.ToInt32(_database.Insert(episodeFile)); - - //This is for logging + updating the episodes that are linked to this EpisodeFile - string episodeList = String.Empty; - foreach (var ep in episodes) - { - ep.EpisodeFileId = fileId; - _episodeProvider.UpdateEpisode(ep); - episodeList += String.Format(", {0}", ep.EpisodeId).Trim(' ', ','); - } - Logger.Trace("File {0}:{1} attached to episode(s): '{2}'", episodeFile.EpisodeFileId, filePath, - episodeList); - - return episodeFile; } - - Logger.Trace("[{0}] already exists in the database. skipping.", filePath); } - catch (Exception ex) + + //Return null if no Episodes exist in the DB for the parsed episodes from file + if (episodes.Count <= 0) + return null; + + var episodeFile = new EpisodeFile(); + episodeFile.DateAdded = DateTime.Now; + episodeFile.SeriesId = series.SeriesId; + episodeFile.Path = Parser.NormalizePath(filePath); + episodeFile.Size = size; + episodeFile.Quality = parseResult.Quality.QualityType; + episodeFile.Proper = parseResult.Quality.Proper; + episodeFile.SeasonNumber = parseResult.SeasonNumber; + var fileId = Convert.ToInt32(_database.Insert(episodeFile)); + + //This is for logging + updating the episodes that are linked to this EpisodeFile + string episodeList = String.Empty; + foreach (var ep in episodes) { - Logger.ErrorException("An error has occurred while importing file " + filePath, ex); - throw; + ep.EpisodeFileId = fileId; + _episodeProvider.UpdateEpisode(ep); + episodeList += String.Format(", {0}", ep.EpisodeId).Trim(' ', ','); } - return null; + Logger.Trace("File {0}:{1} attached to episode(s): '{2}'", episodeFile.EpisodeFileId, filePath, + episodeList); + + return episodeFile; + } /// @@ -311,7 +303,7 @@ namespace NzbDrone.Core.Providers return result; } - public virtual string GetNewFilename(IList episodes, string seriesName, QualityTypes quality) + public virtual string GetNewFilename(IList episodes, string seriesTitle, QualityTypes quality) { var separatorStyle = EpisodeSortingHelper.GetSeparatorStyle(_configProvider.SeparatorStyle); var numberStyle = EpisodeSortingHelper.GetNumberStyle(_configProvider.NumberStyle); @@ -322,7 +314,7 @@ namespace NzbDrone.Core.Providers if (_configProvider.SeriesName) { - result += seriesName + separatorStyle.Pattern; + result += seriesTitle + separatorStyle.Pattern; } result += numberStyle.Pattern.Replace("%0e", String.Format("{0:00}", episodes[0].EpisodeNumber)); @@ -369,25 +361,36 @@ namespace NzbDrone.Core.Providers return result.Trim(); } + public virtual FileInfo CalculateFilePath(Series series, int seasonNumber, string fileName, string extention) + { + var path = series.Path; + if (series.SeasonFolder) + { + path = Path.Combine(path, "Season " + seasonNumber); + } + + path = Path.Combine(path, fileName + extention); + + return new FileInfo(path); + } + public virtual bool RenameEpisodeFile(EpisodeFile episodeFile) { if (episodeFile == null) throw new ArgumentNullException("episodeFile"); var series = _seriesProvider.GetSeries(episodeFile.SeriesId); - var folder = new FileInfo(episodeFile.Path).DirectoryName; var ext = _diskProvider.GetExtension(episodeFile.Path); var episodes = _episodeProvider.GetEpisodesByFileId(episodeFile.EpisodeFileId); - var newFileName = GetNewFilename(episodes, series.Title, episodeFile.Quality); - var newFile = folder + Path.DirectorySeparatorChar + newFileName + ext; + var newFile = CalculateFilePath(series, episodes.First().SeasonNumber, newFileName, ext); //Do the rename - _diskProvider.RenameFile(episodeFile.Path, newFile); + _diskProvider.RenameFile(episodeFile.Path, newFile.FullName); //Update the filename in the DB - episodeFile.Path = newFile; + episodeFile.Path = newFile.FullName; Update(episodeFile);