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

Fix season handling

Browse Source
This commit is contained in:
Shadowghost
2024-06-09 18:47:21 +02:00
parent b25d6d1e48
commit e4078f984a
4 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Entities/Folder.cs
View File

@@ -194,7 +194,7 @@ namespace MediaBrowser.Controller.Entities
/// </summary>
/// <param name="item">The item.</param>
/// <exception cref="InvalidOperationException">Unable to add + item.Name.</exception>
public void AddChild(BaseItem item)
public virtual void AddChild(BaseItem item)
{
item.SetParent(this);

15
MediaBrowser.Controller/Entities/TV/Season.cs
View File

@@ -265,5 +265,20 @@ namespace MediaBrowser.Controller.Entities.TV
return hasChanges;
}
/// <inheritdoc />
public override void AddChild(BaseItem item)
{
if (item is Episode episode)
{
episode.SeriesPresentationUniqueKey = SeriesPresentationUniqueKey;
episode.SeriesId = SeriesId;
episode.SeriesName = SeriesName;
episode.SeasonId = Id;
episode.SeasonName = Name;
}
base.AddChild(item);
}
}
}

24
MediaBrowser.Controller/Entities/TV/Series.cs
View File

@@ -350,17 +350,10 @@ namespace MediaBrowser.Controller.Entities.TV
public List<BaseItem> GetSeasonEpisodes(Season parentSeason, User user, DtoOptions options, bool shouldIncludeMissingEpisodes)
{
var queryFromSeries = ConfigurationManager.Configuration.DisplaySpecialsWithinSeasons;
// add optimization when this setting is not enabled
var seriesKey = queryFromSeries ?
GetUniqueSeriesKey(this) :
GetUniqueSeriesKey(parentSeason);
var query = new InternalItemsQuery(user)
{
AncestorWithPresentationUniqueKey = queryFromSeries ? null : seriesKey,
SeriesPresentationUniqueKey = queryFromSeries ? seriesKey : null,
AncestorWithPresentationUniqueKey = null,
SeriesPresentationUniqueKey = GetUniqueSeriesKey(this),
IncludeItemTypes = new[] { BaseItemKind.Episode },
OrderBy = new[] { (ItemSortBy.SortName, SortOrder.Ascending) },
DtoOptions = options
@@ -506,5 +499,18 @@ namespace MediaBrowser.Controller.Entities.TV
return list;
}
/// <inheritdoc />
public override void AddChild(BaseItem item)
{
if (item is IHasSeries typedItem)
{
typedItem.SeriesId = Id;
typedItem.SeriesName = Name;
typedItem.SeriesPresentationUniqueKey = PresentationUniqueKey;
}
base.AddChild(item);
}
}
}