Download Handling, Clean Up Drone Folder Leftovers

2026-04-26 22:46:37 -04:00 · 2017-09-17 23:00:37 -04:00
parent 9f689c0233
commit 405e7f981d
24 changed files with 467 additions and 754 deletions
@@ -1,10 +1,10 @@
+using System;
 using System.Collections.Generic;
 using System.IO;
 using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common.Disk;
-using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.TrackedDownloads;
 using NzbDrone.Core.MediaFiles;
@@ -12,7 +12,7 @@ using NzbDrone.Core.MediaFiles.Commands;
 using NzbDrone.Core.MediaFiles.TrackImport;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
+using NzbDrone.Core.Music;
 using NzbDrone.Test.Common;

 namespace NzbDrone.Core.Test.MediaFiles
@@ -20,7 +20,6 @@ namespace NzbDrone.Core.Test.MediaFiles
    [TestFixture]
    public class DownloadedAlbumsCommandServiceFixture : CoreTest<DownloadedAlbumsCommandService>
    {
-        private string _droneFactory = "c:\\drop\\".AsOsAgnostic();
        private string _downloadFolder = "c:\\drop_other\\Show.S01E01\\".AsOsAgnostic();
        private string _downloadFile = "c:\\drop_other\\Show.S01E01.mkv".AsOsAgnostic();

@@ -29,15 +28,13 @@ namespace NzbDrone.Core.Test.MediaFiles
        [SetUp]
        public void Setup()
        {
-            Mocker.GetMock<IConfigService>().SetupGet(c => c.DownloadedAlbumsFolder)
-                  .Returns(_droneFactory);

-            Mocker.GetMock<IDownloadedEpisodesImportService>()
+            Mocker.GetMock<IDownloadedTracksImportService>()
                .Setup(v => v.ProcessRootFolder(It.IsAny<DirectoryInfo>()))
                .Returns(new List<ImportResult>());

-            Mocker.GetMock<IDownloadedEpisodesImportService>()
-                .Setup(v => v.ProcessPath(It.IsAny<string>(), It.IsAny<ImportMode>(), It.IsAny<Series>(), It.IsAny<DownloadClientItem>()))
+            Mocker.GetMock<IDownloadedTracksImportService>()
+                .Setup(v => v.ProcessPath(It.IsAny<string>(), It.IsAny<ImportMode>(), It.IsAny<Artist>(), It.IsAny<DownloadClientItem>()))
                .Returns(new List<ImportResult>());

            var downloadItem = Builder<DownloadClientItem>.CreateNew()
@@ -45,14 +42,14 @@ namespace NzbDrone.Core.Test.MediaFiles
                .With(v => v.Status = DownloadItemStatus.Downloading)
                .Build();

-            var remoteEpisode = Builder<RemoteEpisode>.CreateNew()
-                .With(v => v.Series = new Series())
+            var remoteAlbum = Builder<RemoteAlbum>.CreateNew()
+                .With(v => v.Artist = new Artist())
                .Build();

            _trackedDownload = new TrackedDownload
                    {
                        DownloadItem = downloadItem,
-                        RemoteEpisode = remoteEpisode,
+                        RemoteAlbum = remoteAlbum,
                        State = TrackedDownloadStage.Downloading
                    };
        }
@@ -76,35 +73,15 @@ namespace NzbDrone.Core.Test.MediaFiles
                  .Returns(_trackedDownload);
        }

-        [Test]
-        public void should_process_dronefactory_if_path_is_not_specified()
-        {
-            GivenExistingFolder(_droneFactory);
-
-            Subject.Execute(new DownloadedAlbumsScanCommand());
-
-            Mocker.GetMock<IDownloadedEpisodesImportService>().Verify(c => c.ProcessRootFolder(It.IsAny<DirectoryInfo>()), Times.Once());
-        }
-
        [Test]
        public void should_skip_import_if_dronefactory_doesnt_exist()
        {
-            Subject.Execute(new DownloadedAlbumsScanCommand());
+            Assert.Throws<ArgumentException>(() => Subject.Execute(new DownloadedAlbumsScanCommand()));

-            Mocker.GetMock<IDownloadedEpisodesImportService>().Verify(c => c.ProcessRootFolder(It.IsAny<DirectoryInfo>()), Times.Never());
+            Mocker.GetMock<IDownloadedTracksImportService>().Verify(c => c.ProcessRootFolder(It.IsAny<DirectoryInfo>()), Times.Never());

-            ExceptionVerification.ExpectedWarns(1);
        }

