tedkulp/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2026-03-05 13:21:25 -05:00
Code Issues Projects Releases Wiki Activity

Fixed: Block Video Extras from Overriding Movie File

Browse Source
This commit is contained in:
Qstick
2020-08-05 01:52:41 -04:00
parent 43d6b404f5
commit a29de48e64
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NzbDrone.Core/Extras/ExtraService.cs
View File

@@ -64,7 +64,7 @@ namespace NzbDrone.Core.Extras
var sourcePath = localMovie.Path;
var sourceFolder = _diskProvider.GetParentFolder(sourcePath);
var sourceFileName = Path.GetFileNameWithoutExtension(sourcePath);
var files = _diskProvider.GetFiles(sourceFolder, SearchOption.TopDirectoryOnly);
var files = _diskProvider.GetFiles(sourceFolder, SearchOption.TopDirectoryOnly).Where(f => f != localMovie.Path);
var wantedExtensions = _configService.ExtraFileExtensions.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
.Select(e => e.Trim(' ', '.'))

10
src/NzbDrone.Core/Extras/Files/ExtraFileManager.cs
View File

@@ -49,7 +49,8 @@ namespace NzbDrone.Core.Extras.Files
protected TExtraFile ImportFile(Movie movie, MovieFile movieFile, string path, bool readOnly, string extension, string fileNameSuffix = null)
{
var newFolder = Path.GetDirectoryName(Path.Combine(movie.Path, movieFile.RelativePath));
var movieFilePath = Path.Combine(movie.Path, movieFile.RelativePath);
var newFolder = Path.GetDirectoryName(movieFilePath);
var filenameBuilder = new StringBuilder(Path.GetFileNameWithoutExtension(movieFile.RelativePath));
if (fileNameSuffix.IsNotNullOrWhiteSpace())
@@ -60,6 +61,13 @@ namespace NzbDrone.Core.Extras.Files
filenameBuilder.Append(extension);
var newFileName = Path.Combine(newFolder, filenameBuilder.ToString());
if (newFileName == movieFilePath)
{
_logger.Debug("Extra file {0} not imported, due to naming interference with movie file", path);
return null;
}
var transferMode = TransferMode.Move;
if (readOnly)

7
src/NzbDrone.Core/Extras/Others/OtherExtraService.cs
View File

@@ -68,8 +68,11 @@ namespace NzbDrone.Core.Extras.Others
{
var extraFile = ImportFile(movie, movieFile, path, readOnly, extension, null);
_mediaFileAttributeService.SetFilePermissions(path);
_otherExtraFileService.Upsert(extraFile);
if (extraFile != null)
{
_mediaFileAttributeService.SetFilePermissions(path);
_otherExtraFileService.Upsert(extraFile);
}
return extraFile;
}