Merge pull request #2350 from MediaBrowser/beta

Beta

1 files changed, 45 insertions, 0 deletions

diff --git a/Emby.Server.Implementations/Library/Resolvers/VideoResolver.cs b/Emby.Server.Implementations/Library/Resolvers/VideoResolver.cs
new file mode 100644
index 000000000..b5e1bf5f7
--- /dev/null
+++ b/Emby.Server.Implementations/Library/Resolvers/VideoResolver.cs
@@ -0,0 +1,45 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Resolvers;
+
+namespace Emby.Server.Implementations.Library.Resolvers
+{
+    /// <summary>
+    /// Resolves a Path into a Video
+    /// </summary>
+    public class VideoResolver : BaseVideoResolver<Video>
+    {
+        public VideoResolver(ILibraryManager libraryManager)
+            : base(libraryManager)
+        {
+        }
+
+        protected override Video Resolve(ItemResolveArgs args)
+        {
+            if (args.Parent != null)
+            {
+                // The movie resolver will handle this
+                return null;
+            }
+
+            return base.Resolve(args);
+        }
+
+        /// <summary>
+        /// Gets the priority.
+        /// </summary>
+        /// <value>The priority.</value>
+        public override ResolverPriority Priority
+        {
+            get { return ResolverPriority.Last; }
+        }
+    }
+
+    public class GenericVideoResolver<T> : BaseVideoResolver<T>
+        where T : Video, new ()
+    {
+        public GenericVideoResolver(ILibraryManager libraryManager) : base(libraryManager)
+        {
+        }
+    }
+}