Merge branch 'master' of git://github.com/kayone/NzbDrone

Conflicts:
	NzbDrone.Core.Test/SeriesProviderTest.cs

NzbDrone.Core.Test/DiskScanJobTest.cs

@@ -30,7 +30,7 @@ namespace NzbDrone.Core.Test
                 .Setup(p => p.GetSeries(series.SeriesId))
                 .Returns(series);
 
-            mocker.GetMock<MediaFileProvider>()
+            mocker.GetMock<DiskScanProvider>()
                 .Setup(p => p.Scan(series))
                 .Returns(new List<EpisodeFile>());
 
@@ -58,11 +58,11 @@ namespace NzbDrone.Core.Test
                 .Setup(p => p.GetAllSeries())
                 .Returns(series);
 
-            mocker.GetMock<MediaFileProvider>()
+            mocker.GetMock<DiskScanProvider>()
                 .Setup(s => s.Scan(series[0]))
                 .Returns(new List<EpisodeFile>());
 
-            mocker.GetMock<MediaFileProvider>()
+            mocker.GetMock<DiskScanProvider>()
                 .Setup(s => s.Scan(series[1]))
                 .Returns(new List<EpisodeFile>());
 
@@ -86,11 +86,11 @@ namespace NzbDrone.Core.Test
                 .Setup(p => p.GetAllSeries())
                 .Returns(series);
 
-            mocker.GetMock<MediaFileProvider>()
+            mocker.GetMock<DiskScanProvider>()
                 .Setup(s => s.Scan(series[0]))
                 .Throws(new InvalidOperationException("Bad Job"));
 
-            mocker.GetMock<MediaFileProvider>()
+            mocker.GetMock<DiskScanProvider>()
                 .Setup(s => s.Scan(series[1]))
                 .Throws(new InvalidOperationException("Bad Job"));
 
@@ -115,11 +115,11 @@ namespace NzbDrone.Core.Test
                 .Setup(p => p.GetAllSeries())
                 .Returns(series);
 
-            mocker.GetMock<MediaFileProvider>()
+            mocker.GetMock<DiskScanProvider>()
                 .Setup(s => s.Scan(series[0]))
                 .Returns(new List<EpisodeFile>());
 
-            mocker.GetMock<MediaFileProvider>()
+            mocker.GetMock<DiskScanProvider>()
                 .Setup(s => s.Scan(series[1]))
                 .Returns(new List<EpisodeFile>());
 
@@ -128,7 +128,7 @@ namespace NzbDrone.Core.Test
 
 
             mocker.VerifyAllMocks();
-            mocker.GetMock<MediaFileProvider>().Verify(s => s.Scan(It.IsAny<Series>()), Times.Exactly(2));
+            mocker.GetMock<DiskScanProvider>().Verify(s => s.Scan(It.IsAny<Series>()), Times.Exactly(2));
         }
     }
 

NzbDrone.Core.Test/EpisodeProviderTest.cs

@@ -45,6 +45,51 @@ namespace NzbDrone.Core.Test
             episode.Series.ShouldHave().AllProperties().EqualTo(fakeSeries);
         }
 
+
+        [Test]
+        public void GetEpisodes_by_season_episode_exists()
+        {
+            var mocker = new AutoMoqer();
+            var db = MockLib.GetEmptyDatabase();
+            mocker.SetConstant(db);
+
+            var fakeSeries = Builder<Series>.CreateNew().Build();
+            var fakeEpisodes = Builder<Episode>.CreateNew()
+                .With(e => e.SeriesId = fakeSeries.SeriesId)
+                .With(e => e.EpisodeNumber = 1)
+                .And(e => e.SeasonNumber = 2).Build();
+
+
+            db.Insert(fakeEpisodes);
+
+            mocker.GetMock<SeriesProvider>()
+                .Setup(p => p.GetSeries(1))
+                .Returns(fakeSeries);
+
+            //Act
+            var episode = mocker.Resolve<EpisodeProvider>().GetEpisode(fakeSeries.SeriesId, 2, 1);
+
+            //Assert
+            episode.ShouldHave().AllPropertiesBut(e => e.Series).EqualTo(fakeEpisodes);
+            episode.Series.ShouldHave().AllProperties().EqualTo(fakeSeries);
+        }
+
+        [Test]
+        public void GetEpisodes_by_season_episode_doesnt_exists()
+        {
+            var mocker = new AutoMoqer();
+            var db = MockLib.GetEmptyDatabase();
+            mocker.SetConstant(db);
+
+     
+
+            //Act
+            var episode = mocker.Resolve<EpisodeProvider>().GetEpisode(1, 1, 1);
+
+            //Assert
+            episode.Should().BeNull();
+        }
+
         [Test]
         public void GetEpisode_with_EpisodeFile()
         {
@@ -131,6 +176,20 @@ namespace NzbDrone.Core.Test
             returnedSeries.Should().BeEquivalentTo(fakeEpisodes);
         }
 
+        [Test]
+        public void AttachSeries_null_episode_should_return_null()
+        {
+            var mocker = new AutoMoqer();
+
+            Episode episode = null;
+
+            //Act
+            var result = mocker.Resolve<EpisodeProvider>().AttachSeries(episode);
+
+            //Assert
+            result.Should().BeNull();
+        }
+
         [Test]
         public void AttachSeries_single_success()
         {

NzbDrone.Core.Test/MediaFileProviderTests.cs

@@ -60,7 +60,7 @@ namespace NzbDrone.Core.Test
                 .Setup(e => e.GetEpisode(fakeSeries.SeriesId, seasonNumber, episodeNumner)).Returns(fakeEpisode);
 
             //Act
-            var result = mocker.Resolve<MediaFileProvider>().ImportFile(fakeSeries, fileName);
+            var result = mocker.Resolve<DiskScanProvider>().ImportFile(fakeSeries, fileName);
 
             //Assert
             Assert.IsNotNull(result);
@@ -107,7 +107,7 @@ namespace NzbDrone.Core.Test
                 .Setup(e => e.GetSize(fileName)).Returns(size).Verifiable();
 
             //Act
-            var result = mocker.Resolve<MediaFileProvider>().ImportFile(fakeSeries, fileName);
+            var result = mocker.Resolve<DiskScanProvider>().ImportFile(fakeSeries, fileName);
 
             //Assert
             Assert.IsNotNull(result);
@@ -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,12 +146,8 @@ 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);
+            var result = mocker.Resolve<DiskScanProvider>().ImportFile(fakeSeries, fileName);
 
             //Assert
             mocker.VerifyAllMocks();
@@ -185,7 +178,7 @@ namespace NzbDrone.Core.Test
                 .Setup(e => e.GetSize(fileName)).Returns(size).Verifiable();
 
             //Act
-            var result = mocker.Resolve<MediaFileProvider>().ImportFile(fakeSeries, fileName);
+            var result = mocker.Resolve<DiskScanProvider>().ImportFile(fakeSeries, fileName);
 
             //Assert
             mocker.VerifyAllMocks();
@@ -225,40 +218,30 @@ namespace NzbDrone.Core.Test
 
 
             //Act
-            var result = mocker.Resolve<MediaFileProvider>().ImportFile(fakeSeries, fileName);
+            var result = mocker.Resolve<DiskScanProvider>().ImportFile(fakeSeries, fileName);
 
             //Assert
             Assert.IsNull(result);
         }
 
         [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);
+            var result = mocker.Resolve<DiskScanProvider>().ImportFile(fakeSeries, fileName);
 
             //Assert
-            Assert.IsNull(result);
+            result.Should().BeNull();
             mocker.GetMock<IDatabase>().Verify(r => r.Insert(result), Times.Never());
             mocker.VerifyAllMocks();
         }
@@ -292,11 +275,11 @@ namespace NzbDrone.Core.Test
 
 
             //Act
-            var result = mocker.Resolve<MediaFileProvider>().ImportFile(fakeSeries, fileName);
+            var result = mocker.Resolve<DiskScanProvider>().ImportFile(fakeSeries, fileName);
 
             //Assert
             mocker.VerifyAllMocks();
-            Assert.IsNull(result);
+            result.Should().BeNull();
             mocker.GetMock<IDatabase>().Verify(r => r.Insert(result), Times.Never());
             ExceptionVerification.ExcpectedWarns(1);
         }
@@ -311,9 +294,9 @@ namespace NzbDrone.Core.Test
 
             mocker.GetMock<EpisodeProvider>()
                 .Setup(c => c.GetEpisodeBySeries(It.IsAny<long>()))
-                .Returns(new List<Episode>{new Episode()});
+                .Returns(new List<Episode> { new Episode() });
 
-            mocker.Resolve<MediaFileProvider>().Scan(new Series());
+            mocker.Resolve<DiskScanProvider>().Scan(new Series());
 
             mocker.VerifyAllMocks();
 
@@ -347,123 +330,6 @@ namespace NzbDrone.Core.Test
             result.Should().HaveSameCount(firstSeriesFiles);
         }
 
