aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-01-27 12:34:23 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-01-27 13:44:23 -0500
commitc167f792383e9f2cff320efc840c42efe7fbbdbb (patch)
treef4dacbd7a1226d7cc86796e85591a43275841a2a
parent2b8cf9b89d9eeeff0affe9ca0c2501e3a0984ca4 (diff)
update photo resolver to exclude generated images
-rw-r--r--MediaBrowser.Server.Implementations/Library/Resolvers/PhotoResolver.cs13
1 files changed, 11 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/PhotoResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/PhotoResolver.cs
index 407aac53d..8beb03b71 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/PhotoResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/PhotoResolver.cs
@@ -51,8 +51,17 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
{
var filename = Path.GetFileNameWithoutExtension(path) ?? string.Empty;
- return !IgnoreFiles.Contains(filename, StringComparer.OrdinalIgnoreCase)
- && imageProcessor.SupportedInputFormats.Contains((Path.GetExtension(path) ?? string.Empty).TrimStart('.'), StringComparer.OrdinalIgnoreCase);
+ if (IgnoreFiles.Contains(filename, StringComparer.OrdinalIgnoreCase))
+ {
+ return false;
+ }
+
+ if (IgnoreFiles.Any(i => filename.IndexOf("-" + i, StringComparison.OrdinalIgnoreCase) != -1))
+ {
+ return false;
+ }
+
+ return imageProcessor.SupportedInputFormats.Contains((Path.GetExtension(path) ?? string.Empty).TrimStart('.'), StringComparer.OrdinalIgnoreCase);
}
}