added new cabac value

3 files changed, 19 insertions, 45 deletions

diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 951513962..f93564882 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -18,29 +18,13 @@ namespace MediaBrowser.Controller.Library
     public interface ILibraryManager
     {
         /// <summary>
-        /// Resolves the item.
-        /// </summary>
-        /// <param name="args">The args.</param>
-        /// <returns>BaseItem.</returns>
-        BaseItem ResolveItem(ItemResolveArgs args);
-
-        /// <summary>
-        /// Resolves a path into a BaseItem
-        /// </summary>
-        /// <param name="fileInfo">The file info.</param>
-        /// <param name="directoryService">The directory service.</param>
-        /// <param name="parent">The parent.</param>
-        /// <returns>BaseItem.</returns>
-        /// <exception cref="System.ArgumentNullException"></exception>
-        BaseItem ResolvePath(FileSystemInfo fileInfo, IDirectoryService directoryService, Folder parent = null);
-
-        /// <summary>
         /// Resolves the path.
         /// </summary>
         /// <param name="fileInfo">The file information.</param>
         /// <param name="parent">The parent.</param>
+        /// <param name="collectionType">Type of the collection.</param>
         /// <returns>BaseItem.</returns>
-        BaseItem ResolvePath(FileSystemInfo fileInfo, Folder parent = null);
+        BaseItem ResolvePath(FileSystemInfo fileInfo, Folder parent = null, string collectionType = null);
 
         /// <summary>
         /// Resolves a set of files into a list of BaseItem
@@ -49,8 +33,9 @@ namespace MediaBrowser.Controller.Library
         /// <param name="files">The files.</param>
         /// <param name="directoryService">The directory service.</param>
         /// <param name="parent">The parent.</param>
+        /// <param name="collectionType">Type of the collection.</param>
         /// <returns>List{``0}.</returns>
-        List<T> ResolvePaths<T>(IEnumerable<FileSystemInfo> files, IDirectoryService directoryService, Folder parent)
+        List<T> ResolvePaths<T>(IEnumerable<FileSystemInfo> files, IDirectoryService directoryService, Folder parent, string collectionType = null)
             where T : BaseItem;
 
         /// <summary>
@@ -152,6 +137,13 @@ namespace MediaBrowser.Controller.Library
         BaseItem GetItemById(Guid id);
 
         /// <summary>
+        /// Gets the memory item by identifier.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <returns>BaseItem.</returns>
+        BaseItem GetMemoryItemById(Guid id);
+        
+        /// <summary>
         /// Gets the intros.
         /// </summary>
         /// <param name="item">The item.</param>
diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
index c1fcdc9fe..d1692aabf 100644
--- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs
+++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
@@ -230,29 +230,18 @@ namespace MediaBrowser.Controller.Library
         }
 
         /// <summary>
-        /// Gets the name of the meta file by.
+        /// Determines whether [contains meta file by name] [the specified name].
         /// </summary>
         /// <param name="name">The name.</param>
-        /// <returns>FileSystemInfo.</returns>
-        /// <exception cref="System.ArgumentNullException"></exception>
-        public FileSystemInfo GetMetaFileByName(string name)
+        /// <returns><c>true</c> if [contains meta file by name] [the specified name]; otherwise, <c>false</c>.</returns>
+        public bool ContainsMetaFileByName(string name)
         {
             if (string.IsNullOrEmpty(name))
             {
                 throw new ArgumentNullException();
             }
 
-            return GetFileSystemEntryByName(name);
-        }
-
-        /// <summary>
-        /// Determines whether [contains meta file by name] [the specified name].
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <returns><c>true</c> if [contains meta file by name] [the specified name]; otherwise, <c>false</c>.</returns>
-        public bool ContainsMetaFileByName(string name)
-        {
-            return GetMetaFileByName(name) != null;
+            return GetFileSystemEntryByName(name) != null;
         }
 
         /// <summary>
@@ -265,20 +254,13 @@ namespace MediaBrowser.Controller.Library
             return GetFileSystemEntryByName(name) != null;
         }
 
-        private bool _collectionTypeDiscovered;
-        private string _collectionType;
-
         public string GetCollectionType()
         {
-            if (!_collectionTypeDiscovered)
-            {
-                _collectionType = Parent == null ? null : _libraryManager.FindCollectionType(Parent);
-                _collectionTypeDiscovered = true;
-            }
-
-            return _collectionType;
+            return CollectionType;
         }
 
+        public string CollectionType { get; set; }
+
         #region Equality Overrides
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs
index 34486182b..c85a8f335 100644
--- a/MediaBrowser.Controller/Library/TVUtils.cs
+++ b/MediaBrowser.Controller/Library/TVUtils.cs
@@ -284,7 +284,7 @@ namespace MediaBrowser.Controller.Library
                 {
                     if (IsSeasonFolder(child.FullName, directoryService, fileSystem))
                     {
-                        logger.Debug("{0} is a series because of season folder {1}.", path, child.FullName);
+                        //logger.Debug("{0} is a series because of season folder {1}.", path, child.FullName);
                         return true;
                     }