| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101 | 
							- using MediaBrowser.Controller.Drawing;
 
- using MediaBrowser.Controller.Entities;
 
- using MediaBrowser.Controller.Library;
 
- using MediaBrowser.Model.Entities;
 
- using System;
 
- using System.IO;
 
- using System.Linq;
 
- using CommonIO;
 
- using MediaBrowser.Controller.Configuration;
 
- using MediaBrowser.Model.Configuration;
 
- namespace MediaBrowser.Server.Implementations.Library.Resolvers
 
- {
 
-     public class PhotoResolver : ItemResolver<Photo>
 
-     {
 
-         private readonly IImageProcessor _imageProcessor;
 
-         private readonly ILibraryManager _libraryManager;
 
-         public PhotoResolver(IImageProcessor imageProcessor, ILibraryManager libraryManager)
 
-         {
 
-             _imageProcessor = imageProcessor;
 
-             _libraryManager = libraryManager;
 
-         }
 
-         /// <summary>
 
-         /// Resolves the specified args.
 
-         /// </summary>
 
-         /// <param name="args">The args.</param>
 
-         /// <returns>Trailer.</returns>
 
-         protected override Photo Resolve(ItemResolveArgs args)
 
-         {
 
-             if (!args.IsDirectory)
 
-             {
 
-                 // Must be an image file within a photo collection
 
-                 var collectionType = args.GetCollectionType();
 
-                 if (string.Equals(collectionType, CollectionType.Photos, StringComparison.OrdinalIgnoreCase) ||
 
-                     (string.Equals(collectionType, CollectionType.HomeVideos, StringComparison.OrdinalIgnoreCase) && args.GetLibraryOptions().EnablePhotos))
 
-                 {
 
-                     if (IsImageFile(args.Path, _imageProcessor))
 
-                     {
 
-                         var filename = Path.GetFileNameWithoutExtension(args.Path);
 
-                         // Make sure the image doesn't belong to a video file
 
-                         if (args.DirectoryService.GetFiles(Path.GetDirectoryName(args.Path)).Any(i => IsOwnedByMedia(args.GetLibraryOptions(), i, filename)))
 
-                         {
 
-                             return null;
 
-                         }
 
-                         return new Photo
 
-                         {
 
-                             Path = args.Path
 
-                         };
 
-                     }
 
-                 }
 
-             }
 
-             return null;
 
-         }
 
-         private bool IsOwnedByMedia(LibraryOptions libraryOptions, FileSystemMetadata file, string imageFilename)
 
-         {
 
-             if (_libraryManager.IsVideoFile(file.FullName, libraryOptions) && imageFilename.StartsWith(Path.GetFileNameWithoutExtension(file.Name), StringComparison.OrdinalIgnoreCase))
 
-             {
 
-                 return true;
 
-             }
 
-             return false;
 
-         }
 
-         private static readonly string[] IgnoreFiles =
 
-         {
 
-             "folder",
 
-             "thumb",
 
-             "landscape",
 
-             "fanart",
 
-             "backdrop",
 
-             "poster",
 
-             "cover"
 
-         };
 
-         internal static bool IsImageFile(string path, IImageProcessor imageProcessor)
 
-         {
 
-             var filename = Path.GetFileNameWithoutExtension(path) ?? string.Empty;
 
-             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);
 
-         }
 
-     }
 
- }
 
 
  |