diff options
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/ItemsService.cs | 29 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/BaseMetadataProvider.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/Querying/ItemQuery.cs | 6 |
3 files changed, 31 insertions, 6 deletions
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index 6a8992658..d55ba2e90 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -179,6 +179,8 @@ namespace MediaBrowser.Api.UserLibrary [ApiMember(Name = "IsHD", Description = "Optional filter by items that are HD or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")] public bool? IsHD { get; set; } + + public bool IncludeIndexContainers { get; set; } } /// <summary> @@ -285,20 +287,37 @@ namespace MediaBrowser.Api.UserLibrary var item = string.IsNullOrEmpty(request.ParentId) ? user.RootFolder : _dtoService.GetItemByDtoId(request.ParentId, user.Id); // Default list type = children + IEnumerable<BaseItem> items; if (!string.IsNullOrEmpty(request.Ids)) { var idList = request.Ids.Split(',').ToList(); - return idList.Select(i => _dtoService.GetItemByDtoId(i, user.Id)); + items = idList.Select(i => _dtoService.GetItemByDtoId(i, user.Id)); + } + + else if (request.Recursive) + { + items = ((Folder) item).GetRecursiveChildren(user); + } + else + { + items = ((Folder)item).GetChildren(user, true, request.IndexBy); } - if (request.Recursive) + if (request.IncludeIndexContainers) { - return ((Folder)item).GetRecursiveChildren(user); + var list = items.ToList(); + + var containers = list.Select(i => i.IndexContainer) + .Where(i => i != null); + + list.AddRange(containers); + + return list.Distinct(); } - return ((Folder)item).GetChildren(user, true, request.IndexBy); + return items; } /// <summary> @@ -648,7 +667,7 @@ namespace MediaBrowser.Api.UserLibrary if (string.IsNullOrEmpty(personTypes)) { - items = items.Where(item => item.People != null && item.People.Any(p => string.Equals(p.Name, request.Person, StringComparison.OrdinalIgnoreCase))); + items = items.Where(item => item.People.Any(p => string.Equals(p.Name, request.Person, StringComparison.OrdinalIgnoreCase))); } else { diff --git a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs index 10c5c116a..ee854018b 100644 --- a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs +++ b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs @@ -406,7 +406,7 @@ namespace MediaBrowser.Controller.Providers return sb.ToString().GetMD5(); } - private static readonly Dictionary<string, string> FoldersToMonitor = new[] { "extrafanart" } + private static readonly Dictionary<string, string> FoldersToMonitor = new[] { "extrafanart", "extrathumbs" } .ToDictionary(i => i, StringComparer.OrdinalIgnoreCase); /// <summary> diff --git a/MediaBrowser.Model/Querying/ItemQuery.cs b/MediaBrowser.Model/Querying/ItemQuery.cs index db0cc4928..76269c56c 100644 --- a/MediaBrowser.Model/Querying/ItemQuery.cs +++ b/MediaBrowser.Model/Querying/ItemQuery.cs @@ -229,6 +229,12 @@ namespace MediaBrowser.Model.Querying /// </summary> /// <value>The album artist starts with or greater.</value> public string AlbumArtistStartsWithOrGreater { get; set; } + + /// <summary> + /// Gets or sets a value indicating whether [include index containers]. + /// </summary> + /// <value><c>true</c> if [include index containers]; otherwise, <c>false</c>.</value> + public bool IncludeIndexContainers { get; set; } /// <summary> /// Initializes a new instance of the <see cref="ItemQuery" /> class. |