Merge pull request #1510 from MediaBrowser/dev

dlna fix
pull/702/head
Luke 9 years ago
commit c46cd976bc

@ -453,32 +453,16 @@ namespace MediaBrowser.Dlna.ContentDirectory
sortOrders.Add(ItemSortBy.SortName); sortOrders.Add(ItemSortBy.SortName);
} }
QueryResult<BaseItem> queryResult; var queryResult = await folder.GetItems(new InternalItemsQuery
if (folder is UserRootFolder)
{
var views = await _userViewManager.GetUserViews(new UserViewQuery { UserId = user.Id.ToString("N"), PresetViews = new[] { CollectionType.Movies, CollectionType.TvShows, CollectionType.Music } }, CancellationToken.None)
.ConfigureAwait(false);
queryResult = new QueryResult<BaseItem>
{
Items = views.Cast<BaseItem>().ToArray()
};
queryResult.TotalRecordCount = queryResult.Items.Length;
}
else
{ {
queryResult = await folder.GetItems(new InternalItemsQuery Limit = limit,
{ StartIndex = startIndex,
Limit = limit, SortBy = sortOrders.ToArray(),
StartIndex = startIndex, SortOrder = sort.SortOrder,
SortBy = sortOrders.ToArray(), User = user,
SortOrder = sort.SortOrder, Filter = FilterUnsupportedContent
User = user,
Filter = FilterUnsupportedContent
}).ConfigureAwait(false); }).ConfigureAwait(false);
}
var options = _config.GetDlnaConfiguration(); var options = _config.GetDlnaConfiguration();

Loading…
Cancel
Save