-        [Test]
-        [Description("Verifies that a new download will import successfully")]
-        public void import_new_download_success()
-        {
-            //Fakes
-            var fakeSeries = Builder<Series>.CreateNew()
-                .With(s => s.Title = "30 Rock")
-                .With(s => s.Path = @"C:\Test\TV\30 Rock")
-                .Build();
-
-            var fakeEpisode = Builder<Episode>.CreateNew()
-                .With(e => e.SeriesId = fakeSeries.SeriesId)
-                .With(e => e.EpisodeFileId = 0)
-                .With(e => e.SeasonNumber = 1)
-                .With(e => e.EpisodeNumber = 5)
-                .Build();
-
-            //Mocks
-            var mocker = new AutoMoqer();
-
-            var diskProvider = mocker.GetMock<DiskProvider>();
-            diskProvider.Setup(d => d.GetFiles(It.IsAny<string>(), "*.*", SearchOption.AllDirectories)).Returns(new string[] { @"C:\Test\30 Rock - 1x05 - Episode Title\30.Rock.S01E05.Gibberish.XviD.avi" });
-            diskProvider.Setup(d => d.GetSize(It.IsAny<string>())).Returns(90000000000);
-            diskProvider.Setup(d => d.CreateDirectory(It.IsAny<string>())).Returns("ok");
-            diskProvider.Setup(d => d.RenameFile(It.IsAny<string>(), It.IsAny<string>()));
-            diskProvider.Setup(d => d.GetExtension(It.IsAny<string>())).Returns(".avi");
-
-            var episodeProvider = mocker.GetMock<EpisodeProvider>();
-            episodeProvider.Setup(e => e.GetEpisodes(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { fakeEpisode });
-            episodeProvider.Setup(e => e.GetEpisode(fakeSeries.SeriesId, 1, 5)).Returns(fakeEpisode);
-
-            var configProvider = mocker.GetMock<ConfigProvider>();
-            configProvider.SetupGet(c => c.UseSeasonFolder).Returns(true);
-            configProvider.SetupGet(c => c.SeasonFolderFormat).Returns(@"Season %0s");
-            configProvider.SetupGet(c => c.SeriesName).Returns(true);
-            configProvider.SetupGet(c => c.EpisodeName).Returns(true);
-            configProvider.SetupGet(c => c.AppendQuality).Returns(true);
-            configProvider.SetupGet(c => c.SeparatorStyle).Returns(0);
-            configProvider.SetupGet(c => c.NumberStyle).Returns(2);
-            configProvider.SetupGet(c => c.ReplaceSpaces).Returns(false);
-
-            var database = mocker.GetMock<IDatabase>(MockBehavior.Strict);
-            database.Setup(r => r.Exists<EpisodeFile>(It.IsAny<string>(), It.IsAny<object>())).Returns(false).Verifiable();
-            database.Setup(r => r.Insert(It.IsAny<EpisodeFile>())).Returns(1).Verifiable();
-
-            //Act
-            var result = mocker.Resolve<MediaFileProvider>().ImportNewFiles(@"C:\Test\30 Rock - 1x05 - Episode Title", fakeSeries);
-
-            //Assert
-            mocker.VerifyAllMocks();
-            Assert.AreEqual(1, result.Count);
-        }
-
-        [Test]
-        [Description("Verifies that a new download will import successfully, deletes previous episode")]
-        public void import_new_download_success_delete_equal_quality()
-        {
-            //Fakes
-            var fakeSeries = Builder<Series>.CreateNew()
-                .With(s => s.Title = "30 Rock")
-                .With(s => s.Path = @"C:\Test\TV\30 Rock")
-                .Build();
-
-            var fakeEpisode = Builder<Episode>.CreateNew()
-                .With(e => e.SeriesId = fakeSeries.SeriesId)
-                .With(e => e.SeasonNumber = 1)
-                .With(e => e.EpisodeNumber = 5)
-                .With(e => e.EpisodeFileId = 1)
-                .Build();
-
-            var fakeEpisodeFile = Builder<EpisodeFile>.CreateNew()
-                .With(e => e.SeriesId = fakeSeries.SeriesId)
-                .With(e => e.EpisodeFileId = 1)
-                .With(e => e.Quality = QualityTypes.SDTV)
-                .With(e => e.Episodes = new List<Episode> { fakeEpisode })
-                .Build();
-
-            fakeEpisode.EpisodeFile = fakeEpisodeFile;
-
-            //Mocks
-            var mocker = new AutoMoqer();
-
-            var diskProvider = mocker.GetMock<DiskProvider>();
-            diskProvider.Setup(d => d.GetFiles(It.IsAny<string>(), "*.*", SearchOption.AllDirectories)).Returns(new string[] { @"C:\Test\30 Rock - 1x05 - Episode Title\30.Rock.S01E05.Gibberish.XviD.avi" });
-            diskProvider.Setup(d => d.GetSize(It.IsAny<string>())).Returns(90000000000);
-            diskProvider.Setup(d => d.CreateDirectory(It.IsAny<string>())).Returns("ok");
-            diskProvider.Setup(d => d.RenameFile(It.IsAny<string>(), It.IsAny<string>()));
-            diskProvider.Setup(d => d.GetExtension(It.IsAny<string>())).Returns(".avi");
-
-            var episodeProvider = mocker.GetMock<EpisodeProvider>();
-            episodeProvider.Setup(e => e.GetEpisodes(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { fakeEpisode });
-            episodeProvider.Setup(e => e.GetEpisode(fakeSeries.SeriesId, 1, 5)).Returns(fakeEpisode);
-
-            var configProvider = mocker.GetMock<ConfigProvider>();
-            configProvider.SetupGet(c => c.UseSeasonFolder).Returns(true);
-            configProvider.SetupGet(c => c.SeasonFolderFormat).Returns(@"Season %0s");
-            configProvider.SetupGet(c => c.SeriesName).Returns(true);
-            configProvider.SetupGet(c => c.EpisodeName).Returns(true);
-            configProvider.SetupGet(c => c.AppendQuality).Returns(true);
-            configProvider.SetupGet(c => c.SeparatorStyle).Returns(0);
-            configProvider.SetupGet(c => c.NumberStyle).Returns(2);
-            configProvider.SetupGet(c => c.ReplaceSpaces).Returns(false);
-
-            var database = mocker.GetMock<IDatabase>(MockBehavior.Strict);
-            database.Setup(r => r.Exists<EpisodeFile>(It.IsAny<string>(), It.IsAny<object>())).Returns(false).Verifiable();
-            database.Setup(r => r.Insert(It.IsAny<EpisodeFile>())).Returns(1);
-            database.Setup(r => r.Delete<EpisodeFile>(It.IsAny<int>())).Returns(1);
-
-            //Act
-            var result = mocker.Resolve<MediaFileProvider>().ImportNewFiles(@"C:\Test\30 Rock - 1x05 - Episode Title", fakeSeries);
-
-            //Assert
-            mocker.VerifyAllMocks();
-            Assert.AreEqual(1, result.Count);
-        }
-
-
         [Test]
         public void Scan_series_should_skip_series_with_no_episodes()
         {
@@ -476,7 +342,7 @@ namespace NzbDrone.Core.Test
                 .With(s => s.SeriesId = 12).Build();
 
             //Act
-            mocker.Resolve<MediaFileProvider>().Scan(series);
+            mocker.Resolve<DiskScanProvider>().Scan(series);
 
             //Assert
             mocker.VerifyAllMocks();

NzbDrone.Core.Test/MediaFileProvider_ImportNewDownloadTest.cs

@@ -1,444 +0,0 @@
-// ReSharper disable RedundantUsingDirective
-using System.Collections.Generic;
-using System.IO;
-using AutoMoq;
-using FizzWare.NBuilder;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Core.Model;
-using NzbDrone.Core.Providers;
-using NzbDrone.Core.Providers.Core;
-using NzbDrone.Core.Repository;
-using NzbDrone.Core.Repository.Quality;
-using NzbDrone.Core.Test.Framework;
-using PetaPoco;
-
-namespace NzbDrone.Core.Test
-{
-    [TestFixture]
-    // ReSharper disable InconsistentNaming
-    public class MediaFileProvider_ImportNewDownloadTest : TestBase
-    {
-        private Episode episode;
-        private Episode episode2;
-        private EpisodeFile episodeFile;
-        private EpisodeFile episodeFile2;
-        private Series series;
-
-        [SetUp]
-        public new void Setup()
-        {
-            series = Builder<Series>.CreateNew()
-                .With(s => s.Title = "30 Rock")
-                .With(s => s.Path = @"C:\Test\TV\30 Rock")
-                .Build();
-
-            episode = Builder<Episode>.CreateNew()
-                .With(e => e.SeriesId = series.SeriesId)
-                .With(e => e.SeasonNumber = 1)
-                .With(e => e.EpisodeNumber = 5)
-                .With(e => e.EpisodeFileId = 1)
-                .With(e => e.Title = "Episode One Title")
-                .Build();
-
-            episode2 = Builder<Episode>.CreateNew()
-                .With(e => e.SeriesId = series.SeriesId)
-                .With(e => e.SeasonNumber = 1)
-                .With(e => e.EpisodeNumber = 6)
-                .With(e => e.EpisodeFileId = 1)
-                .With(e => e.Title = "Episode Two Title")
-                .Build();
-
-            episodeFile = Builder<EpisodeFile>.CreateNew()
-                .With(e => e.SeriesId = series.SeriesId)
-                .With(e => e.EpisodeFileId = 1)
-                .With(e => e.Quality = QualityTypes.SDTV)
-                .With(e => e.Episodes = new List<Episode> { episode })
-                .Build();
-
-            episodeFile2 = Builder<EpisodeFile>.CreateNew()
-                .With(e => e.SeriesId = series.SeriesId)
-                .With(e => e.EpisodeFileId = 1)
-                .With(e => e.Quality = QualityTypes.SDTV)
-                .With(e => e.Episodes = new List<Episode> { episode })
-                .Build();
-
-            episode.EpisodeFile = episodeFile;
-
-            base.Setup();
-        }
-
-        [Test]
-        [Description("Verifies that a new download will import successfully")]
-        public void import_new_download_imported()
-        {
-            //Mocks
-            var mocker = new AutoMoqer();
-
-            var diskProvider = mocker.GetMock<DiskProvider>();
-            diskProvider.Setup(d => d.GetFiles(It.IsAny<string>(), "*.*", SearchOption.AllDirectories)).Returns(new string[] { @"C:\Test\30 Rock - 1x05 - Episode Title\30.Rock.S01E05.Gibberish.XviD.avi" });
-            diskProvider.Setup(d => d.GetSize(It.IsAny<string>())).Returns(90000000000);
-            diskProvider.Setup(d => d.CreateDirectory(It.IsAny<string>())).Returns("ok");
-            diskProvider.Setup(d => d.RenameFile(It.IsAny<string>(), It.IsAny<string>()));
-            diskProvider.Setup(d => d.GetExtension(It.IsAny<string>())).Returns(".avi");
-
-            var episodeProvider = mocker.GetMock<EpisodeProvider>();
-            episodeProvider.Setup(e => e.GetEpisodes(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> {episode});
-            episodeProvider.Setup(e => e.GetEpisode(series.SeriesId, 1, 5)).Returns(episode);
-
-            var configProvider = mocker.GetMock<ConfigProvider>();
-            configProvider.SetupGet(c => c.UseSeasonFolder).Returns(true);
-            configProvider.SetupGet(c => c.SeasonFolderFormat).Returns(@"Season %0s");
-            configProvider.SetupGet(c => c.SeriesName).Returns(true);
-            configProvider.SetupGet(c => c.EpisodeName).Returns(true);
-            configProvider.SetupGet(c => c.AppendQuality).Returns(true);
-            configProvider.SetupGet(c => c.SeparatorStyle).Returns(0);
-            configProvider.SetupGet(c => c.NumberStyle).Returns(2);
-            configProvider.SetupGet(c => c.ReplaceSpaces).Returns(false);
-
-            var database = mocker.GetMock<IDatabase>();
-            database.Setup(r => r.Exists<EpisodeFile>(It.IsAny<string>(), It.IsAny<object>())).Returns(false).Verifiable();
-            database.Setup(r => r.Insert(It.IsAny<EpisodeFile>())).Returns(1);
-
-            //Act
-            var result = mocker.Resolve<MediaFileProvider>().ImportNewFiles(@"C:\Test\30 Rock - 1x05 - Episode Title", series);
-
-            //Assert
-            mocker.VerifyAllMocks();
-            Assert.AreEqual(1, result.Count);
-        }
-
-        [Test]
-        [Description("Verifies that a new download will import successfully, deletes previous episode")]
-        public void import_new_download_imported_delete_equal_quality()
-        {
-            //Mocks
-            var mocker = new AutoMoqer();
-
-            var diskProvider = mocker.GetMock<DiskProvider>();
-            diskProvider.Setup(d => d.GetFiles(It.IsAny<string>(), "*.*", SearchOption.AllDirectories)).Returns(new string[] { @"C:\Test\30 Rock - 1x05 - Episode Title\30.Rock.S01E05.Gibberish.XviD.avi" });
-            diskProvider.Setup(d => d.GetSize(It.IsAny<string>())).Returns(90000000000);
-            diskProvider.Setup(d => d.CreateDirectory(It.IsAny<string>())).Returns("ok");
-            diskProvider.Setup(d => d.RenameFile(It.IsAny<string>(), It.IsAny<string>()));
-            diskProvider.Setup(d => d.GetExtension(It.IsAny<string>())).Returns(".avi");
-
-            var episodeProvider = mocker.GetMock<EpisodeProvider>();
-            episodeProvider.Setup(e => e.GetEpisodes(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { episode });
-            episodeProvider.Setup(e => e.GetEpisode(series.SeriesId, 1, 5)).Returns(episode);
-
-            var configProvider = mocker.GetMock<ConfigProvider>();
-            configProvider.SetupGet(c => c.UseSeasonFolder).Returns(true);
-            configProvider.SetupGet(c => c.SeasonFolderFormat).Returns(@"Season %0s");
-            configProvider.SetupGet(c => c.SeriesName).Returns(true);
-            configProvider.SetupGet(c => c.EpisodeName).Returns(true);
-            configProvider.SetupGet(c => c.AppendQuality).Returns(true);
-            configProvider.SetupGet(c => c.SeparatorStyle).Returns(0);
-            configProvider.SetupGet(c => c.NumberStyle).Returns(2);
-            configProvider.SetupGet(c => c.ReplaceSpaces).Returns(false);
-
-            var database = mocker.GetMock<IDatabase>();
-            database.Setup(r => r.Exists<EpisodeFile>(It.IsAny<string>(), It.IsAny<object>())).Returns(false).Verifiable();
-            database.Setup(r => r.Insert(It.IsAny<EpisodeFile>())).Returns(1);
-
-            //Act
-            var result = mocker.Resolve<MediaFileProvider>().ImportNewFiles(@"C:\Test\30 Rock - 1x05 - Episode Title", series);
-
-            //Assert
-            mocker.VerifyAllMocks();
-            Assert.AreEqual(1, result.Count);
-        }
-
-        [Test]
-        [Description("Verifies that a new download will not import successfully, because existing episode is better")]
-        public void import_new_download_not_imported_greater_quality()
-        {
-            //Alternate Setups
-            episodeFile.Quality = QualityTypes.DVD;
-
-            //Mocks
-            var mocker = new AutoMoqer();
-
-            var diskProvider = mocker.GetMock<DiskProvider>();
-            diskProvider.Setup(d => d.GetFiles(It.IsAny<string>(), "*.*", SearchOption.AllDirectories)).Returns(new string[] { @"C:\Test\30 Rock - 1x05 - Episode Title\30.Rock.S01E05.Gibberish.XviD.avi" });
-            diskProvider.Setup(d => d.GetSize(It.IsAny<string>())).Returns(90000000000);
-            diskProvider.Setup(d => d.CreateDirectory(It.IsAny<string>())).Returns("ok");
-            diskProvider.Setup(d => d.GetExtension(It.IsAny<string>())).Returns(".avi");
-
-            var episodeProvider = mocker.GetMock<EpisodeProvider>();
-            episodeProvider.Setup(e => e.GetEpisodes(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { episode });
-
-            var configProvider = mocker.GetMock<ConfigProvider>();
-            configProvider.SetupGet(c => c.UseSeasonFolder).Returns(true);
-            configProvider.SetupGet(c => c.SeasonFolderFormat).Returns(@"Season %0s");
-            configProvider.SetupGet(c => c.SeriesName).Returns(true);
-            configProvider.SetupGet(c => c.EpisodeName).Returns(true);
-            configProvider.SetupGet(c => c.AppendQuality).Returns(true);
-            configProvider.SetupGet(c => c.SeparatorStyle).Returns(0);
-            configProvider.SetupGet(c => c.NumberStyle).Returns(2);
-            configProvider.SetupGet(c => c.ReplaceSpaces).Returns(false);
-
-            //Act
-            var result = mocker.Resolve<MediaFileProvider>().ImportNewFiles(@"C:\Test\30 Rock - 1x05 - Episode Title", series);
-
-            //Assert
-            mocker.VerifyAllMocks();
-            Assert.AreEqual(0, result.Count);
-        }
-
-        [Test]
-        [Description("Verifies that a new download will not import successfully, because of invalid episode in new file")]
-        public void import_new_download_not_imported_non_existant_episode()
-        {
-            //Mocks
-            var mocker = new AutoMoqer();
-
-            var diskProvider = mocker.GetMock<DiskProvider>();
-            diskProvider.Setup(d => d.GetFiles(It.IsAny<string>(), "*.*", SearchOption.AllDirectories)).Returns(new string[] { @"C:\Test\30 Rock - 1x05 - Episode Title\30.Rock.S01E05.Gibberish.XviD.avi" });
-            diskProvider.Setup(d => d.GetSize(It.IsAny<string>())).Returns(90000000000);
-
-            var episodeProvider = mocker.GetMock<EpisodeProvider>();
-            episodeProvider.Setup(e => e.GetEpisodes(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode>());
-
-            //Act
-            var result = mocker.Resolve<MediaFileProvider>().ImportNewFiles(@"C:\Test\30 Rock - 1x05 - Episode Title", series);
-
-            //Assert
-            mocker.VerifyAllMocks();
-            Assert.AreEqual(0, result.Count);
-            ExceptionVerification.ExcpectedErrors(1);
-        }
-
-        [Test]
-        [Description("Verifies that a new download will import successfully, deletes previous episode")]
-        public void import_new_download_imported_delete_lesser_quality_multi_episodes()
-        {
-            //Alternate Setup
-            episodeFile.Episodes.Add(episode2);
-            episode2.EpisodeFile = episodeFile;
-
-            //Mocks
-            var mocker = new AutoMoqer();
-
-            var diskProvider = mocker.GetMock<DiskProvider>();
-            diskProvider.Setup(d => d.GetFiles(It.IsAny<string>(), "*.*", SearchOption.AllDirectories)).Returns(new string[] { @"C:\Test\30 Rock - 1x05x06 - Episode Title\30.Rock.S01E05E06.Gibberish.x264.avi" });
-            diskProvider.Setup(d => d.GetSize(It.IsAny<string>())).Returns(90000000000);
-            diskProvider.Setup(d => d.CreateDirectory(It.IsAny<string>())).Returns("ok");
-            diskProvider.Setup(d => d.RenameFile(It.IsAny<string>(), It.IsAny<string>()));
-            diskProvider.Setup(d => d.GetExtension(It.IsAny<string>())).Returns(".mkv");
-
-            var episodeProvider = mocker.GetMock<EpisodeProvider>();
-            episodeProvider.Setup(e => e.GetEpisodes(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { episode, episode2 });
-            episodeProvider.Setup(e => e.GetEpisode(series.SeriesId, 1, 5)).Returns(episode);
-            episodeProvider.Setup(e => e.GetEpisode(series.SeriesId, 1, 6)).Returns(episode2);
-
-            var configProvider = mocker.GetMock<ConfigProvider>();
-            configProvider.SetupGet(c => c.UseSeasonFolder).Returns(true);
-            configProvider.SetupGet(c => c.SeasonFolderFormat).Returns(@"Season %0s");
-            configProvider.SetupGet(c => c.SeriesName).Returns(true);
-            configProvider.SetupGet(c => c.EpisodeName).Returns(true);
-            configProvider.SetupGet(c => c.AppendQuality).Returns(true);
-            configProvider.SetupGet(c => c.SeparatorStyle).Returns(0);
-            configProvider.SetupGet(c => c.NumberStyle).Returns(2);
-            configProvider.SetupGet(c => c.ReplaceSpaces).Returns(false);
-
-            var database = mocker.GetMock<IDatabase>();
-            database.Setup(r => r.Exists<EpisodeFile>(It.IsAny<string>(), It.IsAny<object>())).Returns(false).Verifiable();
-            database.Setup(r => r.Insert(It.IsAny<EpisodeFile>())).Returns(1);
-
-            //Act
-            var result = mocker.Resolve<MediaFileProvider>().ImportNewFiles(@"C:\Test\30 Rock - 1x05x06 - Episode Title", series);
-
-            //Assert
-            mocker.VerifyAllMocks();
-            Assert.AreEqual(1, result.Count);
-        }
-
-        [Test]
-        [Description("Verifies that a new download will import successfully, deletes previous episode")]
-        public void import_new_download_imported_delete_lesser_quality_multi_episode_files()
-        {
-            //Alternate Setup
-            episodeFile2.Episodes.Add(episode2);
-            episode2.EpisodeFile = episodeFile2;
-
-            //Mocks
-            var mocker = new AutoMoqer();
-
-            var diskProvider = mocker.GetMock<DiskProvider>();
-            diskProvider.Setup(d => d.GetFiles(It.IsAny<string>(), "*.*", SearchOption.AllDirectories)).Returns(new string[] { @"C:\Test\30 Rock - 1x05x06 - Episode Title\30.Rock.S01E05E06.Gibberish.x264.avi" });
-            diskProvider.Setup(d => d.GetSize(It.IsAny<string>())).Returns(90000000000);
-            diskProvider.Setup(d => d.CreateDirectory(It.IsAny<string>())).Returns("ok");
-            diskProvider.Setup(d => d.RenameFile(It.IsAny<string>(), It.IsAny<string>()));
-            diskProvider.Setup(d => d.GetExtension(It.IsAny<string>())).Returns(".mkv");
-
-            var episodeProvider = mocker.GetMock<EpisodeProvider>();
-            episodeProvider.Setup(e => e.GetEpisodes(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { episode, episode2 });
-            episodeProvider.Setup(e => e.GetEpisode(series.SeriesId, 1, 5)).Returns(episode);
-            episodeProvider.Setup(e => e.GetEpisode(series.SeriesId, 1, 6)).Returns(episode2);
-
-            var configProvider = mocker.GetMock<ConfigProvider>();
-            configProvider.SetupGet(c => c.UseSeasonFolder).Returns(true);
-            configProvider.SetupGet(c => c.SeasonFolderFormat).Returns(@"Season %0s");
-            configProvider.SetupGet(c => c.SeriesName).Returns(true);
-            configProvider.SetupGet(c => c.EpisodeName).Returns(true);
-            configProvider.SetupGet(c => c.AppendQuality).Returns(true);
-            configProvider.SetupGet(c => c.SeparatorStyle).Returns(0);
-            configProvider.SetupGet(c => c.NumberStyle).Returns(2);
-            configProvider.SetupGet(c => c.ReplaceSpaces).Returns(false);
-
-            var database = mocker.GetMock<IDatabase>();
-            database.Setup(r => r.Exists<EpisodeFile>(It.IsAny<string>(), It.IsAny<object>())).Returns(false).Verifiable();
-            database.Setup(r => r.Insert(It.IsAny<EpisodeFile>())).Returns(1);
-
-            //Act
-            var result = mocker.Resolve<MediaFileProvider>().ImportNewFiles(@"C:\Test\30 Rock - 1x05x06 - Episode Title", series);
-
-            //Assert
-            mocker.VerifyAllMocks();
-            Assert.AreEqual(1, result.Count);
-        }
-
-        [Test]
-        [Description("Verifies that a new download will not import successfully, previous episode is better quality")]
-        public void import_new_download_not_imported_multi_episode_files()
-        {
-            //Alternate Setup
-            episodeFile2.Episodes.Add(episode2);
-            episode2.EpisodeFile = episodeFile2;
-            episodeFile2.Quality = QualityTypes.Bluray720p;
-
-            //Mocks
-            var mocker = new AutoMoqer();
-
-            var diskProvider = mocker.GetMock<DiskProvider>();
-            diskProvider.Setup(d => d.GetFiles(It.IsAny<string>(), "*.*", SearchOption.AllDirectories)).Returns(new string[] { @"C:\Test\30 Rock - 1x05x06 - Episode Title\30.Rock.S01E05E06.Gibberish.x264.avi" });
-            diskProvider.Setup(d => d.GetSize(It.IsAny<string>())).Returns(90000000000);
-            diskProvider.Setup(d => d.CreateDirectory(It.IsAny<string>())).Returns("ok");
-            diskProvider.Setup(d => d.GetExtension(It.IsAny<string>())).Returns(".mkv");
-
-            var episodeProvider = mocker.GetMock<EpisodeProvider>();
-            episodeProvider.Setup(e => e.GetEpisodes(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { episode, episode2 });
-
-            var configProvider = mocker.GetMock<ConfigProvider>();
-            configProvider.SetupGet(c => c.UseSeasonFolder).Returns(true);
-            configProvider.SetupGet(c => c.SeasonFolderFormat).Returns(@"Season %0s");
-            configProvider.SetupGet(c => c.SeriesName).Returns(true);
-            configProvider.SetupGet(c => c.EpisodeName).Returns(true);
-            configProvider.SetupGet(c => c.AppendQuality).Returns(true);
-            configProvider.SetupGet(c => c.SeparatorStyle).Returns(0);
-            configProvider.SetupGet(c => c.NumberStyle).Returns(2);
-            configProvider.SetupGet(c => c.ReplaceSpaces).Returns(false);
-
-            //Act
-            var result = mocker.Resolve<MediaFileProvider>().ImportNewFiles(@"C:\Test\30 Rock - 1x05x06 - Episode Title", series);
-
-            //Assert
-            mocker.VerifyAllMocks();
-            Assert.AreEqual(0, result.Count);
-        }
-
-        [Test]
-        [Description("Verifies that a new download will not import successfully, episode is sample under 40MB")]
-        public void import_new_download_not_imported_episode_sample_under_40MB()
-        {
-            //Alternate Setup
-            episodeFile2.Episodes.Add(episode2);
-            episode2.EpisodeFile = episodeFile2;
-            episodeFile2.Quality = QualityTypes.Bluray720p;
-
-            //Mocks
-            var mocker = new AutoMoqer();
-
-            var diskProvider = mocker.GetMock<DiskProvider>();
-            diskProvider.Setup(d => d.GetFiles(It.IsAny<string>(), "*.*", SearchOption.AllDirectories)).Returns(new string[] { @"C:\Test\30 Rock - 1x05x06 - Episode Title\30.Rock.S01E05.Gibberish.x264-sample.avi" });
-            diskProvider.Setup(d => d.GetSize(It.IsAny<string>())).Returns(30000000);
-
-            //Act
-            var result = mocker.Resolve<MediaFileProvider>().ImportNewFiles(@"C:\Test\30 Rock - 1x05x06 - Episode Title", series);
-
-            //Assert
-            mocker.VerifyAllMocks();
-            Assert.AreEqual(0, result.Count);
-        }
-
-        [Test]
-        [Description("Verifies that a new download will import successfully, even though the episode title contains Sample")]
-        public void import_new_download_imported_contains_sample_over_40MB()
-        {
-            //Mocks
-            var mocker = new AutoMoqer();
-
-            var diskProvider = mocker.GetMock<DiskProvider>();
-            diskProvider.Setup(d => d.GetFiles(It.IsAny<string>(), "*.*", SearchOption.AllDirectories)).Returns(new string[] { @"C:\Test\30 Rock - 1x05 - Episode Title\30.Rock.S01E05.Fourty.Samples.Gibberish.XviD.avi" });
-            diskProvider.Setup(d => d.GetSize(It.IsAny<string>())).Returns(90000000000);
-            diskProvider.Setup(d => d.CreateDirectory(It.IsAny<string>())).Returns("ok");
-            diskProvider.Setup(d => d.RenameFile(It.IsAny<string>(), It.IsAny<string>()));
-            diskProvider.Setup(d => d.GetExtension(It.IsAny<string>())).Returns(".avi");
-
-            var episodeProvider = mocker.GetMock<EpisodeProvider>();
-            episodeProvider.Setup(e => e.GetEpisodes(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { episode });
-            episodeProvider.Setup(e => e.GetEpisode(series.SeriesId, 1, 5)).Returns(episode);
-
-            var configProvider = mocker.GetMock<ConfigProvider>();
-            configProvider.SetupGet(c => c.UseSeasonFolder).Returns(true);
-            configProvider.SetupGet(c => c.SeasonFolderFormat).Returns(@"Season %0s");
-            configProvider.SetupGet(c => c.SeriesName).Returns(true);
-            configProvider.SetupGet(c => c.EpisodeName).Returns(true);
-            configProvider.SetupGet(c => c.AppendQuality).Returns(true);
-            configProvider.SetupGet(c => c.SeparatorStyle).Returns(0);
-            configProvider.SetupGet(c => c.NumberStyle).Returns(2);
-            configProvider.SetupGet(c => c.ReplaceSpaces).Returns(false);
-
-            var database = mocker.GetMock<IDatabase>();
-            database.Setup(r => r.Exists<EpisodeFile>(It.IsAny<string>(), It.IsAny<object>())).Returns(false).Verifiable();
-            database.Setup(r => r.Insert(It.IsAny<EpisodeFile>())).Returns(1);
-
-            //Act
-            var result = mocker.Resolve<MediaFileProvider>().ImportNewFiles(@"C:\Test\30 Rock - 1x05 - Fourty Samples", series);
-
-            //Assert
-            mocker.VerifyAllMocks();
-            Assert.AreEqual(1, result.Count);
-        }
-
-        [Test]
-        [Description("Verifies that a new download will import successfully, even though the efile size is under 40MB")]
-        public void import_new_download_imported_under_40MB()
-        {
-            //Mocks
-            var mocker = new AutoMoqer();
-
-            var diskProvider = mocker.GetMock<DiskProvider>();
-            diskProvider.Setup(d => d.GetFiles(It.IsAny<string>(), "*.*", SearchOption.AllDirectories)).Returns(new string[] { @"C:\Test\30 Rock - 1x05 - Episode Title\30.Rock.S01E05.Gibberish.XviD.avi" });
-            diskProvider.Setup(d => d.GetSize(It.IsAny<string>())).Returns(30000000);
-            diskProvider.Setup(d => d.CreateDirectory(It.IsAny<string>())).Returns("ok");
-            diskProvider.Setup(d => d.RenameFile(It.IsAny<string>(), It.IsAny<string>()));
-            diskProvider.Setup(d => d.GetExtension(It.IsAny<string>())).Returns(".avi");
-
-            var episodeProvider = mocker.GetMock<EpisodeProvider>();
-            episodeProvider.Setup(e => e.GetEpisodes(It.IsAny<EpisodeParseResult>())).Returns(new List<Episode> { episode });
-            episodeProvider.Setup(e => e.GetEpisode(series.SeriesId, 1, 5)).Returns(episode);
-
-            var configProvider = mocker.GetMock<ConfigProvider>();
-            configProvider.SetupGet(c => c.UseSeasonFolder).Returns(true);
-            configProvider.SetupGet(c => c.SeasonFolderFormat).Returns(@"Season %0s");
-            configProvider.SetupGet(c => c.SeriesName).Returns(true);
-            configProvider.SetupGet(c => c.EpisodeName).Returns(true);
-            configProvider.SetupGet(c => c.AppendQuality).Returns(true);
-            configProvider.SetupGet(c => c.SeparatorStyle).Returns(0);
-            configProvider.SetupGet(c => c.NumberStyle).Returns(2);
-            configProvider.SetupGet(c => c.ReplaceSpaces).Returns(false);
-
-            var database = mocker.GetMock<IDatabase>();
-            database.Setup(r => r.Exists<EpisodeFile>(It.IsAny<string>(), It.IsAny<object>())).Returns(false).Verifiable();
-            database.Setup(r => r.Insert(It.IsAny<EpisodeFile>())).Returns(1);
-
-            //Act
-            var result = mocker.Resolve<MediaFileProvider>().ImportNewFiles(@"C:\Test\30 Rock - 1x05 - Episode Title", series);
-
-            //Assert
-            mocker.VerifyAllMocks();
-            Assert.AreEqual(1, result.Count);
-        }
-    }
-}

NzbDrone.Core.Test/NzbDrone.Core.Test.csproj

@@ -87,7 +87,6 @@
     <Compile Include="FluentTest.cs" />
     <Compile Include="LogProviderTest.cs" />
     <Compile Include="UpcomingEpisodesProviderTest.cs" />
-    <Compile Include="MediaFileProvider_ImportNewDownloadTest.cs" />
     <Compile Include="MediaFileProvider_GetNewFilenameTest.cs" />
     <Compile Include="dbBenchmark.cs" />
     <Compile Include="Framework\TestBase.cs" />

NzbDrone.Core.Test/QualityProfileTest.cs

@@ -1,9 +1,11 @@
 // ReSharper disable RedundantUsingDirective
 using System;
 using System.Collections.Generic;
+using AutoMoq;
 using FizzWare.NBuilder;
 using FluentAssertions;
 using NUnit.Framework;
+using NzbDrone.Core.Providers;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Repository.Quality;
 using NzbDrone.Core.Test.Framework;
@@ -63,6 +65,39 @@ namespace NzbDrone.Core.Test
             fetch.Allowed.Should().HaveCount(0);
         }
 
+
+        [Test]
+        public void Update_Success()
+        {
+            //Arrange
+            var mocker = new AutoMoqer();
+            var db = MockLib.GetEmptyDatabase();
+            mocker.SetConstant(db);
+           
+            var testProfile = new QualityProfile
+            {
+                Name = Guid.NewGuid().ToString(),
+                Cutoff = QualityTypes.SDTV
+            };
+
+            //Act
+            var id = Convert.ToInt32(db.Insert(testProfile));
+            var currentProfile = db.SingleOrDefault<QualityProfile>(id);
+
+
+            //Update
+            currentProfile.Cutoff = QualityTypes.Bluray720p;
+            mocker.Resolve<QualityProvider>().Update(currentProfile);
+
+            var updated = mocker.Resolve<QualityProvider>().Get(currentProfile.QualityProfileId);
+
+            //Assert
+            updated.Name.Should().Be(currentProfile.Name);
+            updated.Cutoff.Should().Be(QualityTypes.Bluray720p);
+            updated.AllowedString.Should().Be(currentProfile.AllowedString);
+   
+        }
+
         [Test]
         public void Test_Series_Quality()
         {

NzbDrone.Core.Test/TvDbProviderTest.cs

@@ -25,38 +25,10 @@ namespace NzbDrone.Core.Test
             result[0].SeriesName.Should().Be(title);
         }
 
-        [TestCase("The Simpsons")]
-        [TestCase("Family Guy")]
-        [TestCase("South Park")]
-        public void successful_title_lookup(string title)
-        {
-            var tvCont = new TvDbProvider();
-            var result = tvCont.GetSeries(title);
 
-            result.SeriesName.Should().Be(title);
-        }
 
 
 
-        [TestCase(new object[] { "CAPITAL", "capital", true })]
-        [TestCase(new object[] { "Something!!", "Something", true })]
-        [TestCase(new object[] { "Simpsons 2000", "Simpsons", true })]
-        [TestCase(new object[] { "Simp222sons", "Simpsons", true })]
-        [TestCase(new object[] { "Simpsons", "The Simpsons", true })]
-        [TestCase(new object[] { "Law and order", "Law & order", true })]
-        [TestCase(new object[] { "xxAndxx", "xxxx", false })]
-        [TestCase(new object[] { "Andxx", "xx", false })]
-        [TestCase(new object[] { "xxAnd", "xx", false })]
-        [TestCase(new object[] { "Thexx", "xx", false })]
-        [TestCase(new object[] { "Thexx", "xx", false })]
-        [TestCase(new object[] { "xxThexx", "xxxxx", false })]
-        [TestCase(new object[] { "Simpsons The", "Simpsons", true })]
-        public void Name_match_test(string a, string b, bool match)
-        {
-            bool result = TvDbProvider.IsTitleMatch(a, b);
-
-            Assert.AreEqual(match, result, "{0} , {1}", a, b);
-        }
 
         [Test]
         public void no_search_result()
@@ -71,18 +43,6 @@ namespace NzbDrone.Core.Test
             result.Should().BeEmpty();
         }
 
-        [Test]
-        public void no_result_title_lookup()
-        {
-            //setup
-            var tvdbProvider = new TvDbProvider();
-
-            //act
-            var result = tvdbProvider.GetSeries("clone high");
-
-            //assert
-            Assert.IsNull(result);
-        }
 
         [Test]
         public void none_unique_season_episode_number()

NzbDrone.Core/Datastore/PetaPoco/PetaPoco.cs

@@ -316,7 +316,7 @@ namespace PetaPoco
             Oracle,
             SQLite
         }
-        DBType _dbType = DBType.SqlServer;
+        DBType _dbType = DBType.SQLite;
 
         // Common initialization
         private void CommonConstruct()
@@ -1256,18 +1256,18 @@ namespace PetaPoco
                 case DBType.SQLite:
                 case DBType.MySql:
                     {
-                        existsTemplate = "SELECT EXISTS (SELECT 1 FROM {0} WHERE {1})";
+                        existsTemplate = "SELECT EXISTS (SELECT 1 FROM {0} {1})";
                         break;
                     }
 
                 case DBType.SqlServer:
                     {
-                        existsTemplate = "IF EXISTS (SELECT 1 FROM {0} WHERE {1}) SELECT 1 ELSE SELECT 0";
+                        existsTemplate = "IF EXISTS (SELECT 1 FROM {0} {1}) SELECT 1 ELSE SELECT 0";
                         break;
                     }
                 default:
                     {
-                        existsTemplate = "SELECT COUNT(*) FROM {0} WHERE {1}";
+                        existsTemplate = "SELECT COUNT(*) FROM {0} {1}";
                         break;
                     }
             }

NzbDrone.Core/NzbDrone.Core.csproj

@@ -180,6 +180,7 @@
     <Compile Include="Model\LanguageType.cs" />
     <Compile Include="Model\Quality.cs" />
     <Compile Include="Model\SabnzbdInfoModel.cs" />
+    <Compile Include="Providers\DiskScanProvider.cs" />
     <Compile Include="Providers\DownloadProvider.cs" />
     <Compile Include="Providers\ExternalNotification\ExternalNotificationProviderBase.cs" />
     <Compile Include="Providers\ExternalNotification\XbmcNotificationProvider.cs" />

NzbDrone.Core/Providers/DiskScanProvider.cs

@@ -0,0 +1,232 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Ninject;
+using NLog;
+using NzbDrone.Core.Providers.Core;
+using NzbDrone.Core.Repository;
+using PetaPoco;
+
+namespace NzbDrone.Core.Providers
+{
+    public class DiskScanProvider
+    {
+        private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
+        private static readonly string[] MediaExtentions = new[] {".mkv", ".avi", ".wmv", ".mp4"};
+        private readonly IDatabase _database;
+        private readonly DiskProvider _diskProvider;
+        private readonly EpisodeProvider _episodeProvider;
+        private readonly MediaFileProvider _mediaFileProvider;
+        private readonly SeriesProvider _seriesProvider;
+
+        [Inject]
+        public DiskScanProvider(DiskProvider diskProvider, EpisodeProvider episodeProvider,
+                                SeriesProvider seriesProvider, MediaFileProvider mediaFileProvider,
+                                IDatabase database)
+        {
+            _diskProvider = diskProvider;
+            _episodeProvider = episodeProvider;
+            _seriesProvider = seriesProvider;
+            _mediaFileProvider = mediaFileProvider;
+            _database = database;
+        }
+
+
+        public DiskScanProvider()
+        {
+        }
+
+        /// <summary>
+        ///   Scans the specified series folder for media files
+        /// </summary>
+        /// <param name = "series">The series to be scanned</param>
+        public virtual List<EpisodeFile> Scan(Series series)
+        {
+            return Scan(series, series.Path);
+        }
+
+        /// <summary>
+        ///   Scans the specified series folder for media files
+        /// </summary>
+        /// <param name = "series">The series to be scanned</param>
+        /// <param name="path">Path to scan</param>
+        public virtual List<EpisodeFile> Scan(Series series, string path)
+        {
+            if (_episodeProvider.GetEpisodeBySeries(series.SeriesId).Count == 0)
+            {
+                Logger.Debug("Series {0} has no episodes. skipping", series.Title);
+                return new List<EpisodeFile>();
+            }
+
+            var mediaFileList = GetVideoFiles(path);
+            var fileList = new List<EpisodeFile>();
+
+            foreach (var filePath in mediaFileList)
+            {
+                var file = ImportFile(series, filePath);
+                if (file != null)
+                    fileList.Add(file);
+            }
+
+            series.LastDiskSync = DateTime.Now;
+            _seriesProvider.UpdateSeries(series);
+
+            return fileList;
+        }
+
+
+        public virtual EpisodeFile ImportFile(Series series, string filePath)
+        {
+            Logger.Trace("Importing file to database [{0}]", filePath);
+
+            if (_database.Exists<EpisodeFile>("WHERE Path =@0", Parser.NormalizePath(filePath)))
+            {
+                Logger.Trace("[{0}] already exists in the database. skipping.", filePath);
+                return null;
+            }
+
+            long 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;
+            }
+
+            var parseResult = Parser.ParseEpisodeInfo(filePath);
+
+            if (parseResult == null)
+                return null;
+
+            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<Episode>();
+
+            //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);
+
+                    if (episode != null)
+                    {
+                        episodes.Add(episode);
+                    }
+                    else
+                    {
+                        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;
+            int 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;
+        }
+
+
+        public virtual bool RenameEpisodeFile(EpisodeFile episodeFile)
+        {
+            if (episodeFile == null)
+                throw new ArgumentNullException("episodeFile");
+
+            var series = _seriesProvider.GetSeries(episodeFile.SeriesId);
+            string ext = _diskProvider.GetExtension(episodeFile.Path);
+            var episodes = _episodeProvider.GetEpisodesByFileId(episodeFile.EpisodeFileId);
+            string newFileName = _mediaFileProvider.GetNewFilename(episodes, series.Title, episodeFile.Quality);
+
+            var newFile = _mediaFileProvider.CalculateFilePath(series, episodes.First().SeasonNumber, newFileName, ext);
+
+            //Do the rename
+            _diskProvider.RenameFile(episodeFile.Path, newFile.FullName);
+
+            //Update the filename in the DB
+            episodeFile.Path = newFile.FullName;
+            _mediaFileProvider.Update(episodeFile);
+
+
+            return true;
+        }
+
+
+        /// <summary>
+        ///   Removes files that no longer exist on disk from the database
+        /// </summary>
+        /// <param name = "files">list of files to verify</param>
+        public virtual void CleanUp(List<EpisodeFile> files)
+        {
+            //TODO: remove orphaned files. in files table but not linked to from episode table.
+            foreach (var episodeFile in files)
+            {
+                if (!_diskProvider.FileExists(episodeFile.Path))
+                {
+                    Logger.Trace("File {0} no longer exists on disk. removing from database.", episodeFile.Path);
+
+                    //Set the EpisodeFileId for each episode attached to this file to 0
+                    foreach (var episode in episodeFile.Episodes)
+                    {
+                        episode.EpisodeFileId = 0;
+                        _episodeProvider.UpdateEpisode(episode);
+                    }
+
+                    //Delete it from the DB
+                    _database.Delete<EpisodeFile>(episodeFile.EpisodeFileId);
+                }
+            }
+        }
+
+
+        private List<string> GetVideoFiles(string path)
+        {
+            Logger.Debug("Scanning '{0}' for episodes", path);
+
+            var filesOnDisk = _diskProvider.GetFiles(path, "*.*", SearchOption.AllDirectories);
+
+            var mediaFileList = filesOnDisk.Where(c => MediaExtentions.Contains(Path.GetExtension(c).ToLower())).ToList();
+
+            Logger.Debug("{0} media files were found in {1}", mediaFileList.Count, path);
+            return mediaFileList;
+        }
+    }
+}

NzbDrone.Core/Providers/EpisodeProvider.cs

@@ -143,7 +143,7 @@ namespace NzbDrone.Core.Providers
             return AttachSeries(episodes.ToList());
         }
 
-        public virtual IList<Episode> EpisodesByFileId(int episodeFileId)
+        public virtual IList<Episode> GetEpisodesByFileId(int episodeFileId)
         {
             return AttachSeries(_database.Fetch<Episode>("WHERE EpisodeFileId = @0", episodeFileId));
         }
@@ -288,6 +288,7 @@ namespace NzbDrone.Core.Providers
 
         public Episode AttachSeries(Episode episode)
         {
+            if (episode == null) return episode;
             episode.Series = _seriesProvider.GetSeries(episode.SeriesId);
             return episode;
         }

NzbDrone.Core/Providers/Jobs/DiskScanJob.cs

@@ -11,14 +11,14 @@ namespace NzbDrone.Core.Providers.Jobs
     public class DiskScanJob : IJob
     {
         private readonly SeriesProvider _seriesProvider;
-        private readonly MediaFileProvider _mediaFileProvider;
+        private readonly DiskScanProvider _diskScanProvider;
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         [Inject]
-        public DiskScanJob(SeriesProvider seriesProvider, MediaFileProvider mediaFileProvider)
+        public DiskScanJob(SeriesProvider seriesProvider, DiskScanProvider diskScanProvider)
         {
             _seriesProvider = seriesProvider;
-            _mediaFileProvider = mediaFileProvider;
+            _diskScanProvider = diskScanProvider;
         }
 
         public DiskScanJob()
@@ -52,7 +52,7 @@ namespace NzbDrone.Core.Providers.Jobs
                 try
                 {
                     notification.CurrentMessage = string.Format("Scanning disk for '{0}'", series.Title);
-                    _mediaFileProvider.Scan(series);
+                    _diskScanProvider.Scan(series);
                     notification.CurrentMessage = string.Format("Media File Scan completed for '{0}'", series.Title);
                 }
                 catch (Exception e)

NzbDrone.Core/Providers/Jobs/PostDownloadScanJob.cs

@@ -11,17 +11,17 @@ namespace NzbDrone.Core.Providers.Jobs
     {
         private readonly ConfigProvider _configProvider;
         private readonly DiskProvider _diskProvider;
-        private readonly MediaFileProvider _mediaFileProvider;
+        private readonly DiskScanProvider _diskScanProvider;
         private readonly SeriesProvider _seriesProvider;
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         [Inject]
         public PostDownloadScanJob(ConfigProvider configProvider, DiskProvider diskProvider,
-                                    MediaFileProvider mediaFileProvider, SeriesProvider seriesProvider)
+                                    DiskScanProvider diskScanProvider, SeriesProvider seriesProvider)
         {
             _configProvider = configProvider;
             _diskProvider = diskProvider;
-            _mediaFileProvider = mediaFileProvider;
+            _diskScanProvider = diskScanProvider;
             _seriesProvider = seriesProvider;
         }
 
@@ -84,7 +84,7 @@ namespace NzbDrone.Core.Providers.Jobs
                     return;
                 }
 
-                _mediaFileProvider.ImportNewFiles(subfolder, series);
+                _diskScanProvider.Scan(series, subfolder);
             }
             Logger.Debug("New Download Scan Job completed successfully");
         }

NzbDrone.Core/Providers/Jobs/RenameEpisodeJob.cs

@@ -7,21 +7,17 @@ namespace NzbDrone.Core.Providers.Jobs
 {
     public class RenameEpisodeJob : IJob
     {
-        private readonly DiskProvider _diskProvider;
+        private readonly DiskScanProvider _diskScanProvider;
-        private readonly EpisodeProvider _episodeProvider;
         private readonly MediaFileProvider _mediaFileProvider;
-        private readonly SeriesProvider _seriesProvider;
+
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         [Inject]
-        public RenameEpisodeJob(DiskProvider diskProvider, EpisodeProvider episodeProvider,
+        public RenameEpisodeJob(DiskScanProvider diskScanProvider, MediaFileProvider mediaFileProvider)
-                                MediaFileProvider mediaFileProvider, SeriesProvider seriesProvider)
         {
-            _diskProvider = diskProvider;
+            _diskScanProvider = diskScanProvider;
-            _episodeProvider = episodeProvider;
             _mediaFileProvider = mediaFileProvider;
-            _seriesProvider = seriesProvider;
         }
 
         public string Name
@@ -36,7 +32,8 @@ namespace NzbDrone.Core.Providers.Jobs
 
         public void Start(ProgressNotification notification, int targetId)
         {
-            _mediaFileProvider.RenameEpisodeFile(targetId, notification);
+            var episode = _mediaFileProvider.GetEpisodeFile(targetId);
+            _diskScanProvider.RenameEpisodeFile(episode);
         }
     }
 }

NzbDrone.Core/Providers/MediaFileProvider.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using Ninject;
 using NLog;
 using NzbDrone.Core.Helpers;
-using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers.Core;
 using NzbDrone.Core.Repository;
 using NzbDrone.Core.Repository.Quality;
@@ -16,183 +15,26 @@ namespace NzbDrone.Core.Providers
     public class MediaFileProvider
     {
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
-        private static readonly string[] MediaExtentions = new[] { ".mkv", ".avi", ".wmv", ".mp4" };
-        private readonly DiskProvider _diskProvider;
-        private readonly EpisodeProvider _episodeProvider;
-        private readonly SeriesProvider _seriesProvider;
         private readonly ConfigProvider _configProvider;
         private readonly IDatabase _database;
+        private readonly EpisodeProvider _episodeProvider;
 
         [Inject]
-        public MediaFileProvider(DiskProvider diskProvider, EpisodeProvider episodeProvider,
+        public MediaFileProvider(EpisodeProvider episodeProvider, ConfigProvider configProvider, IDatabase database)
-                                    SeriesProvider seriesProvider, ConfigProvider configProvider,
-                                    IDatabase database)
         {
-            _diskProvider = diskProvider;
             _episodeProvider = episodeProvider;
-            _seriesProvider = seriesProvider;
             _configProvider = configProvider;
             _database = database;
         }
 
-        public MediaFileProvider() { }
+        public MediaFileProvider()
-
-        /// <summary>
-        ///   Scans the specified series folder for media files
-        /// </summary>
-        /// <param name = "series">The series to be scanned</param>
-        public virtual List<EpisodeFile> Scan(Series series)
-        {
-            if (_episodeProvider.GetEpisodeBySeries(series.SeriesId).Count == 0)
-            {
-                Logger.Debug("Series {0} has no episodes. skipping", series.Title);
-                return new List<EpisodeFile>();
-            }
-
-            var mediaFileList = GetVideoFiles(series.Path);
-            var fileList = new List<EpisodeFile>();
-
-            foreach (var filePath in mediaFileList)
-            {
-                var file = ImportFile(series, filePath);
-                if (file != null)
-                    fileList.Add(file);
-            }
-
-            series.LastDiskSync = DateTime.Now;
-            _seriesProvider.UpdateSeries(series);
-
-            return fileList;
-        }
-
-        public virtual EpisodeFile ImportFile(Series series, string filePath)
-        {
-            Logger.Trace("Importing file to database [{0}]", filePath);
-
-            try
-            {
-                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;
-                }
-
-                //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)
-                        return null;
-
-                    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<Episode>();
-
-                    //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);
-
-                            if (episode != null)
-                            {
-                                episodes.Add(episode);
-                            }
-                            else
-                            {
-                                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)
-            {
-                Logger.ErrorException("An error has occurred while importing file " + filePath, ex);
-                throw;
-            }
-            return null;
-        }
-
-        /// <summary>
-        ///   Removes files that no longer exist from the database
-        /// </summary>
-        /// <param name = "files">list of files to verify</param>
-        public virtual void CleanUp(List<EpisodeFile> files)
         {
-            //TODO: remove orphaned files. in files table but not linked to from episode table.
-            foreach (var episodeFile in files)
-            {
-                if (!_diskProvider.FileExists(episodeFile.Path))
-                {
-                    Logger.Trace("File {0} no longer exists on disk. removing from database.", episodeFile.Path);
-
-                    //Set the EpisodeFileId for each episode attached to this file to 0
-                    foreach (var episode in episodeFile.Episodes)
-                    {
-                        episode.EpisodeFileId = 0;
-                        _episodeProvider.UpdateEpisode(episode);
-                    }
-
-                    //Delete it from the DB
-                    _database.Delete<EpisodeFile>(episodeFile.EpisodeFileId);
-                }
-            }
         }
 
         public virtual void Update(EpisodeFile episodeFile)
         {
             _database.Update(episodeFile);
-           }
+        }
 
         public virtual EpisodeFile GetEpisodeFile(int episodeFileId)
         {
@@ -219,231 +61,75 @@ namespace NzbDrone.Core.Providers
             return new Tuple<int, int>(avilableEpisodes.Count, episodeTotal.Count);
         }
 
-        private List<string> GetVideoFiles(string path)
+        public virtual FileInfo CalculateFilePath(Series series, int seasonNumber, string fileName, string extention)
-        {
-            Logger.Debug("Scanning '{0}' for episodes", path);
-
-            var filesOnDisk = _diskProvider.GetFiles(path, "*.*", SearchOption.AllDirectories);
-
-            var mediaFileList = filesOnDisk.Where(c => MediaExtentions.Contains(Path.GetExtension(c).ToLower())).ToList();
-
-            Logger.Debug("{0} media files were found in {1}", mediaFileList.Count, path);
-            return mediaFileList;
-        }
-
-        public virtual List<EpisodeFile> ImportNewFiles(string path, Series series)
         {
-            var result = new List<EpisodeFile>();
+            string path = series.Path;
-
+            if (series.SeasonFolder)
-            //Get all the files except those that are considered samples
-            var files = GetVideoFiles(path).Where(f => _diskProvider.GetSize(f) > 40000000 || !f.ToLower().Contains("sample")).ToList();
-
-            foreach (var file in files)
             {
-                try
+                path = Path.Combine(path, "Season " + seasonNumber);
-                {
-                    //Parse the filename
-                    var parseResult = Parser.ParseEpisodeInfo(Path.GetFileName(file));
-                    parseResult.Series = series;
-                    parseResult.Episodes = _episodeProvider.GetEpisodes(parseResult);
-
-                    if (parseResult.Episodes.Count == 0)
-                    {
-                        Logger.Error("File '{0}' contains invalid episode information, skipping import", file);
-                        continue;
-                    }
-
-                    var ext = _diskProvider.GetExtension(file);
-                    var filename = GetNewFilename(parseResult.Episodes, series.Title, parseResult.Quality.QualityType) + ext;
-                    var folder = series.Path + Path.DirectorySeparatorChar;
-                    if (_configProvider.UseSeasonFolder)
-                        folder += _configProvider.SeasonFolderFormat
-                                    .Replace("%0s", parseResult.SeasonNumber.ToString("00"))
-                                    .Replace("%s", parseResult.SeasonNumber.ToString())
-                                    + Path.DirectorySeparatorChar;
-
-                    _diskProvider.CreateDirectory(folder);
-
-                    //Get a list of episodeFiles that we need to delete and cleanup
-                    var episodeFilesToClean = new List<EpisodeFile>();
-
-                    foreach (var episode in parseResult.Episodes)
-                    {
-                        if (episode.EpisodeFileId > 0)
-                            episodeFilesToClean.Add(episode.EpisodeFile);
-                    }
-
-                    if (episodeFilesToClean.Count != episodeFilesToClean.Where(e => parseResult.Quality.QualityType >= e.Quality).Count())
-                    {
-                        Logger.Debug("Episode isn't an upgrade for all episodes in file: [{0}]. Skipping.", file);
-                        continue;
-                    }
-
-                    //Delete the files and then cleanup!
-                    foreach (var e in episodeFilesToClean)
-                    {
-                        if (_diskProvider.FileExists(e.Path))
-                            _diskProvider.DeleteFile(e.Path);
-                    }
-
-                    CleanUp(episodeFilesToClean);
-
-                    //Move the file
-                    _diskProvider.RenameFile(file, folder + filename);
-
-                    //Import into DB
-                    result.Add(ImportFile(series, folder + filename));
-                }
-
-                catch (Exception ex)
-                {
-                    Logger.WarnException("Error importing new download: " + file, ex);
-                }
             }
 
-            //If we have imported all the non-sample files, delete the folder, requires a minimum of 1 file to be imported.
+            path = Path.Combine(path, fileName + extention);
-            if (files.Count() > 0 && files.Count() == result.Count)
-            {
-                Logger.Debug("All non-sample files have been processed, deleting folder: {0}", path);
-                _diskProvider.DeleteFolder(path, true);
-            }
 
-            return result;
+            return new FileInfo(path);
         }
 
-        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);
-            var useSeriesName = _configProvider.SeriesName;
-            var useEpisodeName = _configProvider.EpisodeName;
-            var replaceSpaces = _configProvider.ReplaceSpaces;
-            var appendQuality = _configProvider.AppendQuality;
 
-            var title = String.Empty;
+            string episodeNames = episodes[0].Title;
-
-            if (episodes.Count == 1)
-            {
-                if (useSeriesName)
-                {
-                    title += seriesName;
-                    title += separatorStyle.Pattern;
-                }
-
-                title += numberStyle.Pattern.Replace("%s", String.Format("{0}", episodes[0].SeasonNumber))
-                                .Replace("%0s", String.Format("{0:00}", episodes[0].SeasonNumber))
-                                .Replace("%0e", String.Format("{0:00}", episodes[0].EpisodeNumber));
-
-                if (useEpisodeName)
-                {
-                    title += separatorStyle.Pattern;
-                    title += episodes[0].Title;
-                }
 
-                if (appendQuality)
+            string result = String.Empty;
-                    title += String.Format(" [{0}]", quality);
 
-                if (replaceSpaces)
+            if (_configProvider.SeriesName)
-                    title = title.Replace(' ', '.');
-
-                Logger.Debug("New File Name is: {0}", title);
-                return title;
-            }
-
-            var multiEpisodeStyle = EpisodeSortingHelper.GetMultiEpisodeStyle(_configProvider.MultiEpisodeStyle);
-
-            if (useSeriesName)
             {
-                title += seriesName;
+                result += seriesTitle + separatorStyle.Pattern;
-                title += separatorStyle.Pattern;
             }
 
-            title += numberStyle.Pattern.Replace("%s", String.Format("{0}", episodes[0].SeasonNumber))
+            result += numberStyle.Pattern.Replace("%0e", String.Format("{0:00}", episodes[0].EpisodeNumber));
-                                .Replace("%0s", String.Format("{0:00}", episodes[0].SeasonNumber))
-                                .Replace("%0e", String.Format("{0:00}", episodes[0].EpisodeNumber));
 
-            var numbers = String.Empty;
+            if (episodes.Count > 1)
-            var episodeNames = episodes[0].Title;
-
-            for (int i = 1; i < episodes.Count; i++)
             {
-                var episode = episodes[i];
+                var multiEpisodeStyle = EpisodeSortingHelper.GetMultiEpisodeStyle(_configProvider.MultiEpisodeStyle);
 
-                if (multiEpisodeStyle.Name == "Duplicate")
+                foreach (var episode in episodes.OrderBy(e => e.EpisodeNumber).Skip(1))
-                {
-                    numbers += separatorStyle.Pattern + numberStyle.Pattern.Replace("%s", String.Format("{0}", episode.SeasonNumber))
-                                .Replace("%0s", String.Format("{0:00}", episode.SeasonNumber))
-                                .Replace("%0e", String.Format("{0:00}", episode.EpisodeNumber));
-                }
-                else
                 {
-                    numbers += multiEpisodeStyle.Pattern.Replace("%s", String.Format("{0}", episode.SeasonNumber))
+                    if (multiEpisodeStyle.Name == "Duplicate")
-                                .Replace("%0s", String.Format("{0:00}", episode.SeasonNumber))
+                    {
-                                .Replace("%0e", String.Format("{0:00}", episode.EpisodeNumber))
+                        result += separatorStyle.Pattern + numberStyle.Pattern;
-                                .Replace("%x", numberStyle.EpisodeSeparator)
+                    }
-                                .Replace("%p", separatorStyle.Pattern);
+                    else
-                }
+                    {
+                        result += multiEpisodeStyle.Pattern;
+                    }
 
-                episodeNames += String.Format(" + {0}", episode.Title);
+                    result = result.Replace("%0e", String.Format("{0:00}", episode.EpisodeNumber));
+                    episodeNames += String.Format(" + {0}", episode.Title);
+                }
             }
 
-            title += numbers;
+            result = result
+                .Replace("%s", String.Format("{0}", episodes.First().SeasonNumber))
+                .Replace("%0s", String.Format("{0:00}", episodes.First().SeasonNumber))
+                .Replace("%x", numberStyle.EpisodeSeparator)
+                .Replace("%p", separatorStyle.Pattern);
 
-            if (useEpisodeName)
+            if (_configProvider.EpisodeName)
             {
                 episodeNames = episodeNames.TrimEnd(' ', '+');
-
+                result += separatorStyle.Pattern + episodeNames;
-                title += separatorStyle.Pattern;
-                title += episodeNames;
             }
 
-            if (appendQuality)
+            if (_configProvider.AppendQuality)
-                title += String.Format(" [{0}]", quality);
+                result += String.Format(" [{0}]", quality);
 
-            if (replaceSpaces)
+            if (_configProvider.ReplaceSpaces)
-                title = title.Replace(' ', '.');
+                result = result.Replace(' ', '.');
 
-            Logger.Debug("New File Name is: {0}", title);
+            Logger.Debug("New File Name is: {0}", result.Trim());
-            return title;
+            return result.Trim();
-        }
-
-        public virtual bool RenameEpisodeFile(int episodeFileId, ProgressNotification notification)
-        {
-            var episodeFile = GetEpisodeFile(episodeFileId);
-
-            if (episodeFile == null)
-                return false;
-
-            try
-            {
-                notification.CurrentMessage = String.Format("Renaming '{0}'", episodeFile.Path);
-
-                var series = _seriesProvider.GetSeries(episodeFile.SeriesId);
-                var folder = new FileInfo(episodeFile.Path).DirectoryName;
-                var episodes = _episodeProvider.EpisodesByFileId(episodeFileId);
-                var ext = _diskProvider.GetExtension(episodeFile.Path);
-
-                var newFileName = GetNewFilename(episodes, series.Title, episodeFile.Quality);
-
-                var newFile = folder + Path.DirectorySeparatorChar + newFileName + ext;
-
-                //Do the rename
-                _diskProvider.RenameFile(episodeFile.Path, newFile);
-
-                //Update the filename in the DB
-                episodeFile.Path = newFile;
-                Update(episodeFile);
-
-                notification.CurrentMessage = String.Format("Finished Renaming '{0}'", newFile);
-            }
-
-            catch (Exception e)
-            {
-                notification.CurrentMessage = String.Format("Failed to Rename '{0}'", episodeFile.Path);
-                Logger.ErrorException("An error has occurred while renaming episode: " + episodeFile.Path, e);
-                throw;
-            }
-            return true;
         }
     }
 }

