alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-10 04:06:17 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Rework season folder parsing (#11748)

Browse Source
This commit is contained in:
Tim Eisele
2025-03-23 17:05:40 +01:00
committed by GitHub
parent 8db6a39e92
commit dfb485d1f2
7 changed files with 105 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@@ -2512,8 +2512,11 @@ namespace Emby.Server.Implementations.Library
}
/// <inheritdoc />
public int? GetSeasonNumberFromPath(string path)
=> SeasonPathParser.Parse(path, true, true).SeasonNumber;
public int? GetSeasonNumberFromPath(string path, Guid? parentId)
{
var parentPath = parentId.HasValue ? GetItemById(parentId.Value)?.ContainingFolderPath : null;
return SeasonPathParser.Parse(path, parentPath, true, true).SeasonNumber;
}
/// <inheritdoc />
public bool FillMissingEpisodeNumbersFromPath(Episode episode, bool forceRefresh)

2
Emby.Server.Implementations/Library/Resolvers/TV/SeasonResolver.cs
View File

@@ -48,7 +48,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
var path = args.Path;
var seasonParserResult = SeasonPathParser.Parse(path, true, true);
var seasonParserResult = SeasonPathParser.Parse(path, series.ContainingFolderPath, true, true);
var season = new Season
{

7
Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
View File

@@ -118,7 +118,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
{
if (child.IsDirectory)
{
if (IsSeasonFolder(child.FullName, isTvContentType))
if (IsSeasonFolder(child.FullName, path, isTvContentType))
{
_logger.LogDebug("{Path} is a series because of season folder {Dir}.", path, child.FullName);
return true;
@@ -155,11 +155,12 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
/// Determines whether [is season folder] [the specified path].
/// </summary>
/// <param name="path">The path.</param>
/// <param name="parentPath">The parentpath.</param>
/// <param name="isTvContentType">if set to <c>true</c> [is tv content type].</param>
/// <returns><c>true</c> if [is season folder] [the specified path]; otherwise, <c>false</c>.</returns>
private static bool IsSeasonFolder(string path, bool isTvContentType)
private static bool IsSeasonFolder(string path, string parentPath, bool isTvContentType)
{
var seasonNumber = SeasonPathParser.Parse(path, isTvContentType, isTvContentType).SeasonNumber;
var seasonNumber = SeasonPathParser.Parse(path, parentPath, isTvContentType, isTvContentType).SeasonNumber;
return seasonNumber.HasValue;
}