Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Don't import duplicate NFO extra files 

Fixes #2641
This commit is contained in:
Mark McDowall 2019-05-08 21:58:50 -07:00
parent 6a6d6f9e0d
commit 5fe1ce1eff
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,9 +71,28 @@ namespace NzbDrone.Core.Extras
.Select(e => e.Trim(' ', '.')) .Select(e => e.Trim(' ', '.'))
.ToList(); .ToList();
var matchingFilenames = files.Where(f => Path.GetFileNameWithoutExtension(f).StartsWith(sourceFileName, StringComparison.InvariantCultureIgnoreCase)); var matchingFilenames = files.Where(f => Path.GetFileNameWithoutExtension(f).StartsWith(sourceFileName, StringComparison.InvariantCultureIgnoreCase)).ToList();
var filteredFilenames = new List<string>();
var hasNfo = false;
foreach (var matchingFilename in matchingFilenames) foreach (var matchingFilename in matchingFilenames)
{
// Filter out duplicate NFO files
if (matchingFilename.EndsWith(".nfo", StringComparison.InvariantCultureIgnoreCase))
{
if (hasNfo)
{
continue;
}
hasNfo = true;
}
filteredFilenames.Add(matchingFilename);
}
foreach (var matchingFilename in filteredFilenames)
{ {
var matchingExtension = wantedExtensions.FirstOrDefault(e => matchingFilename.EndsWith(e)); var matchingExtension = wantedExtensions.FirstOrDefault(e => matchingFilename.EndsWith(e));