Merge pull request #3032 from MediaBrowser/beta

Beta

1 files changed, 221 insertions, 30 deletions

diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
index e2f2946db..d30aaa133 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/AudioResolver.cs
@@ -4,19 +4,26 @@ using MediaBrowser.Model.Entities;
 using System;
 using MediaBrowser.Controller.Entities;
 using System.IO;
+using System.Linq;
+using MediaBrowser.Controller.Providers;
+using System.Collections.Generic;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Extensions;
+using Emby.Naming.Video;
+using Emby.Naming.AudioBook;
 
 namespace Emby.Server.Implementations.Library.Resolvers.Audio
 {
     /// <summary>
     /// Class AudioResolver
     /// </summary>
-    public class AudioResolver : ItemResolver<MediaBrowser.Controller.Entities.Audio.Audio>
+    public class AudioResolver : ItemResolver<MediaBrowser.Controller.Entities.Audio.Audio>, IMultiItemResolver
     {
-        private readonly ILibraryManager _libraryManager;
+        private readonly ILibraryManager LibraryManager;
 
         public AudioResolver(ILibraryManager libraryManager)
         {
-            _libraryManager = libraryManager;
+            LibraryManager = libraryManager;
         }
 
         /// <summary>
@@ -25,7 +32,38 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
         /// <value>The priority.</value>
         public override ResolverPriority Priority
         {
-            get { return ResolverPriority.Last; }
+            get { return ResolverPriority.Fourth; }
+        }
+
+        public MultiItemResolverResult ResolveMultiple(Folder parent,
+            List<FileSystemMetadata> files,
+            string collectionType,
+            IDirectoryService directoryService)
+        {
+            var result = ResolveMultipleInternal(parent, files, collectionType, directoryService);
+
+            if (result != null)
+            {
+                foreach (var item in result.Items)
+                {
+                    SetInitialItemValues((MediaBrowser.Controller.Entities.Audio.Audio)item, null);
+                }
+            }
+
+            return result;
+        }
+
+        private MultiItemResolverResult ResolveMultipleInternal(Folder parent,
+            List<FileSystemMetadata> files,
+            string collectionType,
+            IDirectoryService directoryService)
+        {
+            if (string.Equals(collectionType, CollectionType.Books, StringComparison.OrdinalIgnoreCase))
+            {
+                return ResolveMultipleAudio<AudioBook>(parent, files, directoryService, false, collectionType, true);
+            }
+
+            return null;
         }
 
         /// <summary>
@@ -37,46 +75,199 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
         {
             // Return audio if the path is a file and has a matching extension
 
-            if (!args.IsDirectory)
+            var libraryOptions = args.GetLibraryOptions();
+            var collectionType = args.GetCollectionType();
+
+            var isBooksCollectionType = string.Equals(collectionType, CollectionType.Books, StringComparison.OrdinalIgnoreCase);
+
+            if (args.IsDirectory)
             {
-                var libraryOptions = args.GetLibraryOptions();
+                if (!isBooksCollectionType)
+                {
+                    return null;
+                }
+
+                var files = args.FileSystemChildren
+                    .Where(i => !LibraryManager.IgnoreFile(i, args.Parent))
+                    .ToList();
 
-                if (_libraryManager.IsAudioFile(args.Path, libraryOptions))
+                if (isBooksCollectionType)
                 {
-                    if (string.Equals(Path.GetExtension(args.Path), ".cue", StringComparison.OrdinalIgnoreCase))
-                    {
-                        // if audio file exists of same name, return null
+                    return FindAudio<AudioBook>(args, args.Path, args.Parent, files, args.DirectoryService, collectionType, false);
+                }
+
+                return null;
+            }
+
+            if (LibraryManager.IsAudioFile(args.Path, libraryOptions))
+            {
+                if (string.Equals(Path.GetExtension(args.Path), ".cue", StringComparison.OrdinalIgnoreCase))
+                {
+                    // if audio file exists of same name, return null
+                    return null;
+                }
+
+                var isMixedCollectionType = string.IsNullOrWhiteSpace(collectionType);
+
+                // For conflicting extensions, give priority to videos
+                if (isMixedCollectionType && LibraryManager.IsVideoFile(args.Path, libraryOptions))
+                {
+                    return null;
+                }
+
+                MediaBrowser.Controller.Entities.Audio.Audio item = null;
+
+                var isMusicCollectionType = string.Equals(collectionType, CollectionType.Music, StringComparison.OrdinalIgnoreCase);
+
+                // Use regular audio type for mixed libraries, owned items and music
+                if (isMixedCollectionType ||
+                    args.Parent == null ||
+                    isMusicCollectionType)
+                {
+                    item = new MediaBrowser.Controller.Entities.Audio.Audio();
+                }
+
+                else if (isBooksCollectionType)
+                {
+                    item = new AudioBook();
+                }
+
+                if (item != null)
+                {
+                    item.IsInMixedFolder = true;
+                }
+
+                return item;
+            }
+
+            return null;
+        }
 
-                        return null;
-                    }
+        private T FindAudio<T>(ItemResolveArgs args, string path, Folder parent, List<FileSystemMetadata> fileSystemEntries, IDirectoryService directoryService, string collectionType, bool parseName)
+            where T : MediaBrowser.Controller.Entities.Audio.Audio, new()
+        {
+            var multiDiscFolders = new List<FileSystemMetadata>();
 
-                    var collectionType = args.GetCollectionType();
+            var libraryOptions = args.GetLibraryOptions();
+            var filesFromOtherItems = new List<FileSystemMetadata>();
 
-                    var isMixed = string.IsNullOrWhiteSpace(collectionType);
+            // TODO: Allow GetMultiDiscMovie in here
+            var supportsMultiVersion = false;
 
-                    // For conflicting extensions, give priority to videos
-                    if (isMixed && _libraryManager.IsVideoFile(args.Path, libraryOptions))
-                    {
-                        return null;
-                    }
+            var result = ResolveMultipleAudio<T>(parent, fileSystemEntries, directoryService, supportsMultiVersion, collectionType, parseName) ??
+                new MultiItemResolverResult();
 
-                    var isStandalone = args.Parent == null;
+            if (result.Items.Count == 1)
+            {
+                var videoPath = result.Items[0].Path;
 
-                    if (isStandalone ||
-                        string.Equals(collectionType, CollectionType.Music, StringComparison.OrdinalIgnoreCase) ||
-                        isMixed)
-                    {
-                        return new MediaBrowser.Controller.Entities.Audio.Audio();
-                    }
+                // If we were supporting this we'd be checking filesFromOtherItems
+                var hasOtherItems = false;
 
-                    if (string.Equals(collectionType, CollectionType.Books, StringComparison.OrdinalIgnoreCase))
-                    {
-                        return new AudioBook();
-                    }
+                if (!hasOtherItems)
+                {
+                    var item = (T)result.Items[0];
+                    item.IsInMixedFolder = false;
+                    item.Name = Path.GetFileName(item.ContainingFolderPath);
+                    return item;
                 }
             }
 
+            if (result.Items.Count == 0 && multiDiscFolders.Count > 0)
+            {
+                //return GetMultiDiscAudio<T>(multiDiscFolders, directoryService);
+            }
+
             return null;
         }
+
+        private MultiItemResolverResult ResolveMultipleAudio<T>(Folder parent, IEnumerable<FileSystemMetadata> fileSystemEntries, IDirectoryService directoryService, bool suppportMultiEditions, string collectionType, bool parseName)
+            where T : MediaBrowser.Controller.Entities.Audio.Audio, new()
+        {
+            var files = new List<FileSystemMetadata>();
+            var items = new List<BaseItem>();
+            var leftOver = new List<FileSystemMetadata>();
+
+            // Loop through each child file/folder and see if we find a video
+            foreach (var child in fileSystemEntries)
+            {
+                if (child.IsDirectory)
+                {
+                    leftOver.Add(child);
+                }
+                else if (IsIgnored(child.Name))
+                {
+
+                }
+                else
+                {
+                    files.Add(child);
+                }
+            }
+
+            var namingOptions = ((LibraryManager)LibraryManager).GetNamingOptions();
+
+            var resolver = new AudioBookListResolver(namingOptions);
+            var resolverResult = resolver.Resolve(files).ToList();
+
+            var result = new MultiItemResolverResult
+            {
+                ExtraFiles = leftOver,
+                Items = items
+            };
+
+            var isInMixedFolder = resolverResult.Count > 1 || (parent != null && parent.IsTopParent);
+
+            foreach (var resolvedItem in resolverResult)
+            {
+                if (resolvedItem.Files.Count > 1)
+                {
+                    // For now, until we sort out naming for multi-part books
+                    continue;
+                }
+
+                var firstMedia = resolvedItem.Files.First();
+                
+                var libraryItem = new T
+                {
+                    Path = firstMedia.Path,
+                    IsInMixedFolder = isInMixedFolder,
+                    ProductionYear = resolvedItem.Year,
+                    Name = parseName ?
+                        resolvedItem.Name :
+                        Path.GetFileNameWithoutExtension(firstMedia.Path),
+                    //AdditionalParts = resolvedItem.Files.Skip(1).Select(i => i.Path).ToArray(),
+                    //LocalAlternateVersions = resolvedItem.AlternateVersions.Select(i => i.Path).ToArray()
+                };
+
+                result.Items.Add(libraryItem);
+            }
+
+            result.ExtraFiles.AddRange(files.Where(i => !ContainsFile(resolverResult, i)));
+
+            return result;
+        }
+
+        private bool ContainsFile(List<AudioBookInfo> result, FileSystemMetadata file)
+        {
+            return result.Any(i => ContainsFile(i, file));
+        }
+
+        private bool ContainsFile(AudioBookInfo result, FileSystemMetadata file)
+        {
+            return result.Files.Any(i => ContainsFile(i, file)) ||
+                result.AlternateVersions.Any(i => ContainsFile(i, file)) ||
+                result.Extras.Any(i => ContainsFile(i, file));
+        }
+
+        private bool ContainsFile(AudioBookFileInfo result, FileSystemMetadata file)
+        {
+            return string.Equals(result.Path, file.FullName, StringComparison.OrdinalIgnoreCase);
+        }
+
+        private bool IsIgnored(string filename)
+        {
+            return false;
+        }
     }
 }