diff options
| author | Claus Vium <cvium@users.noreply.github.com> | 2019-02-24 16:16:53 +0100 |
|---|---|---|
| committer | Bond-009 <bond.009@outlook.com> | 2019-02-24 10:16:53 -0500 |
| commit | 2e9a3d45c2a03f930856d038867a7caff01f208f (patch) | |
| tree | d9a1cbe7b2e7ea9fb8b33eac926052cb52d5f9c9 | |
| parent | e281c79d6fffd4c0c2700d0417b1933e7c5d3c33 (diff) | |
Fix slow local image validation (#990)
* Check for local image directory existence to avoid tons of exceptions
| -rw-r--r-- | MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Manager/MetadataService.cs | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs index 1a7654bfd..7c330ad86 100644 --- a/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs +++ b/MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Globalization; +using System.IO; using System.Linq; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Audio; @@ -65,6 +66,12 @@ namespace MediaBrowser.LocalMetadata.Images var path = item.ContainingFolderPath; + // Exit if the cache dir does not exist, alternative solution is to create it, but that's a lot of empty dirs... + if (!Directory.Exists(path)) + { + return Array.Empty<FileSystemMetadata>(); + } + if (includeDirectories) { return directoryService.GetFileSystemEntries(path) diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs index 77028e526..f0716f201 100644 --- a/MediaBrowser.Providers/Manager/MetadataService.cs +++ b/MediaBrowser.Providers/Manager/MetadataService.cs @@ -92,10 +92,7 @@ namespace MediaBrowser.Providers.Manager catch (Exception ex) { localImagesFailed = true; - if (!(item is IItemByName)) - { - Logger.LogError(ex, "Error validating images for {0}", item.Path ?? item.Name ?? "Unknown name"); - } + Logger.LogError(ex, "Error validating images for {0}", item.Path ?? item.Name ?? "Unknown name"); } var metadataResult = new MetadataResult<TItemType> |
