Updated some logs, removed .vob .ts from video extentions
This commit is contained in:
parent
03aa27c45c
commit
034d0c46e5
|
@ -12,7 +12,7 @@ namespace NzbDrone.Common
|
|||
{
|
||||
public const string NZBDRONE_SERVICE_NAME = "NzbDrone";
|
||||
|
||||
private static readonly Logger Logger = LogManager.GetLogger("Host.ServiceManager");
|
||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||
|
||||
public virtual bool ServiceExist(string name)
|
||||
{
|
||||
|
@ -90,7 +90,7 @@ namespace NzbDrone.Common
|
|||
|
||||
public virtual void Stop(string serviceName)
|
||||
{
|
||||
Logger.Info("Stopping {0} Service...");
|
||||
Logger.Info("Stopping {0} Service...", serviceName);
|
||||
var service = GetService(serviceName);
|
||||
if (service == null)
|
||||
{
|
||||
|
@ -108,7 +108,7 @@ namespace NzbDrone.Common
|
|||
service.Refresh();
|
||||
if (service.Status == ServiceControllerStatus.Stopped)
|
||||
{
|
||||
Logger.Info("{0} has stopped successfully.");
|
||||
Logger.Info("{0} has stopped successfully.", serviceName);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -15,7 +15,7 @@ namespace NzbDrone.Core.Providers
|
|||
public class DiskScanProvider
|
||||
{
|
||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||
private static readonly string[] MediaExtentions = new[] { ".mkv", ".avi", ".wmv", ".mp4", ".mpg", ".mpeg", ".xvid", ".flv", ".mov", ".vob", ".ts", ".rm", ".rmvb", ".xvid", ".dvr-ms" };
|
||||
private static readonly string[] MediaExtentions = new[] { ".mkv", ".avi", ".wmv", ".mp4", ".mpg", ".mpeg", ".xvid", ".flv", ".mov", ".rm", ".rmvb", ".xvid", ".dvr-ms" };
|
||||
private readonly DiskProvider _diskProvider;
|
||||
private readonly EpisodeProvider _episodeProvider;
|
||||
private readonly MediaFileProvider _mediaFileProvider;
|
||||
|
@ -235,7 +235,7 @@ namespace NzbDrone.Core.Providers
|
|||
|
||||
private List<string> GetVideoFiles(string path)
|
||||
{
|
||||
Logger.Debug("Scanning '{0}' for episodes", path);
|
||||
Logger.Debug("Scanning '{0}' for video files", path);
|
||||
|
||||
var filesOnDisk = _diskProvider.GetFiles(path, SearchOption.AllDirectories);
|
||||
|
||||
|
|
|
@ -157,7 +157,7 @@ namespace NzbDrone.Core.Providers
|
|||
|
||||
|
||||
//TODO:fix this so when search returns more than one episode
|
||||
//TODO:-its populated with more than the original episode.
|
||||
//its populated with more than the original episode.
|
||||
reports.ForEach(c =>
|
||||
{
|
||||
c.Series = series;
|
||||
|
|
|
@ -22,10 +22,10 @@ namespace NzbDrone.Core
|
|||
_jobProvider = jobProvider;
|
||||
}
|
||||
|
||||
//TODO: Make timer doesn't keep running during unit tests.
|
||||
//TODO: Fix this so the timer doesn't keep running during unit tests.
|
||||
public void StartTimer(int secondInterval)
|
||||
{
|
||||
_onCacheRemove = new CacheItemRemovedCallback(DoWork);
|
||||
_onCacheRemove = DoWork;
|
||||
|
||||
HttpRuntime.Cache.Insert(GetType().ToString(), secondInterval, null,
|
||||
DateTime.Now.AddSeconds(secondInterval), Cache.NoSlidingExpiration,
|
||||
|
|
|
@ -60,6 +60,8 @@ namespace NzbDrone.Update.Providers
|
|||
_serviceProvider.Stop(ServiceProvider.NZBDRONE_SERVICE_NAME);
|
||||
}
|
||||
|
||||
//TODO:Should be able to restart service if anything beyond this point fails
|
||||
|
||||
logger.Info("Killing all running processes");
|
||||
var processes = _processProvider.GetProcessByName(ProcessProvider.NzbDroneProccessName);
|
||||
foreach (var processInfo in processes)
|
||||
|
@ -102,6 +104,7 @@ namespace NzbDrone.Update.Providers
|
|||
|
||||
private void RollBack(string targetFolder)
|
||||
{
|
||||
//TODO:this should ignore single file failures.
|
||||
logger.Info("Attempting to rollback upgrade");
|
||||
_diskProvider.CopyDirectory(_enviromentProvider.GetUpdateBackUpFolder(), targetFolder);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue