mirror of
https://github.com/Radarr/Radarr.git
synced 2024-10-26 22:52:40 +02:00
Fixed: Skip extras in 'Extras' subfolder
This commit is contained in:
parent
dd5bc41eda
commit
b3c3f7ddae
@ -3,7 +3,6 @@
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using NLog;
|
using NLog;
|
||||||
using NzbDrone.Common.Disk;
|
using NzbDrone.Common.Disk;
|
||||||
using NzbDrone.Core.Extras.Files;
|
|
||||||
using NzbDrone.Core.MediaFiles;
|
using NzbDrone.Core.MediaFiles;
|
||||||
using NzbDrone.Core.MediaFiles.Events;
|
using NzbDrone.Core.MediaFiles.Events;
|
||||||
using NzbDrone.Core.Messaging.Events;
|
using NzbDrone.Core.Messaging.Events;
|
||||||
@ -31,7 +30,6 @@ public ExistingExtraFileService(IDiskProvider diskProvider,
|
|||||||
public void Handle(MovieScannedEvent message)
|
public void Handle(MovieScannedEvent message)
|
||||||
{
|
{
|
||||||
var movie = message.Movie;
|
var movie = message.Movie;
|
||||||
var extraFiles = new List<ExtraFile>();
|
|
||||||
|
|
||||||
if (!_diskProvider.FolderExists(movie.Path))
|
if (!_diskProvider.FolderExists(movie.Path))
|
||||||
{
|
{
|
||||||
@ -43,17 +41,16 @@ public void Handle(MovieScannedEvent message)
|
|||||||
var filesOnDisk = _diskScanService.GetNonVideoFiles(movie.Path);
|
var filesOnDisk = _diskScanService.GetNonVideoFiles(movie.Path);
|
||||||
var possibleExtraFiles = _diskScanService.FilterPaths(movie.Path, filesOnDisk, false);
|
var possibleExtraFiles = _diskScanService.FilterPaths(movie.Path, filesOnDisk, false);
|
||||||
|
|
||||||
var filteredFiles = possibleExtraFiles;
|
|
||||||
var importedFiles = new List<string>();
|
var importedFiles = new List<string>();
|
||||||
|
|
||||||
foreach (var existingExtraFileImporter in _existingExtraFileImporters)
|
foreach (var existingExtraFileImporter in _existingExtraFileImporters)
|
||||||
{
|
{
|
||||||
var imported = existingExtraFileImporter.ProcessFiles(movie, filteredFiles, importedFiles);
|
var imported = existingExtraFileImporter.ProcessFiles(movie, possibleExtraFiles, importedFiles);
|
||||||
|
|
||||||
importedFiles.AddRange(imported.Select(f => Path.Combine(movie.Path, f.RelativePath)));
|
importedFiles.AddRange(imported.Select(f => Path.Combine(movie.Path, f.RelativePath)));
|
||||||
}
|
}
|
||||||
|
|
||||||
_logger.Info("Found {0} extra files", extraFiles.Count);
|
_logger.Info("Found {0} possible extra files, imported {1} files.", possibleExtraFiles.Count, importedFiles.Count);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user