Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix series status parsing #11648

Merged
merged 4 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions Emby.Naming/TV/TvParserHelpers.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
using System;
using System.Linq;
using MediaBrowser.Model.Entities;

namespace Emby.Naming.TV;

/// <summary>
/// Helper class for TV metadata parsing.
/// </summary>
public static class TvParserHelpers
{
private static readonly string[] _continuingState = ["Pilot", "Returning Series", "Returning"];
private static readonly string[] _endedState = ["Cancelled"];

/// <summary>
/// Tries to parse a string into <see cref="SeriesStatus"/>.
/// </summary>
/// <param name="status">The status string.</param>
/// <param name="enumValue">The <see cref="SeriesStatus"/>.</param>
/// <returns>Returns true if parsing was successful.</returns>
public static bool TryParseSeriesStatus(string status, out SeriesStatus? enumValue)
{
if (Enum.TryParse(status, true, out SeriesStatus seriesStatus))
{
enumValue = seriesStatus;
return true;
}

if (_continuingState.Contains(status, StringComparer.OrdinalIgnoreCase))
{
enumValue = SeriesStatus.Continuing;
return true;
}

if (_endedState.Contains(status, StringComparer.OrdinalIgnoreCase))
{
enumValue = SeriesStatus.Ended;
return true;
}

enumValue = null;
return false;
}
}
11 changes: 3 additions & 8 deletions MediaBrowser.Providers/Plugins/Tmdb/TV/TmdbSeriesProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -278,17 +278,12 @@ private static Series MapTvShowToSeries(TvShow seriesResult, string preferredCou

series.RunTimeTicks = seriesResult.EpisodeRunTime.Select(i => TimeSpan.FromMinutes(i).Ticks).FirstOrDefault();

if (string.Equals(seriesResult.Status, "Ended", StringComparison.OrdinalIgnoreCase)
|| string.Equals(seriesResult.Status, "Canceled", StringComparison.OrdinalIgnoreCase))
if (Emby.Naming.TV.TvParserHelpers.TryParseSeriesStatus(seriesResult.Status, out var seriesStatus))
{
series.Status = SeriesStatus.Ended;
series.EndDate = seriesResult.LastAirDate;
}
else
{
series.Status = SeriesStatus.Continuing;
series.Status = seriesStatus;
}

series.EndDate = seriesResult.LastAirDate;
series.PremiereDate = seriesResult.FirstAirDate;

var ids = seriesResult.ExternalIds;
Expand Down
4 changes: 2 additions & 2 deletions MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using System.Globalization;
using System.Xml;
using Emby.Naming.TV;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Extensions;
Expand Down Expand Up @@ -87,7 +87,7 @@ protected override void FetchDataFromXmlNode(XmlReader reader, MetadataResult<Se

if (!string.IsNullOrWhiteSpace(status))
{
if (Enum.TryParse(status, true, out SeriesStatus seriesStatus))
if (TvParserHelpers.TryParseSeriesStatus(status, out var seriesStatus))
{
item.Status = seriesStatus;
}
Expand Down
28 changes: 28 additions & 0 deletions tests/Jellyfin.Naming.Tests/TV/TvParserHelpersTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
using Emby.Naming.TV;
using MediaBrowser.Model.Entities;
using Xunit;

namespace Jellyfin.Naming.Tests.TV
Shadowghost marked this conversation as resolved.
Show resolved Hide resolved
{
public class TvParserHelpersTest
{
[Theory]
[InlineData("Ended", SeriesStatus.Ended, true)]
[InlineData("Cancelled", SeriesStatus.Ended, true)]
[InlineData("Continuing", SeriesStatus.Continuing, true)]
[InlineData("Returning", SeriesStatus.Continuing, true)]
[InlineData("Returning Series", SeriesStatus.Continuing, true)]
[InlineData("Unreleased", SeriesStatus.Unreleased, true)]
[InlineData("XXX", null, false)]
public void SeriesStatusParserTest(string statusString, SeriesStatus? status, bool success)
{
var successful = TvParserHelpers.TryParseSeriesStatus(statusString, out var parsered);
Assert.Equal(success, successful);
Shadowghost marked this conversation as resolved.
Show resolved Hide resolved

if (success)
{
Assert.Equal(status, parsered);
}
}
}
}
Loading