starred/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-02-05 08:42:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Backport pull request #11719 from jellyfin/release-10.9.z

Browse Source 
Move NFO series season name parsing to own local provider

Original-merge: a53ea029fa

Merged-by: joshuaboniface <joshua@boniface.me>

Backported-by: Joshua M. Boniface <joshua@boniface.me>
This commit is contained in:
Shadowghost
2024-06-01 18:40:55 -04:00
committed by Joshua M. Boniface
parent 76abff2fba
commit c0364fc766
8 changed files with 176 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs
View File

@@ -100,19 +100,10 @@ namespace MediaBrowser.XbmcMetadata.Parsers
break;
}
// Season names are processed by SeriesNfoSeasonParser
case "namedseason":
{
var parsed = int.TryParse(reader.GetAttribute("number"), NumberStyles.Integer, CultureInfo.InvariantCulture, out var seasonNumber);
var name = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(name) && parsed)
{
item.SetSeasonName(seasonNumber, name);
}
break;
}
reader.Skip();
break;
default:
base.FetchDataFromXmlNode(reader, itemResult);
break;

60
MediaBrowser.XbmcMetadata/Parsers/SeriesNfoSeasonParser.cs Normal file
View File

@@ -0,0 +1,60 @@
using System.Globalization;
using System.Xml;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using Microsoft.Extensions.Logging;
namespace MediaBrowser.XbmcMetadata.Parsers
{
/// <summary>
/// NFO parser for seasons based on series NFO.
/// </summary>
public class SeriesNfoSeasonParser : BaseNfoParser<Season>
{
/// <summary>
/// Initializes a new instance of the <see cref="SeriesNfoSeasonParser"/> class.
/// </summary>
/// <param name="logger">Instance of the <see cref="ILogger"/> interface.</param>
/// <param name="config">Instance of the <see cref="IConfigurationManager"/> interface.</param>
/// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
/// <param name="userManager">Instance of the <see cref="IUserManager"/> interface.</param>
/// <param name="userDataManager">Instance of the <see cref="IUserDataManager"/> interface.</param>
/// <param name="directoryService">Instance of the <see cref="IDirectoryService"/> interface.</param>
public SeriesNfoSeasonParser(
ILogger logger,
IConfigurationManager config,
IProviderManager providerManager,
IUserManager userManager,
IUserDataManager userDataManager,
IDirectoryService directoryService)
: base(logger, config, providerManager, userManager, userDataManager, directoryService)
{
}
/// <inheritdoc />
protected override bool SupportsUrlAfterClosingXmlTag => true;
/// <inheritdoc />
protected override void FetchDataFromXmlNode(XmlReader reader, MetadataResult<Season> itemResult)
{
var item = itemResult.Item;
if (reader.Name == "namedseason")
{
var parsed = int.TryParse(reader.GetAttribute("number"), NumberStyles.Integer, CultureInfo.InvariantCulture, out var seasonNumber);
var name = reader.ReadElementContentAsString();
if (parsed && !string.IsNullOrWhiteSpace(name) && item.IndexNumber.HasValue && seasonNumber == item.IndexNumber.Value)
{
item.Name = name;
}
}
else
{
reader.Skip();
}
}
}
}

5
MediaBrowser.XbmcMetadata/Providers/BaseNfoProvider.cs
View File

@@ -42,7 +42,10 @@ namespace MediaBrowser.XbmcMetadata.Providers
try
{
result.Item = new T();
result.Item = new T
{
IndexNumber = info.IndexNumber
};
Fetch(result, path, cancellationToken);
result.HasMetadata = true;

89
MediaBrowser.XbmcMetadata/Providers/SeriesNfoSeasonProvider.cs Normal file
View File

@@ -0,0 +1,89 @@
using System.IO;
using System.Threading;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.IO;
using MediaBrowser.XbmcMetadata.Parsers;
using Microsoft.Extensions.Logging;
namespace MediaBrowser.XbmcMetadata.Providers
{
/// <summary>
/// NFO provider for seasons based on series NFO.
/// </summary>
public class SeriesNfoSeasonProvider : BaseNfoProvider<Season>
{
private readonly ILogger<SeriesNfoSeasonProvider> _logger;
private readonly IConfigurationManager _config;
private readonly IProviderManager _providerManager;
private readonly IUserManager _userManager;
private readonly IUserDataManager _userDataManager;
private readonly IDirectoryService _directoryService;
private readonly ILibraryManager _libraryManager;
/// <summary>
/// Initializes a new instance of the <see cref="SeriesNfoSeasonProvider"/> class.
/// </summary>
/// <param name="logger">Instance of the <see cref="ILogger{SeasonFromSeriesNfoProvider}"/> interface.</param>
/// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
/// <param name="config">Instance of the <see cref="IConfigurationManager"/> interface.</param>
/// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
/// <param name="userManager">Instance of the <see cref="IUserManager"/> interface.</param>
/// <param name="userDataManager">Instance of the <see cref="IUserDataManager"/> interface.</param>
/// <param name="directoryService">Instance of the <see cref="IDirectoryService"/> interface.</param>
/// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
public SeriesNfoSeasonProvider(
ILogger<SeriesNfoSeasonProvider> logger,
IFileSystem fileSystem,
IConfigurationManager config,
IProviderManager providerManager,
IUserManager userManager,
IUserDataManager userDataManager,
IDirectoryService directoryService,
ILibraryManager libraryManager)
: base(fileSystem)
{
_logger = logger;
_config = config;
_providerManager = providerManager;
_userManager = userManager;
_userDataManager = userDataManager;
_directoryService = directoryService;
_libraryManager = libraryManager;
}
/// <inheritdoc />
protected override void Fetch(MetadataResult<Season> result, string path, CancellationToken cancellationToken)
{
new SeriesNfoSeasonParser(_logger, _config, _providerManager, _userManager, _userDataManager, _directoryService).Fetch(result, path, cancellationToken);
}
/// <inheritdoc />
protected override FileSystemMetadata? GetXmlFile(ItemInfo info, IDirectoryService directoryService)
{
var seasonPath = info.Path;
if (seasonPath is not null)
{
var path = Path.Combine(seasonPath, "tvshow.nfo");
if (Path.Exists(path))
{
return directoryService.GetFile(path);
}
}
var seriesPath = _libraryManager.GetItemById(info.ParentId)?.Path;
if (seriesPath is not null)
{
var path = Path.Combine(seriesPath, "tvshow.nfo");
if (Path.Exists(path))
{
return directoryService.GetFile(path);
}
}
return null;
}
}
}