-        [Test]
-        public void should_ignore_downloadclientid_if_path_is_not_specified()
-        {
-            GivenExistingFolder(_droneFactory);
-
-            Subject.Execute(new DownloadedAlbumsScanCommand() { DownloadClientId = "sab1" });
-
-            Mocker.GetMock<IDownloadedEpisodesImportService>().Verify(c => c.ProcessRootFolder(It.IsAny<DirectoryInfo>()), Times.Once());
-        }

        [Test]
        public void should_process_folder_if_downloadclientid_is_not_specified()
@@ -113,7 +90,7 @@ namespace NzbDrone.Core.Test.MediaFiles

            Subject.Execute(new DownloadedAlbumsScanCommand() { Path = _downloadFolder });

-            Mocker.GetMock<IDownloadedEpisodesImportService>().Verify(c => c.ProcessPath(It.IsAny<string>(), ImportMode.Auto, null, null), Times.Once());
+            Mocker.GetMock<IDownloadedTracksImportService>().Verify(c => c.ProcessPath(It.IsAny<string>(), ImportMode.Auto, null, null), Times.Once());
        }

        [Test]
@@ -123,7 +100,7 @@ namespace NzbDrone.Core.Test.MediaFiles

            Subject.Execute(new DownloadedAlbumsScanCommand() { Path = _downloadFile });

-            Mocker.GetMock<IDownloadedEpisodesImportService>().Verify(c => c.ProcessPath(It.IsAny<string>(), ImportMode.Auto, null, null), Times.Once());
+            Mocker.GetMock<IDownloadedTracksImportService>().Verify(c => c.ProcessPath(It.IsAny<string>(), ImportMode.Auto, null, null), Times.Once());
        }

        [Test]
@@ -134,7 +111,7 @@ namespace NzbDrone.Core.Test.MediaFiles

            Subject.Execute(new DownloadedAlbumsScanCommand() { Path = _downloadFolder, DownloadClientId = "sab1" });

-            Mocker.GetMock<IDownloadedEpisodesImportService>().Verify(c => c.ProcessPath(_downloadFolder, ImportMode.Auto, _trackedDownload.RemoteEpisode.Series, _trackedDownload.DownloadItem), Times.Once());
+            Mocker.GetMock<IDownloadedTracksImportService>().Verify(c => c.ProcessPath(_downloadFolder, ImportMode.Auto, _trackedDownload.RemoteAlbum.Artist, _trackedDownload.DownloadItem), Times.Once());
        }

        [Test]
@@ -144,7 +121,7 @@ namespace NzbDrone.Core.Test.MediaFiles

            Subject.Execute(new DownloadedAlbumsScanCommand() { Path = _downloadFolder, DownloadClientId = "sab1" });

-            Mocker.GetMock<IDownloadedEpisodesImportService>().Verify(c => c.ProcessPath(_downloadFolder, ImportMode.Auto, null, null), Times.Once());
+            Mocker.GetMock<IDownloadedTracksImportService>().Verify(c => c.ProcessPath(_downloadFolder, ImportMode.Auto, null, null), Times.Once());

            ExceptionVerification.ExpectedWarns(1);
        }
@@ -154,7 +131,7 @@ namespace NzbDrone.Core.Test.MediaFiles
        {
            Subject.Execute(new DownloadedAlbumsScanCommand() { Path = _downloadFolder });

-            Mocker.GetMock<IDownloadedEpisodesImportService>().Verify(c => c.ProcessPath(It.IsAny<string>(), ImportMode.Auto, null, null), Times.Never());
+            Mocker.GetMock<IDownloadedTracksImportService>().Verify(c => c.ProcessPath(It.IsAny<string>(), ImportMode.Auto, null, null), Times.Never());

            ExceptionVerification.ExpectedWarns(1);
        }
@@ -166,7 +143,7 @@ namespace NzbDrone.Core.Test.MediaFiles

            Subject.Execute(new DownloadedAlbumsScanCommand() { Path = _downloadFile, ImportMode = ImportMode.Copy });

