mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: GetVideoFiles duplicating results.

This commit is contained in:
psylenced 2022-08-16 00:11:34 +10:00
parent 5f4c5d5911
commit 2000ef7df5
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/NzbDrone.Core.Test/MediaFiles/DiskScanServiceTests/ScanFixture.cs
View File

@ -455,5 +455,23 @@ namespace NzbDrone.Core.Test.MediaFiles.DiskScanServiceTests
files.Should().HaveCount(2);
}
[Test]
public void should_detect_obfuscated_and_normal_movie_files()
{
GivenMovieFolder();
GivenFiles(new List<string>
{
Path.Combine(_movie.Path, "This is a Movie.mp4").AsOsAgnostic(),
Path.Combine(_movie.Path, "[private]-[group]-[This is a Movie.mp4]-[1_12]").AsOsAgnostic(),
Path.Combine(_movie.Path, "[private]-[group]-[This is a Movie.nfo]-[2_12]").AsOsAgnostic(),
Path.Combine(_movie.Path, "[private]-[group]-[This is a Movie.txt]-[3_12]").AsOsAgnostic()
});
var files = Subject.GetVideoFiles(_movie.Path);
files.Should().HaveCount(2);
}
}
}

4
src/NzbDrone.Core/MediaFiles/DiskScanService.cs
View File

@ -200,7 +200,7 @@ namespace NzbDrone.Core.MediaFiles
.ToList();
// Find corrupted extensions in the format of: "[FileName.mkv]-[1_2]"
var mediaFilesListIncorrectExtension = filesOnDisk.Where(file => MediaFileExtensions.Extensions.Contains(Path.GetExtension(file).Split(']').First())).ToList();
var mediaFilesListIncorrectExtension = filesOnDisk.Except(mediaFileList).Where(file => MediaFileExtensions.Extensions.Contains(Path.GetExtension(file).Split(']').First())).ToList();
mediaFileList.AddRange(mediaFilesListIncorrectExtension);
@ -227,7 +227,7 @@ namespace NzbDrone.Core.MediaFiles
.ToList();
// Find corrupted extensions in the format of: "[FileName.mkv]-[1_2]"
var mediaFilesListIncorrectExtension = filesOnDisk.Where(file => MediaFileExtensions.Extensions.Contains(Path.GetExtension(file).Split(']').First())).ToList();
var mediaFilesListIncorrectExtension = filesOnDisk.Except(mediaFileList).Where(file => MediaFileExtensions.Extensions.Contains(Path.GetExtension(file).Split(']').First())).ToList();
mediaFileList.AddRange(mediaFilesListIncorrectExtension);