NzbDrone.Core/Providers/SeriesProvider.cs

@@ -80,17 +80,6 @@ namespace NzbDrone.Core.Providers
             return GetAllSeries().Any(c => c.SeriesId == id && c.Monitored);
         }
 
-        public virtual TvdbSeries MapPathToSeries(string path)
-        {
-            var seriesPath = new DirectoryInfo(path);
-            var searchResults = _tvDbProvider.GetSeries(seriesPath.Name);
-
-            if (searchResults == null)
-                return null;
-
-            return _tvDbProvider.GetSeries(searchResults.Id, false);
-        }
-
         public virtual Series UpdateSeriesInfo(int seriesId)
         {
             var tvDbSeries = _tvDbProvider.GetSeries(seriesId, true);

NzbDrone.Core/Providers/TvDbProvider.cs

@@ -38,43 +38,6 @@ namespace NzbDrone.Core.Providers
         }
 
 
-        public virtual TvdbSearchResult GetSeries(string title)
-        {
-            lock (_handler)
-            {
-                var searchResults = SearchSeries(title);
-                if (searchResults.Count == 0)
-                    return null;
-
-                foreach (var tvdbSearchResult in searchResults)
-                {
-                    if (IsTitleMatch(tvdbSearchResult.SeriesName, title))
-                    {
-                        Logger.Debug("Search for '{0}' was successful", title);
-                        return tvdbSearchResult;
-                    }
-                }
-            }
-            return null;
-        }
-
-        public virtual int GetBestMatch(List<TvdbSearchResult> searchResults, string title)
-        {
-            if (searchResults.Count == 0)
-                return 0;
-
-            foreach (var tvdbSearchResult in searchResults)
-            {
-                if (IsTitleMatch(tvdbSearchResult.SeriesName, title))
-                {
-                    Logger.Debug("Search for '{0}' was successful", title);
-                    return tvdbSearchResult.Id;
-                }
-            }
-
-            return searchResults[0].Id;
-        }
-
         public virtual TvdbSeries GetSeries(int id, bool loadEpisodes)
         {
             lock (_handler)
@@ -116,34 +79,5 @@ namespace NzbDrone.Core.Providers
             }
         }
 
-        /// <summary>
-        ///   Determines whether a title in a search result is equal to the title searched for.
-        /// </summary>
-        /// <param name = "directoryName">Name of the directory.</param>
-        /// <param name = "tvdbTitle">The TVDB title.</param>
-        /// <returns>
-        ///   <c>true</c> if the titles are found to be same; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool IsTitleMatch(string directoryName, string tvdbTitle)
-        {
-            var result = false;
-
-            if (String.IsNullOrEmpty(directoryName))
-                throw new ArgumentException("directoryName");
-            if (String.IsNullOrEmpty(tvdbTitle))
-                throw new ArgumentException("tvdbTitle");
-
-            if (String.Equals(directoryName, tvdbTitle, StringComparison.CurrentCultureIgnoreCase))
-            {
-                result = true;
-            }
-            else if (String.Equals(CleanUpRegex.Replace(directoryName, ""), CleanUpRegex.Replace(tvdbTitle, ""),
-                                   StringComparison.InvariantCultureIgnoreCase))
-                result = true;
-
-            Logger.Debug("Match between '{0}' and '{1}' was {2}", tvdbTitle, directoryName, result);
-
-            return result;
-        }
     }
 }