support dvd without video_ts folder

2 files changed, 61 insertions, 16 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
index a423ea3f1..8e2218b0a 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
@@ -94,6 +94,23 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
                             break;
                         }
                     }
+                    else if (IsDvdFile(filename))
+                    {
+                        videoInfo = parser.ResolveDirectory(args.Path);
+
+                        if (videoInfo == null)
+                        {
+                            return null;
+                        }
+
+                        video = new TVideoType
+                        {
+                            Path = args.Path,
+                            VideoType = VideoType.Dvd,
+                            ProductionYear = videoInfo.Year
+                        };
+                        break;
+                    }
                 }
 
                 if (video != null)
@@ -229,6 +246,16 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
         }
 
         /// <summary>
+        /// Determines whether [is DVD file] [the specified name].
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <returns><c>true</c> if [is DVD file] [the specified name]; otherwise, <c>false</c>.</returns>
+        protected bool IsDvdFile(string name)
+        {
+            return string.Equals(name, "video_ts.ifo", StringComparison.OrdinalIgnoreCase);
+        }
+        
+        /// <summary>
         /// Determines whether [is blu ray directory] [the specified directory name].
         /// </summary>
         /// <param name="directoryName">Name of the directory.</param>
@@ -237,15 +264,5 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
         {
             return string.Equals(directoryName, "bdmv", StringComparison.OrdinalIgnoreCase);
         }
-
-        protected bool IsBluRayContainer(string path, IDirectoryService directoryService)
-        {
-            return directoryService.GetDirectories(path).Any(i => IsBluRayDirectory(i.Name));
-        }
-
-        protected bool IsDvdContainer(string path, IDirectoryService directoryService)
-        {
-            return directoryService.GetDirectories(path).Any(i => IsDvdDirectory(i.Name));
-        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index f48b8329e..8fceb7f53 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -117,7 +117,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
                 FullName = i.FullName,
                 Type = FileInfoType.File
 
-            }).ToList());
+            }).ToList()).ToList();
 
             var result = new MultiItemResolverResult
             {
@@ -125,6 +125,8 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
                 Items = videos
             };
 
+            var isInMixedFolder = resolverResult.Count > 0;
+
             foreach (var video in resolverResult)
             {
                 var firstVideo = video.Files.First();
@@ -132,7 +134,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
                 var videoItem = new T
                 {
                     Path = video.Files[0].Path,
-                    IsInMixedFolder = true,
+                    IsInMixedFolder = isInMixedFolder,
                     ProductionYear = video.Year,
                     Name = video.Name,
                     AdditionalParts = video.Files.Skip(1).Select(i => i.Path).ToList()
@@ -171,7 +173,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
 
                 if (string.Equals(collectionType, CollectionType.HomeVideos, StringComparison.OrdinalIgnoreCase))
                 {
-                    return FindMovie<Video>(args.Path, args.Parent, args.FileSystemChildren.ToList(), args.DirectoryService, collectionType);
+                    return FindMovie<Video>(args.Path, args.Parent, args.FileSystemChildren.ToList(), args.DirectoryService, collectionType, false);
                 }
 
                 if (string.IsNullOrEmpty(collectionType))
@@ -275,8 +277,9 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
         /// <param name="fileSystemEntries">The file system entries.</param>
         /// <param name="directoryService">The directory service.</param>
         /// <param name="collectionType">Type of the collection.</param>
+        /// <param name="supportMultiVersion">if set to <c>true</c> [support multi version].</param>
         /// <returns>Movie.</returns>
-        private T FindMovie<T>(string path, Folder parent, List<FileSystemInfo> fileSystemEntries, IDirectoryService directoryService, string collectionType)
+        private T FindMovie<T>(string path, Folder parent, List<FileSystemInfo> fileSystemEntries, IDirectoryService directoryService, string collectionType, bool supportMultiVersion = true)
             where T : Video, new()
         {
             var multiDiscFolders = new List<FileSystemInfo>();
@@ -311,12 +314,22 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
 
                     multiDiscFolders.Add(child);
                 }
+                else if (IsDvdFile(filename))
+                {
+                    var movie = new T
+                    {
+                        Path = path,
+                        VideoType = VideoType.Dvd
+                    };
+                    Set3DFormat(movie);
+                    return movie;
+                }
             }
             
             var result = ResolveVideos<T>(parent, fileSystemEntries, directoryService, collectionType);
 
             // Test for multi-editions
-            if (result.Items.Count > 1)
+            if (result.Items.Count > 1 && supportMultiVersion)
             {
                 var filenamePrefix = Path.GetFileName(path);
 
@@ -327,6 +340,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
                         var movie = (T)result.Items[0];
                         movie.Name = filenamePrefix;
                         movie.LocalAlternateVersions = result.Items.Skip(1).Select(i => i.Path).ToList();
+                        movie.IsInMixedFolder = false;
 
                         _logger.Debug("Multi-version video found: " + movie.Path);
 
@@ -364,7 +378,11 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
 
             var folderPaths = multiDiscFolders.Select(i => i.FullName).Where(i =>
             {
-                var subfolders = directoryService.GetDirectories(i)
+                var subFileEntries = directoryService.GetFileSystemEntries(i)
+                    .ToList();
+
+                var subfolders = subFileEntries
+                    .Where(e => (e.Attributes & FileAttributes.Directory) == FileAttributes.Directory)
                     .Select(d => d.Name)
                     .ToList();
 
@@ -379,6 +397,16 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
                     return true;
                 }
 
+                var subFiles = subFileEntries
+                 .Where(e => (e.Attributes & FileAttributes.Directory) != FileAttributes.Directory)
+                 .Select(d => d.Name);
+
+                if (subFiles.Any(IsDvdFile))
+                {
+                    videoTypes.Add(VideoType.Dvd);
+                    return true;
+                }
+
                 return false;
 
             }).OrderBy(i => i).ToList();