Merge branch 'signalr' into develop

This commit is contained in:
Keivan Beigi 2013-09-12 11:12:04 -07:00
commit 93481728cc
233 changed files with 2205 additions and 1813 deletions

View file

@ -4,9 +4,10 @@ using System.Linq;
using NLog;
using NzbDrone.Common;
using NzbDrone.Common.Instrumentation;
using NzbDrone.Common.Messaging;
using NzbDrone.Core.Instrumentation;
using NzbDrone.Core.MediaFiles.Commands;
using NzbDrone.Core.MediaFiles.EpisodeImport;
using NzbDrone.Core.Messaging;
using NzbDrone.Core.Tv;
using NzbDrone.Core.Tv.Events;
@ -41,7 +42,7 @@ namespace NzbDrone.Core.MediaFiles
private void Scan(Series series)
{
_logger.Progress("Starting disk scan for {0}", series.Title);
_logger.ProgressInfo("Scanning disk for {0}", series.Title);
_messageAggregator.PublishCommand(new CleanMediaFileDb(series.Id));
if (!_diskProvider.FolderExists(series.Path))
@ -54,8 +55,6 @@ namespace NzbDrone.Core.MediaFiles
var decisions = _importDecisionMaker.GetImportDecisions(mediaFileList, series, false);
_importApprovedEpisodes.Import(decisions);
_logger.Complete("Completed disk scan for {0}", series.Title);
}
public string[] GetVideoFiles(string path, bool allDirectories = true)