@ -135,20 +135,15 @@ namespace Emby.Server.Implementations.TV
return GetResult ( episodes , request ) ;
}
p ublic IEnumerable < Episode > GetNextUpEpisodes ( NextUpQuery request , User user , IReadOnlyList < string > seriesKeys , DtoOptions dtoOptions )
p rivate IEnumerable < Episode > GetNextUpEpisodes ( NextUpQuery request , User user , IReadOnlyList < string > seriesKeys , DtoOptions dtoOptions )
{
// Avoid implicitly captured closure
var currentUser = user ;
var allNextUp = seriesKeys
. Select ( i = > GetNextUp ( i , currentUser , dtoOptions , false ) ) ;
var allNextUp = seriesKeys . Select ( i = > GetNextUp ( i , user , dtoOptions , false ) ) ;
if ( request . EnableRewatching )
{
allNextUp = allNextUp . Concat (
seriesKeys . Select ( i = > GetNextUp ( i , currentUser , dtoOptions , true ) )
)
. OrderByDescending ( i = > i . Item1 ) ;
seriesKeys . Select ( i = > GetNextUp ( i , user , dtoOptions , true ) ) )
. OrderByDescending ( i = > i . LastWatchedDate ) ;
}
// If viewing all next up for all series, remove first episodes
@ -161,23 +156,18 @@ namespace Emby.Server.Implementations.TV
{
if ( request . DisableFirstEpisode )
{
return i . Item1 ! = DateTime . MinValue ;
return i . LastWatchedDate ! = DateTime . MinValue ;
}
if ( alwaysEnableFirstEpisode | | ( i . Item1 ! = DateTime . MinValue & & i . Item1 . Date > = request . NextUpDateCutoff ) )
if ( alwaysEnableFirstEpisode | | ( i . LastWatchedDate ! = DateTime . MinValue & & i . LastWatchedDate . Date > = request . NextUpDateCutoff ) )
{
anyFound = true ;
return true ;
}
if ( ! anyFound & & i . Item1 = = DateTime . MinValue )
{
return true ;
}
return false ;
return ! anyFound & & i . LastWatchedDate = = DateTime . MinValue ;
} )
. Select ( i = > i . Item2 ( ) )
. Select ( i = > i . GetEpisodeFunction ( ) )
. Where ( i = > i ! = null ) ;
}
@ -195,14 +185,14 @@ namespace Emby.Server.Implementations.TV
/// Gets the next up.
/// </summary>
/// <returns>Task{Episode}.</returns>
private Tuple < DateTime , Func < Episode > > GetNextUp ( string seriesKey , User user , DtoOptions dtoOptions , bool rewatching )
private ( DateTime LastWatchedDate , Func < Episode > GetEpisodeFunction ) GetNextUp ( string seriesKey , User user , DtoOptions dtoOptions , bool rewatching )
{
var lastQuery = new InternalItemsQuery ( user )
{
AncestorWithPresentationUniqueKey = null ,
SeriesPresentationUniqueKey = seriesKey ,
IncludeItemTypes = new [ ] { BaseItemKind . Episode } ,
OrderBy = new [ ] { ( ItemSortBy . SortName , SortOrder . Descending ) } ,
OrderBy = new [ ] { ( ItemSortBy . ParentIndexNumber, SortOrder . Descending ) , ( ItemSortBy . IndexNumber , SortOrder . Descending ) } ,
IsPlayed = true ,
Limit = 1 ,
ParentIndexNumberNotEquals = 0 ,
@ -216,24 +206,23 @@ namespace Emby.Server.Implementations.TV
if ( rewatching )
{
// find last watched by date played, not by newest episode watched
lastQuery . OrderBy = new [ ] { ( ItemSortBy . DatePlayed , SortOrder . Descending ) } ;
lastQuery . OrderBy = new [ ] { ( ItemSortBy . DatePlayed , SortOrder . Descending ) , ( ItemSortBy . ParentIndexNumber , SortOrder . Descending ) , ( ItemSortBy . IndexNumber , SortOrder . Descending ) } ;
}
var lastWatchedEpisode = _libraryManager . GetItemList ( lastQuery ) . Cast < Episode > ( ) . FirstOrDefault ( ) ;
Func< Episode > getEpisode = ( ) = >
Episode GetEpisode ( )
{
var nextQuery = new InternalItemsQuery ( user )
{
AncestorWithPresentationUniqueKey = null ,
SeriesPresentationUniqueKey = seriesKey ,
IncludeItemTypes = new [ ] { BaseItemKind . Episode } ,
OrderBy = new [ ] { ( ItemSortBy . SortName , SortOrder . Ascending ) } ,
OrderBy = new [ ] { ( ItemSortBy . ParentIndexNumber, SortOrder . Ascending ) , ( ItemSortBy . IndexNumber , SortOrder . Ascending ) } ,
Limit = 1 ,
IsPlayed = rewatching ,
IsVirtualItem = false ,
ParentIndexNumberNotEquals = 0 ,
MinSortName = lastWatchedEpisode ? . SortName ,
DtoOptions = dtoOptions
} ;
@ -297,7 +286,7 @@ namespace Emby.Server.Implementations.TV
}
return nextEpisode ;
} ;
}
if ( lastWatchedEpisode ! = null )
{
@ -305,11 +294,11 @@ namespace Emby.Server.Implementations.TV
var lastWatchedDate = userData . LastPlayedDate ? ? DateTime . MinValue . AddDays ( 1 ) ;
return new Tuple < DateTime , Func < Episode > > ( lastWatchedDate , g etEpisode) ;
return ( lastWatchedDate , G etEpisode) ;
}
// Return the first episode
return new Tuple < DateTime , Func < Episode > > ( DateTime . MinValue , g etEpisode) ;
return ( DateTime . MinValue , G etEpisode) ;
}
private static QueryResult < BaseItem > GetResult ( IEnumerable < BaseItem > items , NextUpQuery query )