Cleaned up import file a bit

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_should_skip()
-        public void import_existing_season_file()
         {
             //Arrange
             /////////////////////////////////////////
 
             //Constants
             const string fileName = @"WEEDS.S03E01.DUAL.BDRip.XviD.AC3.-HELLYWOOD.avi";
-            const int size = 12345;
 
             //Fakes
             var fakeSeries = Builder<Series>.CreateNew().Build();
-            var fakeEpisodeFile = Builder<EpisodeFile>.CreateNew().With(s => s.SeriesId = fakeSeries.SeriesId).Build();
 
             //Mocks
             var mocker = new AutoMoqer();
@@ -149,10 +146,6 @@ namespace NzbDrone.Core.Test
             mocker.GetMock<IDatabase>(MockBehavior.Strict)
                 .Setup(r => r.Exists<EpisodeFile>(It.IsAny<string>(), It.IsAny<object>())).Returns(true).Verifiable();
 
-            mocker.GetMock<DiskProvider>()
-                .Setup(e => e.GetSize(fileName)).Returns(size).Verifiable();
-
-
             //Act
             var result = mocker.Resolve<MediaFileProvider>().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<Series>.CreateNew().Build();
 
-            //Mocks
             var mocker = new AutoMoqer();
             mocker.GetMock<IDatabase>(MockBehavior.Strict)
                 .Setup(r => r.Exists<EpisodeFile>(It.IsAny<string>(), It.IsAny<object>())).Returns(true).Verifiable();
 
             mocker.GetMock<EpisodeProvider>(MockBehavior.Strict);
-            mocker.GetMock<DiskProvider>()
-                 .Setup(e => e.GetSize(fileName)).Returns(500000).Verifiable();
-
 
             //Act
             var result = mocker.Resolve<MediaFileProvider>().ImportFile(fakeSeries, fileName);
 
             //Assert
-            Assert.IsNull(result);
+            result.Should().BeNull();
             mocker.GetMock<IDatabase>().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<IDatabase>().Verify(r => r.Insert(result), Times.Never());
             ExceptionVerification.ExcpectedWarns(1);
         }

NzbDrone.Core/Providers/MediaFileProvider.cs

@@ -69,8 +69,12 @@ namespace NzbDrone.Core.Providers
         {
             Logger.Trace("Importing file to database [{0}]", filePath);
 
-            try
+            if (_database.Exists<EpisodeFile>("Path =@0", Parser.NormalizePath(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
@@ -80,9 +84,6 @@ namespace NzbDrone.Core.Providers
                 return null;
             }
 
-                //Check to see if file already exists in the database
-                if (!_database.Exists<EpisodeFile>("Path =@0", Parser.NormalizePath(filePath)))
-                {
             var parseResult = Parser.ParseEpisodeInfo(filePath);
 
             if (parseResult == null)
@@ -151,16 +152,7 @@ namespace NzbDrone.Core.Providers
                          episodeList);
 
             return episodeFile;
-                }
 
-                Logger.Trace("[{0}] already exists in the database. skipping.", filePath);
-            }
-            catch (Exception ex)
-            {
-                Logger.ErrorException("An error has occurred while importing file " + filePath, ex);
-                throw;
-            }
-            return null;
         }
 
         /// <summary>
@@ -311,7 +303,7 @@ namespace NzbDrone.Core.Providers
             return result;
         }
 
-        public virtual string GetNewFilename(IList<Episode> episodes, string seriesName, QualityTypes quality)
+        public virtual string GetNewFilename(IList<Episode> 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);