From 82ffaafc0305b8bdbbef60ec821168e15882bf16 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 5 Oct 2013 21:04:41 -0400 Subject: add more to mbt endpoints --- MediaBrowser.Controller/Entities/Folder.cs | 56 +++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 13 deletions(-) (limited to 'MediaBrowser.Controller/Entities') diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index e1e7d87514..43b251d8fc 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -24,6 +24,8 @@ namespace MediaBrowser.Controller.Entities /// public class Folder : BaseItem { + public static IUserManager UserManager { get; set; } + public Folder() { LinkedChildren = new List(); @@ -89,6 +91,11 @@ namespace MediaBrowser.Controller.Entities item.Id = item.Path.GetMBId(item.GetType()); } + if (_children.Any(i => i.Id == item.Id)) + { + throw new ArgumentException(string.Format("A child with the Id {0} already exists.", item.Id)); + } + if (item.DateCreated == DateTime.MinValue) { item.DateCreated = DateTime.UtcNow; @@ -718,17 +725,17 @@ namespace MediaBrowser.Controller.Entities foreach (var item in itemsRemoved) { - if (IsRootPathAvailable(item.Path)) - { - item.IsOffline = false; - actualRemovals.Add(item); - } - else + if (IsPathOffline(item.Path)) { item.IsOffline = true; validChildren.Add(new Tuple(item, false)); } + else + { + item.IsOffline = false; + actualRemovals.Add(item); + } } if (actualRemovals.Count > 0) @@ -855,29 +862,52 @@ namespace MediaBrowser.Controller.Entities } /// - /// Determines if a path's root is available or not + /// Determines whether the specified path is offline. /// - /// - /// - private bool IsRootPathAvailable(string path) + /// The path. + /// true if the specified path is offline; otherwise, false. + private bool IsPathOffline(string path) { if (File.Exists(path)) { - return true; + return false; } + var originalPath = path; + // Depending on whether the path is local or unc, it may return either null or '\' at the top while (!string.IsNullOrEmpty(path) && path.Length > 1) { if (Directory.Exists(path)) { - return true; + return false; } path = System.IO.Path.GetDirectoryName(path); } - return false; + if (ContainsPath(LibraryManager.GetDefaultVirtualFolders(), originalPath)) + { + return true; + } + + return UserManager.Users.Any(user => ContainsPath(LibraryManager.GetVirtualFolders(user), originalPath)); + } + + /// + /// Determines whether the specified folders contains path. + /// + /// The folders. + /// The path. + /// true if the specified folders contains path; otherwise, false. + private bool ContainsPath(IEnumerable folders, string path) + { + return folders.SelectMany(i => i.Locations).Any(i => ContainsPath(i, path)); + } + + private bool ContainsPath(string parent, string path) + { + return string.Equals(parent, path, StringComparison.OrdinalIgnoreCase) || path.IndexOf(parent.TrimEnd(System.IO.Path.DirectorySeparatorChar) + System.IO.Path.DirectorySeparatorChar, StringComparison.OrdinalIgnoreCase) != -1; } /// -- cgit v1.2.3