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

synced know file extentions with XBMC's list 

http://wiki.xbmc.org/?title=advancedsettings.xml#.3Cvideoextensions.3E
This commit is contained in:
kay.one 2013-08-17 21:28:34 -07:00
parent deefa07f38
commit be2e3c5c2e
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/GetVideoFilesFixture.cs
View File

@ -21,9 +21,10 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
{ {
@"C:\Test\30 Rock1.mkv", @"C:\Test\30 Rock1.mkv",
@"C:\Test\30 Rock2.avi", @"C:\Test\30 Rock2.avi",
@"C:\Test\30 Rock3.mp4", @"C:\Test\30 Rock3.MP4",
@"C:\Test\30 Rock4.wmv", @"C:\Test\30 Rock4.wMv",
@"C:\Test\movie.exe" @"C:\Test\movie.exe",
@"C:\Test\movie"
}; };
Mocker.GetMock<IDiskProvider>() Mocker.GetMock<IDiskProvider>()

23
NzbDrone.Core/MediaFiles/DiskScanService.cs
View File

@ -20,22 +20,31 @@ namespace NzbDrone.Core.MediaFiles
IDiskScanService, IDiskScanService,
IHandle<SeriesUpdatedEvent> IHandle<SeriesUpdatedEvent>
{ {
private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); private readonly HashSet<string> _mediaExtensions;
private static readonly HashSet<string> MediaExtensions = new HashSet<string> { ".mkv", ".avi", ".wmv", ".mp4", ".mpg", ".mpeg", ".xvid", ".flv", ".mov", ".rm", ".rmvb", ".divx", ".dvr-ms", ".ts", ".ogm", ".m4v", ".strm", ".iso", "m2ts" };
private const string EXTENSIONS =
".m4v .3gp .nsv .ts .ty .strm .rm .rmvb .m3u .ifo .mov .qt .divx .xvid .bivx .vob .nrg .img" +
".iso .pva .wmv .asf .asx .ogm .m2v .avi .bin .dat .dvr-ms .mpg .mpeg .mp4 .mkv .avc .vp3 " +
".svq3 .nuv .viv .dv .fli .flv .wpl";
private readonly IDiskProvider _diskProvider; private readonly IDiskProvider _diskProvider;
private readonly IMakeImportDecision _importDecisionMaker; private readonly IMakeImportDecision _importDecisionMaker;
private readonly IImportApprovedEpisodes _importApprovedEpisodes; private readonly IImportApprovedEpisodes _importApprovedEpisodes;
private readonly IMessageAggregator _messageAggregator; private readonly IMessageAggregator _messageAggregator;
private readonly Logger _logger;
public DiskScanService(IDiskProvider diskProvider, public DiskScanService(IDiskProvider diskProvider,
IMakeImportDecision importDecisionMaker, IMakeImportDecision importDecisionMaker,
IImportApprovedEpisodes importApprovedEpisodes, IImportApprovedEpisodes importApprovedEpisodes,
IMessageAggregator messageAggregator) IMessageAggregator messageAggregator, Logger logger)
{ {
_diskProvider = diskProvider; _diskProvider = diskProvider;
_importDecisionMaker = importDecisionMaker; _importDecisionMaker = importDecisionMaker;
_importApprovedEpisodes = importApprovedEpisodes; _importApprovedEpisodes = importApprovedEpisodes;
_messageAggregator = messageAggregator; _messageAggregator = messageAggregator;
_logger = logger;
_mediaExtensions = new HashSet<string>(EXTENSIONS.Split(' '));
} }
private void Scan(Series series) private void Scan(Series series)
@ -44,7 +53,7 @@ namespace NzbDrone.Core.MediaFiles
if (!_diskProvider.FolderExists(series.Path)) if (!_diskProvider.FolderExists(series.Path))
{ {
Logger.Debug("Series folder doesn't exist: {0}", series.Path); _logger.Debug("Series folder doesn't exist: {0}", series.Path);
return; return;
} }
@ -56,14 +65,14 @@ namespace NzbDrone.Core.MediaFiles
public string[] GetVideoFiles(string path, bool allDirectories = true) public string[] GetVideoFiles(string path, bool allDirectories = true)
{ {
Logger.Debug("Scanning '{0}' for video files", path); _logger.Debug("Scanning '{0}' for video files", path);
var searchOption = allDirectories ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly; var searchOption = allDirectories ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly;
var filesOnDisk = _diskProvider.GetFiles(path, searchOption); var filesOnDisk = _diskProvider.GetFiles(path, searchOption);
var mediaFileList = filesOnDisk.Where(c => MediaExtensions.Contains(Path.GetExtension(c).ToLower())).ToList(); var mediaFileList = filesOnDisk.Where(c => _mediaExtensions.Contains(Path.GetExtension(c).ToLower())).ToList();
Logger.Trace("{0} video files were found in {1}", mediaFileList.Count, path); _logger.Trace("{0} video files were found in {1}", mediaFileList.Count, path);
return mediaFileList.ToArray(); return mediaFileList.ToArray();
} }