diff --git a/src/NzbDrone.Core.Test/MediaFiles/DownloadedMoviesImportServiceFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/DownloadedMoviesImportServiceFixture.cs index 553ca772d..b121fb88e 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/DownloadedMoviesImportServiceFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/DownloadedMoviesImportServiceFixture.cs @@ -445,6 +445,58 @@ namespace NzbDrone.Core.Test.MediaFiles .Verify(v => v.DeleteFolder(It.IsAny(), true), Times.Never()); } + [Test] + public void should_return_rejection_if_nothing_imported_and_contains_rar_file() + { + GivenValidMovie(); + + var path = @"C:\media\ba09030e-1234-1234-1234-123456789abc\[HorribleSubs] American Psycho (2000) [720p]\[HorribleSubs] American Psycho (2000) [720p].mkv".AsOsAgnostic(); + var imported = new List(); + + Mocker.GetMock() + .Setup(s => s.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), null, true, true)) + .Returns(imported); + + Mocker.GetMock() + .Setup(s => s.Import(It.IsAny>(), true, null, ImportMode.Auto)) + .Returns(imported.Select(i => new ImportResult(i)).ToList()); + + Mocker.GetMock() + .Setup(s => s.GetFiles(It.IsAny(), SearchOption.AllDirectories)) + .Returns(new[] { _videoFiles.First().Replace(".ext", ".rar") }); + + var result = Subject.ProcessPath(path); + + result.Count.Should().Be(1); + result.First().Result.Should().Be(ImportResultType.Rejected); + } + + [Test] + public void should_return_rejection_if_nothing_imported_and_contains_executable_file() + { + GivenValidMovie(); + + var path = @"C:\media\ba09030e-1234-1234-1234-123456789abc\[HorribleSubs] American Psycho (2000) [720p]\[HorribleSubs] American Psycho (2000) [720p].mkv".AsOsAgnostic(); + var imported = new List(); + + Mocker.GetMock() + .Setup(s => s.GetImportDecisions(It.IsAny>(), It.IsAny(), It.IsAny(), null, true, true)) + .Returns(imported); + + Mocker.GetMock() + .Setup(s => s.Import(It.IsAny>(), true, null, ImportMode.Auto)) + .Returns(imported.Select(i => new ImportResult(i)).ToList()); + + Mocker.GetMock() + .Setup(s => s.GetFiles(It.IsAny(), SearchOption.AllDirectories)) + .Returns(new[] { _videoFiles.First().Replace(".ext", ".exe") }); + + var result = Subject.ProcessPath(path); + + result.Count.Should().Be(1); + result.First().Result.Should().Be(ImportResultType.Rejected); + } + private void VerifyNoImport() { Mocker.GetMock().Verify(c => c.Import(It.IsAny>(), true, null, ImportMode.Auto), diff --git a/src/NzbDrone.Core/Download/CompletedDownloadService.cs b/src/NzbDrone.Core/Download/CompletedDownloadService.cs index cd2433172..93621698e 100644 --- a/src/NzbDrone.Core/Download/CompletedDownloadService.cs +++ b/src/NzbDrone.Core/Download/CompletedDownloadService.cs @@ -134,14 +134,33 @@ namespace NzbDrone.Core.Download trackedDownload.Warn("No files found are eligible for import in {0}", outputPath); } + if (importResults.Count == 1) + { + var firstResult = importResults.First(); + + if (firstResult.Result == ImportResultType.Rejected && firstResult.ImportDecision.LocalMovie == null) + { + trackedDownload.Warn(new TrackedDownloadStatusMessage(firstResult.Errors.First(), new List())); + + return; + } + } + + var statusMessages = new List + { + new TrackedDownloadStatusMessage("One or more movies expected in this release were not imported or missing", new List()) + }; + if (importResults.Any(c => c.Result != ImportResultType.Imported)) { - var statusMessages = importResults + statusMessages.AddRange(importResults .Where(v => v.Result != ImportResultType.Imported && v.ImportDecision.LocalMovie != null) - .Select(v => new TrackedDownloadStatusMessage(Path.GetFileName(v.ImportDecision.LocalMovie.Path), v.Errors)) - .ToArray(); + .Select(v => new TrackedDownloadStatusMessage(Path.GetFileName(v.ImportDecision.LocalMovie.Path), v.Errors))); - trackedDownload.Warn(statusMessages); + if (statusMessages.Any()) + { + trackedDownload.Warn(statusMessages.ToArray()); + } } } diff --git a/src/NzbDrone.Core/MediaFiles/DownloadedMovieImportService.cs b/src/NzbDrone.Core/MediaFiles/DownloadedMovieImportService.cs index 1060e6ad1..42fc5bf6b 100644 --- a/src/NzbDrone.Core/MediaFiles/DownloadedMovieImportService.cs +++ b/src/NzbDrone.Core/MediaFiles/DownloadedMovieImportService.cs @@ -184,7 +184,10 @@ namespace NzbDrone.Core.MediaFiles if (_movieService.MoviePathExists(directoryInfo.FullName)) { _logger.Warn("Unable to process folder that is mapped to an existing movie"); - return new List(); + return new List + { + RejectionResult("Import path is mapped to a movie folder") + }; } var cleanedUpName = GetCleanedUpFolderName(directoryInfo.Name); @@ -228,6 +231,10 @@ namespace NzbDrone.Core.MediaFiles _logger.Debug("Deleting folder after importing valid files"); _diskProvider.DeleteFolder(directoryInfo.FullName, true); } + else if (importResults.Empty()) + { + importResults.AddIfNotNull(CheckEmptyResultForIssue(directoryInfo.FullName)); + } return importResults; } @@ -312,6 +319,28 @@ namespace NzbDrone.Core.MediaFiles return new ImportResult(new ImportDecision(localMovie, new Rejection("Unknown Movie")), message); } + private ImportResult RejectionResult(string message) + { + return new ImportResult(new ImportDecision(null, new Rejection(message)), message); + } + + private ImportResult CheckEmptyResultForIssue(string folder) + { + var files = _diskProvider.GetFiles(folder, SearchOption.AllDirectories); + + if (files.Any(file => FileExtensions.ExecutableExtensions.Contains(Path.GetExtension(file)))) + { + return RejectionResult("Caution: Found executable file"); + } + + if (files.Any(file => FileExtensions.ArchiveExtensions.Contains(Path.GetExtension(file)))) + { + return RejectionResult("Found archive file, might need to be extracted"); + } + + return null; + } + private void LogInaccessiblePathError(string path) { if (_runtimeInfo.IsWindowsService) diff --git a/src/NzbDrone.Core/MediaFiles/FileExtensions.cs b/src/NzbDrone.Core/MediaFiles/FileExtensions.cs new file mode 100644 index 000000000..a6b0c1991 --- /dev/null +++ b/src/NzbDrone.Core/MediaFiles/FileExtensions.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; + +namespace NzbDrone.Core.MediaFiles +{ + internal static class FileExtensions + { + private static List _archiveExtensions = new List + { + ".rar", + ".r00", + ".zip", + ".tar", + ".gz", + ".tar.gz" + }; + + private static List _executableExtensions = new List + { + ".exe", + ".bat", + ".cmd", + ".sh" + }; + + public static HashSet ArchiveExtensions => new HashSet(_archiveExtensions, StringComparer.OrdinalIgnoreCase); + public static HashSet ExecutableExtensions => new HashSet(_executableExtensions, StringComparer.OrdinalIgnoreCase); + } +}