diff options
3 files changed, 24 insertions, 4 deletions
diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs index 0e50f9315..a3636ac2e 100644 --- a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs +++ b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs @@ -128,7 +128,14 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks DeleteEmptyFolders(directory); if (!_fileSystem.GetFileSystemEntryPaths(directory).Any()) { - _fileSystem.DeleteDirectory(directory, false); + try + { + _fileSystem.DeleteDirectory(directory, false); + } + catch (IOException ex) + { + _logger.ErrorException("Error deleting directory {0}", ex, directory); + } } } } diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index faee0785b..e7a111620 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -222,7 +222,6 @@ namespace MediaBrowser.Model.Configuration public string[] Migrations { get; set; } public int MigrationVersion { get; set; } - public bool EnableImagePreDownloading { get; set; } /// <summary> /// Initializes a new instance of the <see cref="ServerConfiguration" /> class. diff --git a/MediaBrowser.Providers/Manager/ItemImageProvider.cs b/MediaBrowser.Providers/Manager/ItemImageProvider.cs index fcb208a05..a4710bec4 100644 --- a/MediaBrowser.Providers/Manager/ItemImageProvider.cs +++ b/MediaBrowser.Providers/Manager/ItemImageProvider.cs @@ -516,11 +516,25 @@ namespace MediaBrowser.Providers.Manager var hasDualAccess = item as IHasDualAccess; if (hasDualAccess == null || hasDualAccess.IsAccessedByName) { - return !_config.Configuration.EnableImagePreDownloading; + return true; } } - return false; + switch (type) + { + case ImageType.Primary: + return false; + case ImageType.Thumb: + return false; + case ImageType.Logo: + return false; + case ImageType.Backdrop: + return false; + case ImageType.Screenshot: + return false; + default: + return true; + } } private void SaveImageStub(IHasImages item, ImageType imageType, string url) |