shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-10-02 16:52:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Importing of completed download when not a child of the download client output path

Browse Source
This commit is contained in:
Mark McDowall
2019-01-09 17:51:54 -08:00
committed by ta264
parent 92a0305740
commit 1dfe6eb6ed
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/NzbDrone.Core.Test/MediaFiles/ImportApprovedMoviesFixture.cs
View File

@@ -364,5 +364,21 @@ namespace NzbDrone.Core.Test.MediaFiles
Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<MovieFile>(c => c.OriginalFilePath == $"{name}.mkv")));
}
[Test]
public void should_use_folder_info_original_title_to_find_relative_path_when_file_is_not_in_download_client_item_output_directory()
{
var name = "Transformers.2007.720p.BluRay.x264-Radarr";
var outputPath = Path.Combine(@"C:\Test\Unsorted\movie\".AsOsAgnostic(), name);
var localMovie = _approvedDecisions.First().LocalMovie;
_downloadClientItem.OutputPath = new OsPath(Path.Combine(@"C:\Test\Unsorted\movie-Other\".AsOsAgnostic(), name));
localMovie.FolderMovieInfo = new ParsedMovieInfo { ReleaseTitle = name };
localMovie.Path = Path.Combine(outputPath, "subfolder", name + ".mkv");
Subject.Import(new List<ImportDecision> { _approvedDecisions.First() }, true, _downloadClientItem);
Mocker.GetMock<IMediaFileService>().Verify(v => v.Add(It.Is<MovieFile>(c => c.OriginalFilePath == $"subfolder\\{name}.mkv".AsOsAgnostic())));
}
}
}

10
src/NzbDrone.Core/MediaFiles/MovieImport/ImportApprovedMovie.cs
View File

@@ -178,12 +178,18 @@ namespace NzbDrone.Core.MediaFiles.MovieImport
private string GetOriginalFilePath(DownloadClientItem downloadClientItem, LocalMovie localMovie)
{
var path = localMovie.Path;
if (downloadClientItem != null)
{
return downloadClientItem.OutputPath.Directory.ToString().GetRelativePath(localMovie.Path);
var outputDirectory = downloadClientItem.OutputPath.Directory.ToString();
if (outputDirectory.IsParentPath(path))
{
return outputDirectory.GetRelativePath(path);
}
}
var path = localMovie.Path;
var folderMovieInfo = localMovie.FolderMovieInfo;
if (folderMovieInfo != null)