lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplification

Browse Source
This commit is contained in:
cvium 2021-04-09 13:43:40 +02:00
parent 69d2368fbc
commit 457229c56d
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Emby.Naming/TV/EpisodeResolver.cs
View File

@ -68,6 +68,11 @@ namespace Emby.Naming.TV
var parsingResult = new EpisodePathParser(_options) var parsingResult = new EpisodePathParser(_options)
.Parse(path, isDirectory, isNamed, isOptimistic, supportsAbsoluteNumbers, fillExtendedInfo); .Parse(path, isDirectory, isNamed, isOptimistic, supportsAbsoluteNumbers, fillExtendedInfo);
if (!parsingResult.Success)
{
return null;
}
return new EpisodeInfo(path) return new EpisodeInfo(path)
{ {
Container = container, Container = container,

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

@ -2529,25 +2529,16 @@ namespace Emby.Server.Implementations.Library
EpisodeInfo episodeInfo = null; EpisodeInfo episodeInfo = null;
if (episode.IsFileProtocol) if (episode.IsFileProtocol)
{ {
episodeInfo = resolver.Resolve(episode.Path, isFolder, null, null, isAbsoluteNaming) ?? new EpisodeInfo(episode.Path); episodeInfo = resolver.Resolve(episode.Path, isFolder, null, null, isAbsoluteNaming);
// Resolve from parent folder if it's not the Season folder // Resolve from parent folder if it's not the Season folder
if (!episodeInfo.EpisodeNumber.HasValue && episode.Parent.GetType() == typeof(Folder)) if (episodeInfo == null && episode.Parent.GetType() == typeof(Folder))
{ {
var episodeInfoFromFolder = resolver.Resolve(Path.GetDirectoryName(episode.Path)!, true, null, null, isAbsoluteNaming); episodeInfo = resolver.Resolve(Path.GetDirectoryName(episode.Path)!, true, null, null, isAbsoluteNaming);
// merge the missing information if (episodeInfo != null)
episodeInfo.SeriesName = episodeInfoFromFolder?.SeriesName; {
episodeInfo.EpisodeNumber ??= episodeInfoFromFolder?.EpisodeNumber; // add the container
episodeInfo.EndingEpisodeNumber ??= episodeInfoFromFolder?.EndingEpisodeNumber; episodeInfo.Container = Path.GetExtension(episode.Path)?.TrimStart('.');
episodeInfo.SeasonNumber ??= episodeInfoFromFolder?.SeasonNumber; }
episodeInfo.Container ??= episodeInfoFromFolder?.Container;
episodeInfo.Format3D ??= episodeInfoFromFolder?.Format3D;
episodeInfo.Is3D = episodeInfoFromFolder?.Is3D ?? episodeInfo.Is3D;
episodeInfo.IsStub = episodeInfoFromFolder?.IsStub ?? episodeInfo.IsStub;
episodeInfo.StubType = episodeInfoFromFolder?.StubType;
episodeInfo.IsByDate = episodeInfoFromFolder?.IsByDate ?? episodeInfo.IsByDate;
episodeInfo.Day ??= episodeInfoFromFolder?.Day;
episodeInfo.Month ??= episodeInfoFromFolder?.Month;
episodeInfo.Year ??= episodeInfoFromFolder?.Year;
} }
} }