alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-02 22:08:27 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

3.2.33.1

Browse Source
This commit is contained in:
Luke Pulverenti
2017-10-02 16:18:27 -04:00
parent 154fd214b4
commit a7b0b601fa
3 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Emby.Server.Implementations/TV/TVSeriesManager.cs
View File

@@ -36,8 +36,6 @@ namespace Emby.Server.Implementations.TV
throw new ArgumentException("User not found");
}
var parentIdGuid = string.IsNullOrWhiteSpace(request.ParentId) ? (Guid?)null : new Guid(request.ParentId);
string presentationUniqueKey = null;
int? limit = null;
if (!string.IsNullOrWhiteSpace(request.SeriesId))
@@ -56,10 +54,26 @@ namespace Emby.Server.Implementations.TV
return GetResult(GetNextUpEpisodes(request, user, new[] { presentationUniqueKey }, dtoOptions), request);
}
var parents = user.RootFolder.GetChildren(user, true)
.Where(i => i is Folder)
.Where(i => !user.Configuration.LatestItemsExcludes.Contains(i.Id.ToString("N")))
.ToList();
var parentIdGuid = string.IsNullOrWhiteSpace(request.ParentId) ? (Guid?)null : new Guid(request.ParentId);
List<BaseItem> parents;
if (parentIdGuid.HasValue)
{
var parent = _libraryManager.GetItemById(parentIdGuid.Value);
parents = new List<BaseItem>();
if (parent != null)
{
parents.Add(parent);
}
}
else
{
parents = user.RootFolder.GetChildren(user, true)
.Where(i => i is Folder)
.Where(i => !user.Configuration.LatestItemsExcludes.Contains(i.Id.ToString("N")))
.ToList();
}
return GetNextUp(request, parents, dtoOptions);
}
@@ -88,7 +102,7 @@ namespace Emby.Server.Implementations.TV
if (!string.IsNullOrWhiteSpace(presentationUniqueKey))
{
return GetResult(GetNextUpEpisodes(request, user, new [] { presentationUniqueKey }, dtoOptions), request);
return GetResult(GetNextUpEpisodes(request, user, new[] { presentationUniqueKey }, dtoOptions), request);
}
if (limit.HasValue)