alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-24 19:14:56 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

update dlna profiles

Browse Source
This commit is contained in:
Luke Pulverenti
2015-02-06 22:25:23 -05:00
parent 7320567b9e
commit 504e2099e2
31 changed files with 125 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Api/UserLibrary/ArtistsService.cs
View File

@@ -130,8 +130,8 @@ namespace MediaBrowser.Api.UserLibrary
if (request is GetAlbumArtists)
{
return items
.Where(i => !i.IsFolder)
.OfType<IHasAlbumArtist>()
.Where(i => !(i is MusicAlbum))
.SelectMany(i => i.AlbumArtists)
.Distinct(StringComparer.OrdinalIgnoreCase)
.Select(name =>
@@ -150,8 +150,8 @@ namespace MediaBrowser.Api.UserLibrary
}
return items
.Where(i => !i.IsFolder)
.OfType<IHasArtist>()
.Where(i => !(i is MusicAlbum))
.SelectMany(i => i.AllArtists)
.Distinct(StringComparer.OrdinalIgnoreCase)
.Select(name =>

47
MediaBrowser.Api/UserLibrary/ItemsService.cs
View File

@@ -169,8 +169,6 @@ namespace MediaBrowser.Api.UserLibrary
[ApiMember(Name = "ExcludeLocationTypes", Description = "Optional. If specified, results will be filtered based on LocationType. This allows multiple, comma delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
public string ExcludeLocationTypes { get; set; }
public bool IncludeIndexContainers { get; set; }
[ApiMember(Name = "IsMissing", Description = "Optional filter by items that are missing episodes or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
public bool? IsMissing { get; set; }
@@ -396,52 +394,29 @@ namespace MediaBrowser.Api.UserLibrary
else if (request.Recursive)
{
if (user == null)
{
items = ((Folder)item).GetRecursiveChildren();
var result = await ((Folder)item).GetItems(GetItemsQuery(request, user)).ConfigureAwait(false);
items = _libraryManager.ReplaceVideosWithPrimaryVersions(items);
}
else
{
var result = await ((Folder)item).GetItems(GetItemsQuery(request, user));
return new Tuple<QueryResult<BaseItem>, bool>(result, true);
}
return new Tuple<QueryResult<BaseItem>, bool>(result, true);
}
else
{
if (user == null)
{
items = ((Folder)item).Children;
var result = await ((Folder)item).GetItems(GetItemsQuery(request, null)).ConfigureAwait(false);
items = _libraryManager.ReplaceVideosWithPrimaryVersions(items);
return new Tuple<QueryResult<BaseItem>, bool>(result, true);
}
else
var userRoot = item as UserRootFolder;
if (userRoot == null)
{
var userRoot = item as UserRootFolder;
var result = await ((Folder)item).GetItems(GetItemsQuery(request, user)).ConfigureAwait(false);
if (userRoot == null)
{
var result = await ((Folder)item).GetItems(GetItemsQuery(request, user));
return new Tuple<QueryResult<BaseItem>, bool>(result, true);
}
items = ((Folder)item).GetChildren(user, true);
return new Tuple<QueryResult<BaseItem>, bool>(result, true);
}
}
if (request.IncludeIndexContainers)
{
var list = items.ToList();
var containers = list.Select(i => i.IndexContainer)
.Where(i => i != null);
list.AddRange(containers);
items = list.Distinct();
items = ((Folder)item).GetChildren(user, true);
}
return new Tuple<QueryResult<BaseItem>, bool>(new QueryResult<BaseItem>