-            Mocker.GetMock<IDownloadedEpisodesImportService>().Verify(c => c.ProcessPath(It.IsAny<string>(), ImportMode.Copy, null, null), Times.Once());
+            Mocker.GetMock<IDownloadedTracksImportService>().Verify(c => c.ProcessPath(It.IsAny<string>(), ImportMode.Copy, null, null), Times.Once());
        }
    }
 }
@@ -11,7 +11,6 @@ using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
 using NzbDrone.Core.Music;
 using NzbDrone.Test.Common;
 using FluentAssertions;
@@ -19,7 +18,7 @@ using FluentAssertions;
 namespace NzbDrone.Core.Test.MediaFiles
 {
    [TestFixture]
-    public class DownloadedTracksImportServiceFixture : CoreTest<DownloadedEpisodesImportService>
+    public class DownloadedTracksImportServiceFixture : CoreTest<DownloadedTracksImportService>
    {
        private string _droneFactory = "c:\\drop\\".AsOsAgnostic();
        private string[] _subFolders = new[] { "c:\\root\\foldername".AsOsAgnostic() };
@@ -42,25 +41,25 @@ namespace NzbDrone.Core.Test.MediaFiles
                  .Returns(new List<ImportResult>());
        }

-        private void GivenValidSeries()
+        private void GivenValidArtist()
        {
            Mocker.GetMock<IParsingService>()
-                  .Setup(s => s.GetSeries(It.IsAny<string>()))
-                  .Returns(Builder<Series>.CreateNew().Build());
+                  .Setup(s => s.GetArtist(It.IsAny<string>()))
+                  .Returns(Builder<Artist>.CreateNew().Build());
        }

        [Test]
-        public void should_search_for_series_using_folder_name()
+        public void should_search_for_artist_using_folder_name()
        {
            Subject.ProcessRootFolder(new DirectoryInfo(_droneFactory));

-            Mocker.GetMock<IParsingService>().Verify(c => c.GetSeries("foldername"), Times.Once());
+            Mocker.GetMock<IParsingService>().Verify(c => c.GetArtist("foldername"), Times.Once());
        }

        [Test]
        public void should_skip_if_file_is_in_use_by_another_process()
        {
-            GivenValidSeries();
+            GivenValidArtist();

            Mocker.GetMock<IDiskProvider>().Setup(c => c.IsFileLocked(It.IsAny<string>()))
                  .Returns(true);
@@ -71,9 +70,9 @@ namespace NzbDrone.Core.Test.MediaFiles
        }

        [Test]
-        public void should_skip_if_no_series_found()
+        public void should_skip_if_no_artist_found()
        {
-            Mocker.GetMock<IParsingService>().Setup(c => c.GetSeries("foldername")).Returns((Series)null);
+            Mocker.GetMock<IParsingService>().Setup(c => c.GetArtist("foldername")).Returns((Artist)null);

            Subject.ProcessRootFolder(new DirectoryInfo(_droneFactory));

@@ -85,12 +84,12 @@ namespace NzbDrone.Core.Test.MediaFiles
        }

        [Test]
-        public void should_not_import_if_folder_is_a_series_path()
+        public void should_not_import_if_folder_is_a_artist_path()
        {
-            GivenValidSeries();
+            GivenValidArtist();

-            Mocker.GetMock<ISeriesService>()
-                  .Setup(s => s.SeriesPathExists(It.IsAny<string>()))
+            Mocker.GetMock<IArtistService>()
+                  .Setup(s => s.ArtistPathExists(It.IsAny<string>()))
                  .Returns(true);

            Mocker.GetMock<IDiskScanService>()
@@ -108,7 +107,7 @@ namespace NzbDrone.Core.Test.MediaFiles
        [Test]
        public void should_not_delete_folder_if_no_files_were_imported()
        {
-            Mocker.GetMock<IImportApprovedEpisodes>()
+            Mocker.GetMock<IImportApprovedTracks>()
                  .Setup(s => s.Import(It.IsAny<List<ImportDecision>>(), false, null, ImportMode.Auto))
                  .Returns(new List<ImportResult>());

@@ -121,18 +120,18 @@ namespace NzbDrone.Core.Test.MediaFiles
        [Test]
        public void should_not_delete_folder_if_files_were_imported_and_video_files_remain()
        {
-            GivenValidSeries();
+            GivenValidArtist();

-            var localEpisode = new LocalTrack();
+            var localTrack = new LocalTrack();

            var imported = new List<ImportDecision>();
-            imported.Add(new ImportDecision(localEpisode));
+            imported.Add(new ImportDecision(localTrack));

            Mocker.GetMock<IMakeImportDecision>()
                  .Setup(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Artist>(), null))
                  .Returns(imported);

-            Mocker.GetMock<IImportApprovedEpisodes>()
+            Mocker.GetMock<IImportApprovedTracks>()
                  .Setup(s => s.Import(It.IsAny<List<ImportDecision>>(), true, null, ImportMode.Auto))
                  .Returns(imported.Select(i => new ImportResult(i)).ToList());

@@ -147,7 +146,7 @@ namespace NzbDrone.Core.Test.MediaFiles
        [Test]
        public void should_delete_folder_if_files_were_imported_and_only_sample_files_remain()
        {
-            GivenValidSeries();
+            GivenValidArtist();

            var localEpisode = new LocalTrack();

@@ -158,17 +157,17 @@ namespace NzbDrone.Core.Test.MediaFiles
                  .Setup(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Artist>(), null))
                  .Returns(imported);

-            Mocker.GetMock<IImportApprovedEpisodes>()
+            Mocker.GetMock<IImportApprovedTracks>()
                  .Setup(s => s.Import(It.IsAny<List<ImportDecision>>(), true, null, ImportMode.Auto))
                  .Returns(imported.Select(i => new ImportResult(i)).ToList());

-            Mocker.GetMock<IDetectSample>()
-                  .Setup(s => s.IsSample(It.IsAny<Series>(),
-                      It.IsAny<QualityModel>(),
-                      It.IsAny<string>(),
-                      It.IsAny<long>(),
-                      It.IsAny<bool>()))
-                  .Returns(true);
+            //Mocker.GetMock<IDetectSample>()
+            //      .Setup(s => s.IsSample(It.IsAny<Artist>(),
+            //          It.IsAny<QualityModel>(),
+            //          It.IsAny<string>(),
+            //          It.IsAny<long>(),
+            //          It.IsAny<bool>()))
+            //      .Returns(true);

            Subject.ProcessRootFolder(new DirectoryInfo(_droneFactory));

@@ -190,14 +189,14 @@ namespace NzbDrone.Core.Test.MediaFiles
            Subject.ProcessRootFolder(new DirectoryInfo(_droneFactory));

            Mocker.GetMock<IParsingService>()
-                .Verify(v => v.GetSeries(folderName), Times.Once());
+                .Verify(v => v.GetArtist(folderName), Times.Once());

            Mocker.GetMock<IParsingService>()
-                .Verify(v => v.GetSeries(It.Is<string>(s => s.StartsWith(prefix))), Times.Never());
+                .Verify(v => v.GetArtist(It.Is<string>(s => s.StartsWith(prefix))), Times.Never());
        }

        [Test]
-        public void should_return_importresult_on_unknown_series()
+        public void should_return_importresult_on_unknown_artist()
        {
            Mocker.GetMock<IDiskProvider>().Setup(c => c.FolderExists(It.IsAny<string>()))
                  .Returns(false);
@@ -219,7 +218,7 @@ namespace NzbDrone.Core.Test.MediaFiles
        [Test]
        public void should_not_delete_if_there_is_large_rar_file()
        {
-            GivenValidSeries();
+            GivenValidArtist();

            var localEpisode = new LocalTrack();

@@ -230,17 +229,17 @@ namespace NzbDrone.Core.Test.MediaFiles
                  .Setup(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Artist>(), null))
                  .Returns(imported);

-            Mocker.GetMock<IImportApprovedEpisodes>()
+            Mocker.GetMock<IImportApprovedTracks>()
                  .Setup(s => s.Import(It.IsAny<List<ImportDecision>>(), true, null, ImportMode.Auto))
                  .Returns(imported.Select(i => new ImportResult(i)).ToList());

-            Mocker.GetMock<IDetectSample>()
-                  .Setup(s => s.IsSample(It.IsAny<Series>(),
-                      It.IsAny<QualityModel>(),
-                      It.IsAny<string>(),
-                      It.IsAny<long>(),
-                      It.IsAny<bool>()))
-                  .Returns(true);
+            //Mocker.GetMock<IDetectSample>()
+            //      .Setup(s => s.IsSample(It.IsAny<Artist>(),
+            //          It.IsAny<QualityModel>(),
+            //          It.IsAny<string>(),
+            //          It.IsAny<long>(),
+            //          It.IsAny<bool>()))
+            //      .Returns(true);

            Mocker.GetMock<IDiskProvider>()
                  .Setup(s => s.GetFiles(It.IsAny<string>(), SearchOption.AllDirectories))
@@ -261,7 +260,7 @@ namespace NzbDrone.Core.Test.MediaFiles
        [Test]
        public void should_use_folder_if_folder_import()
        {
-            GivenValidSeries();
+            GivenValidArtist();

            var folderName = @"C:\media\ba09030e-1234-1234-1234-123456789abc\[HorribleSubs] Maria the Virgin Witch - 09 [720p]".AsOsAgnostic();
            var fileName = @"C:\media\ba09030e-1234-1234-1234-123456789abc\[HorribleSubs] Maria the Virgin Witch - 09 [720p]\[HorribleSubs] Maria the Virgin Witch - 09 [720p].mkv".AsOsAgnostic();
@@ -287,7 +286,7 @@ namespace NzbDrone.Core.Test.MediaFiles
        [Test]
        public void should_not_use_folder_if_file_import()
        {
-            GivenValidSeries();
+            GivenValidArtist();

            var fileName = @"C:\media\ba09030e-1234-1234-1234-123456789abc\Torrents\[HorribleSubs] Maria the Virgin Witch - 09 [720p].mkv".AsOsAgnostic();

@@ -322,7 +321,7 @@ namespace NzbDrone.Core.Test.MediaFiles
            Subject.ProcessPath(folderName).Should().BeEmpty();

            Mocker.GetMock<IParsingService>()
-                .Verify(v => v.GetSeries(It.IsAny<string>()), Times.Never());
+                .Verify(v => v.GetArtist(It.IsAny<string>()), Times.Never());

            ExceptionVerification.ExpectedErrors(1);
        }
@@ -330,7 +329,7 @@ namespace NzbDrone.Core.Test.MediaFiles
        [Test]
        public void should_not_delete_if_no_files_were_imported()
        {
-            GivenValidSeries();
+            GivenValidArtist();

            var localEpisode = new LocalTrack();

@@ -341,17 +340,17 @@ namespace NzbDrone.Core.Test.MediaFiles
                  .Setup(s => s.GetImportDecisions(It.IsAny<List<string>>(), It.IsAny<Artist>(), null))
                  .Returns(imported);

-            Mocker.GetMock<IImportApprovedEpisodes>()
+            Mocker.GetMock<IImportApprovedTracks>()
                  .Setup(s => s.Import(It.IsAny<List<ImportDecision>>(), true, null, ImportMode.Auto))
                  .Returns(new List<ImportResult>());

-            Mocker.GetMock<IDetectSample>()
-                  .Setup(s => s.IsSample(It.IsAny<Series>(),
-                      It.IsAny<QualityModel>(),
-                      It.IsAny<string>(),
-                      It.IsAny<long>(),
-                      It.IsAny<bool>()))
-                  .Returns(true);
+            //Mocker.GetMock<IDetectSample>()
+            //      .Setup(s => s.IsSample(It.IsAny<Artist>(),
+            //          It.IsAny<QualityModel>(),
+            //          It.IsAny<string>(),
+            //          It.IsAny<long>(),
+            //          It.IsAny<bool>()))
+            //      .Returns(true);

            Mocker.GetMock<IDiskProvider>()
                  .Setup(s => s.GetFileSize(It.IsAny<string>()))
@@ -365,13 +364,13 @@ namespace NzbDrone.Core.Test.MediaFiles

        private void VerifyNoImport()
        {
-            Mocker.GetMock<IImportApprovedEpisodes>().Verify(c => c.Import(It.IsAny<List<ImportDecision>>(), true, null, ImportMode.Auto),
+            Mocker.GetMock<IImportApprovedTracks>().Verify(c => c.Import(It.IsAny<List<ImportDecision>>(), true, null, ImportMode.Auto),
                Times.Never());
        }

        private void VerifyImport()
        {
-            Mocker.GetMock<IImportApprovedEpisodes>().Verify(c => c.Import(It.IsAny<List<ImportDecision>>(), true, null, ImportMode.Auto),
+            Mocker.GetMock<IImportApprovedTracks>().Verify(c => c.Import(It.IsAny<List<ImportDecision>>(), true, null, ImportMode.Auto),
                Times.Once());
        }
    }