open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10352 from barronpm/xml-parsing-cleanup

Browse Source
pull/10101/head
Bond-009 12 months ago committed by GitHub
parent 733ee12ee4 1ce49b4a04
commit c45157158e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 547 additions and 1245 deletions
Show Stats Download Patch File Download Diff File

193
MediaBrowser.Controller/Extensions/XmlReaderExtensions.cs
Unescape View File

@ -0,0 +1,193 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Xml;
using Jellyfin.Data.Enums;
using MediaBrowser.Controller.Entities;
namespace MediaBrowser.Controller.Extensions;
/// <summary>
/// Provides extension methods for <see cref="XmlReader"/> to parse <see cref="BaseItem"/>'s.
/// </summary>
public static class XmlReaderExtensions
{
/// <summary>
/// Reads a trimmed string from the current node.
/// </summary>
/// <param name="reader">The <see cref="XmlReader"/>.</param>
/// <returns>The trimmed content.</returns>
public static string ReadNormalizedString(this XmlReader reader)
{
ArgumentNullException.ThrowIfNull(reader);
return reader.ReadElementContentAsString().Trim();
}
/// <summary>
/// Reads an int from the current node.
/// </summary>
/// <param name="reader">The <see cref="XmlReader"/>.</param>
/// <param name="value">The parsed <c>int</c>.</param>
/// <returns>A value indicating whether the parsing succeeded.</returns>
public static bool TryReadInt(this XmlReader reader, out int value)
{
ArgumentNullException.ThrowIfNull(reader);
return int.TryParse(reader.ReadElementContentAsString(), CultureInfo.InvariantCulture, out value);
}
/// <summary>
/// Parses a <see cref="DateTime"/> from the current node.
/// </summary>
/// <param name="reader">The <see cref="XmlReader"/>.</param>
/// <param name="value">The parsed <see cref="DateTime"/>.</param>
/// <returns>A value indicating whether the parsing succeeded.</returns>
public static bool TryReadDateTime(this XmlReader reader, out DateTime value)
{
ArgumentNullException.ThrowIfNull(reader);
return DateTime.TryParse(
reader.ReadElementContentAsString(),
CultureInfo.InvariantCulture,
DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal,
out value);
}
/// <summary>
/// Parses a <see cref="DateTime"/> from the current node.
/// </summary>
/// <param name="reader">The <see cref="XmlReader"/>.</param>
/// <param name="formatString">The date format string.</param>
/// <param name="value">The parsed <see cref="DateTime"/>.</param>
/// <returns>A value indicating whether the parsing succeeded.</returns>
public static bool TryReadDateTimeExact(this XmlReader reader, string formatString, out DateTime value)
{
ArgumentNullException.ThrowIfNull(reader);
ArgumentNullException.ThrowIfNull(formatString);
return DateTime.TryParseExact(
reader.ReadElementContentAsString(),
formatString,
CultureInfo.InvariantCulture,
DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal,
out value);
}
/// <summary>
/// Parses a <see cref="PersonInfo"/> from the xml node.
/// </summary>
/// <param name="reader">The <see cref="XmlReader"/>.</param>
/// <returns>A <see cref="PersonInfo"/>, or <c>null</c> if none is found.</returns>
public static PersonInfo? GetPersonFromXmlNode(this XmlReader reader)
{
ArgumentNullException.ThrowIfNull(reader);
if (reader.IsEmptyElement)
{
reader.Read();
return null;
}
var name = string.Empty;
var type = PersonKind.Actor; // If type is not specified assume actor
var role = string.Empty;
int? sortOrder = null;
string? imageUrl = null;
using var subtree = reader.ReadSubtree();
subtree.MoveToContent();
subtree.Read();
while (subtree is { EOF: false, ReadState: ReadState.Interactive })
{
if (subtree.NodeType != XmlNodeType.Element)
{
subtree.Read();
continue;
}
switch (subtree.Name)
{
case "name":
case "Name":
name = subtree.ReadNormalizedString();
break;
case "role":
case "Role":
role = subtree.ReadNormalizedString();
break;
case "type":
case "Type":
Enum.TryParse(subtree.ReadElementContentAsString(), true, out type);
break;
case "order":
case "sortorder":
case "SortOrder":
if (subtree.TryReadInt(out var sortOrderVal))
{
sortOrder = sortOrderVal;
}
break;
case "thumb":
imageUrl = subtree.ReadNormalizedString();
break;
default:
subtree.Skip();
break;
}
}
if (string.IsNullOrWhiteSpace(name))
{
return null;
}
return new PersonInfo
{
Name = name,
Role = role,
Type = type,
SortOrder = sortOrder,
ImageUrl = imageUrl
};
}
/// <summary>
/// Used to split names of comma or pipe delimited genres and people.
/// </summary>
/// <param name="reader">The <see cref="XmlReader"/>.</param>
/// <returns>IEnumerable{System.String}.</returns>
public static IEnumerable<string> GetStringArray(this XmlReader reader)
{
ArgumentNullException.ThrowIfNull(reader);
var value = reader.ReadElementContentAsString();
// Only split by comma if there is no pipe in the string
// We have to be careful to not split names like Matthew, Jr.
var separator = !value.Contains('|', StringComparison.Ordinal)
&& !value.Contains(';', StringComparison.Ordinal)
? new[] { ',' }
: new[] { '|', ';' };
foreach (var part in value.Trim().Trim(separator).Split(separator))
{
if (!string.IsNullOrWhiteSpace(part))
{
yield return part.Trim();
}
}
}
/// <summary>
/// Parses a <see cref="PersonInfo"/> array from the xml node.
/// </summary>
/// <param name="reader">The <see cref="XmlReader"/>.</param>
/// <param name="personKind">The <see cref="PersonKind"/>.</param>
/// <returns>The <see cref="IEnumerable{PersonInfo}"/>.</returns>
public static IEnumerable<PersonInfo> GetPersonArray(this XmlReader reader, PersonKind personKind)
=> reader.GetStringArray()
.Select(part => new PersonInfo { Name = part, Type = personKind });
}

501
MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
Unescape View File

@ -9,6 +9,7 @@ using System.Xml;
using Jellyfin.Data.Enums; using Jellyfin.Data.Enums;
using Jellyfin.Extensions; using Jellyfin.Extensions;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Extensions;
using MediaBrowser.Controller.Playlists; using MediaBrowser.Controller.Playlists;
using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
@ -128,42 +129,19 @@ namespace MediaBrowser.LocalMetadata.Parsers
switch (reader.Name) switch (reader.Name)
{ {
// DateCreated
case "Added": case "Added":
if (reader.TryReadDateTime(out var dateCreated))
{ {
var val = reader.ReadElementContentAsString(); item.DateCreated = dateCreated;
if (!string.IsNullOrWhiteSpace(val))
{
if (DateTime.TryParse(val, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal, out var added))
{
item.DateCreated = added;
}
else
{
Logger.LogWarning("Invalid Added value found: {Value}", val);
}
} }
break; break;
}
case "OriginalTitle": case "OriginalTitle":
{ item.OriginalTitle = reader.ReadNormalizedString();
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrEmpty(val))
{
item.OriginalTitle = val;
}
break; break;
}
case "LocalTitle": case "LocalTitle":
item.Name = reader.ReadElementContentAsString(); item.Name = reader.ReadNormalizedString();
break; break;
case "CriticRating": case "CriticRating":
{ {
var text = reader.ReadElementContentAsString(); var text = reader.ReadElementContentAsString();
@ -177,63 +155,26 @@ namespace MediaBrowser.LocalMetadata.Parsers
} }
case "SortTitle": case "SortTitle":
{ item.ForcedSortName = reader.ReadNormalizedString();
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
item.ForcedSortName = val;
}
break; break;
}
case "Overview": case "Overview":
case "Description": case "Description":
{ item.Overview = reader.ReadNormalizedString();
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
item.Overview = val;
}
break; break;
}
case "Language": case "Language":
{ item.PreferredMetadataLanguage = reader.ReadNormalizedString();
var val = reader.ReadElementContentAsString();
item.PreferredMetadataLanguage = val;
break; break;
}
case "CountryCode": case "CountryCode":
{ item.PreferredMetadataCountryCode = reader.ReadNormalizedString();
var val = reader.ReadElementContentAsString();
item.PreferredMetadataCountryCode = val;
break; break;
}
case "PlaceOfBirth": case "PlaceOfBirth":
var placeOfBirth = reader.ReadNormalizedString();
if (!string.IsNullOrEmpty(placeOfBirth) && item is Person person)
{ {
var val = reader.ReadElementContentAsString(); person.ProductionLocations = new[] { placeOfBirth };
if (!string.IsNullOrWhiteSpace(val))
{
if (item is Person person)
{
person.ProductionLocations = new[] { val };
}
} }
break; break;
}
case "LockedFields": case "LockedFields":
{ {
var val = reader.ReadElementContentAsString(); var val = reader.ReadElementContentAsString();
@ -275,10 +216,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
{ {
if (!reader.IsEmptyElement) if (!reader.IsEmptyElement)
{ {
using (var subtree = reader.ReadSubtree()) reader.Skip();
{
FetchFromCountriesNode(subtree);
}
} }
else else
{ {
@ -290,183 +228,84 @@ namespace MediaBrowser.LocalMetadata.Parsers
case "ContentRating": case "ContentRating":
case "MPAARating": case "MPAARating":
{ item.OfficialRating = reader.ReadNormalizedString();
var rating = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(rating))
{
item.OfficialRating = rating;
}
break; break;
}
case "CustomRating": case "CustomRating":
{ item.CustomRating = reader.ReadNormalizedString();
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
item.CustomRating = val;
}
break; break;
}
case "RunningTime": case "RunningTime":
var runtimeText = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(runtimeText))
{ {
var text = reader.ReadElementContentAsString(); if (int.TryParse(runtimeText.AsSpan().LeftPart(' '), NumberStyles.Integer, CultureInfo.InvariantCulture, out var runtime))
if (!string.IsNullOrWhiteSpace(text))
{
if (int.TryParse(text.AsSpan().LeftPart(' '), NumberStyles.Integer, CultureInfo.InvariantCulture, out var runtime))
{ {
item.RunTimeTicks = TimeSpan.FromMinutes(runtime).Ticks; item.RunTimeTicks = TimeSpan.FromMinutes(runtime).Ticks;
} }
} }
break; break;
}
case "AspectRatio": case "AspectRatio":
var aspectRatio = reader.ReadNormalizedString();
if (!string.IsNullOrEmpty(aspectRatio) && item is IHasAspectRatio hasAspectRatio)
{ {
var val = reader.ReadElementContentAsString(); hasAspectRatio.AspectRatio = aspectRatio;
if (!string.IsNullOrWhiteSpace(val) && item is IHasAspectRatio hasAspectRatio)
{
hasAspectRatio.AspectRatio = val;
} }
break; break;
}
case "LockData": case "LockData":
{ item.IsLocked = string.Equals(reader.ReadElementContentAsString(), "true", StringComparison.OrdinalIgnoreCase);
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
item.IsLocked = string.Equals("true", val, StringComparison.OrdinalIgnoreCase);
}
break; break;
}
case "Network": case "Network":
foreach (var name in reader.GetStringArray())
{ {
foreach (var name in SplitNames(reader.ReadElementContentAsString()))
{
if (string.IsNullOrWhiteSpace(name))
{
continue;
}
item.AddStudio(name); item.AddStudio(name);
} }
break; break;
}
case "Director": case "Director":
foreach (var director in reader.GetPersonArray(PersonKind.Director))
{ {
foreach (var p in SplitNames(reader.ReadElementContentAsString()).Select(v => new PersonInfo { Name = v.Trim(), Type = PersonKind.Director })) itemResult.AddPerson(director);
{
if (string.IsNullOrWhiteSpace(p.Name))
{
continue;
}
itemResult.AddPerson(p);
} }
break; break;
}
case "Writer": case "Writer":
foreach (var writer in reader.GetPersonArray(PersonKind.Writer))
{ {
foreach (var p in SplitNames(reader.ReadElementContentAsString()).Select(v => new PersonInfo { Name = v.Trim(), Type = PersonKind.Writer })) itemResult.AddPerson(writer);
{
if (string.IsNullOrWhiteSpace(p.Name))
{
continue;
}
itemResult.AddPerson(p);
} }
break; break;
}
case "Actors": case "Actors":
foreach (var actor in reader.GetPersonArray(PersonKind.Actor))
{ {
var actors = reader.ReadInnerXml(); itemResult.AddPerson(actor);
if (actors.Contains('<', StringComparison.Ordinal))
{
// This is one of the mis-named "Actors" full nodes created by MB2
// Create a reader and pass it to the persons node processor
using var xmlReader = XmlReader.Create(new StringReader($"<Persons>{actors}</Persons>"));
FetchDataFromPersonsNode(xmlReader, itemResult);
}
else
{
// Old-style piped string
foreach (var p in SplitNames(actors).Select(v => new PersonInfo { Name = v.Trim(), Type = PersonKind.Actor }))
{
if (string.IsNullOrWhiteSpace(p.Name))
{
continue;
}
itemResult.AddPerson(p);
}
} }
break; break;
}
case "GuestStars": case "GuestStars":
foreach (var guestStar in reader.GetPersonArray(PersonKind.GuestStar))
{ {
foreach (var p in SplitNames(reader.ReadElementContentAsString()).Select(v => new PersonInfo { Name = v.Trim(), Type = PersonKind.GuestStar })) itemResult.AddPerson(guestStar);
{
if (string.IsNullOrWhiteSpace(p.Name))
{
continue;
}
itemResult.AddPerson(p);
} }
break; break;
}
case "Trailer": case "Trailer":
var trailer = reader.ReadNormalizedString();
if (!string.IsNullOrEmpty(trailer))
{ {
var val = reader.ReadElementContentAsString(); item.AddTrailerUrl(trailer);
if (!string.IsNullOrWhiteSpace(val))
{
item.AddTrailerUrl(val);
} }
break; break;
}
case "DisplayOrder": case "DisplayOrder":
var displayOrder = reader.ReadNormalizedString();
if (!string.IsNullOrEmpty(displayOrder) && item is IHasDisplayOrder hasDisplayOrder)
{ {
var val = reader.ReadElementContentAsString(); hasDisplayOrder.DisplayOrder = displayOrder;
if (item is IHasDisplayOrder hasDisplayOrder)
{
if (!string.IsNullOrWhiteSpace(val))
{
hasDisplayOrder.DisplayOrder = val;
}
} }
break; break;
}
case "Trailers": case "Trailers":
{ {
if (!reader.IsEmptyElement) if (!reader.IsEmptyElement)
@ -483,20 +322,12 @@ namespace MediaBrowser.LocalMetadata.Parsers
} }
case "ProductionYear": case "ProductionYear":
{ if (reader.TryReadInt(out var productionYear) && productionYear > 1850)
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
if (int.TryParse(val, out var productionYear) && productionYear > 1850)
{ {
item.ProductionYear = productionYear; item.ProductionYear = productionYear;
} }
}
break; break;
}
case "Rating": case "Rating":
case "IMDBrating": case "IMDBrating":
{ {
@ -517,40 +348,24 @@ namespace MediaBrowser.LocalMetadata.Parsers
case "BirthDate": case "BirthDate":
case "PremiereDate": case "PremiereDate":
case "FirstAired": case "FirstAired":
if (reader.TryReadDateTimeExact("yyyy-MM-dd", out var firstAired))
{ {
var firstAired = reader.ReadElementContentAsString(); item.PremiereDate = firstAired;
item.ProductionYear = firstAired.Year;
if (!string.IsNullOrWhiteSpace(firstAired))
{
if (DateTime.TryParseExact(firstAired, "yyyy-MM-dd", CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal | DateTimeStyles.AdjustToUniversal, out var airDate) && airDate.Year > 1850)
{
item.PremiereDate = airDate;
item.ProductionYear = airDate.Year;
}
} }
break; break;
}
case "DeathDate": case "DeathDate":
case "EndDate": case "EndDate":
if (reader.TryReadDateTimeExact("yyyy-MM-dd", out var endDate))
{ {
var firstAired = reader.ReadElementContentAsString(); item.EndDate = endDate;
if (!string.IsNullOrWhiteSpace(firstAired))
{
if (DateTime.TryParseExact(firstAired, "yyyy-MM-dd", CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal | DateTimeStyles.AdjustToUniversal, out var airDate) && airDate.Year > 1850)
{
item.EndDate = airDate;
}
} }
break; break;
}
case "CollectionNumber": case "CollectionNumber":
var tmdbCollection = reader.ReadElementContentAsString(); var tmdbCollection = reader.ReadNormalizedString();
if (!string.IsNullOrWhiteSpace(tmdbCollection)) if (!string.IsNullOrEmpty(tmdbCollection))
{ {
item.SetProviderId(MetadataProvider.TmdbCollection, tmdbCollection); item.SetProviderId(MetadataProvider.TmdbCollection, tmdbCollection);
} }
@ -753,41 +568,6 @@ namespace MediaBrowser.LocalMetadata.Parsers
item.Shares = list.ToArray(); item.Shares = list.ToArray();
} }
private void FetchFromCountriesNode(XmlReader reader)
{
reader.MoveToContent();
reader.Read();
// Loop through each element
while (!reader.EOF && reader.ReadState == ReadState.Interactive)
{
if (reader.NodeType == XmlNodeType.Element)
{
switch (reader.Name)
{
case "Country":
{
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
}
break;
}
default:
reader.Skip();
break;
}
}
else
{
reader.Read();
}
}
}
/// <summary> /// <summary>
/// Fetches from taglines node. /// Fetches from taglines node.
/// </summary> /// </summary>
@ -806,17 +586,8 @@ namespace MediaBrowser.LocalMetadata.Parsers
switch (reader.Name) switch (reader.Name)
{ {
case "Tagline": case "Tagline":
{ item.Tagline = reader.ReadNormalizedString();
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
item.Tagline = val;
}
break; break;
}
default: default:
reader.Skip(); reader.Skip();
break; break;
@ -847,17 +618,13 @@ namespace MediaBrowser.LocalMetadata.Parsers
switch (reader.Name) switch (reader.Name)
{ {
case "Genre": case "Genre":
{ var genre = reader.ReadNormalizedString();
var genre = reader.ReadElementContentAsString(); if (!string.IsNullOrEmpty(genre))
if (!string.IsNullOrWhiteSpace(genre))
{ {
item.AddGenre(genre); item.AddGenre(genre);
} }
break; break;
}
default: default:
reader.Skip(); reader.Skip();
break; break;
@ -885,17 +652,13 @@ namespace MediaBrowser.LocalMetadata.Parsers
switch (reader.Name) switch (reader.Name)
{ {
case "Tag": case "Tag":
{ var tag = reader.ReadNormalizedString();
var tag = reader.ReadElementContentAsString(); if (!string.IsNullOrEmpty(tag))
if (!string.IsNullOrWhiteSpace(tag))
{ {
tags.Add(tag); tags.Add(tag);
} }
break; break;
}
default: default:
reader.Skip(); reader.Skip();
break; break;
@ -929,29 +692,13 @@ namespace MediaBrowser.LocalMetadata.Parsers
{ {
case "Person": case "Person":
case "Actor": case "Actor":
var person = reader.GetPersonFromXmlNode();
if (person is not null)
{ {
if (reader.IsEmptyElement)
{
reader.Read();
continue;
}
using (var subtree = reader.ReadSubtree())
{
foreach (var person in GetPersonsFromXmlNode(subtree))
{
if (string.IsNullOrWhiteSpace(person.Name))
{
continue;
}
item.AddPerson(person); item.AddPerson(person);
} }
}
break; break;
}
default: default:
reader.Skip(); reader.Skip();
break; break;
@ -977,17 +724,13 @@ namespace MediaBrowser.LocalMetadata.Parsers
switch (reader.Name) switch (reader.Name)
{ {
case "Trailer": case "Trailer":
var trailer = reader.ReadNormalizedString();
if (!string.IsNullOrEmpty(trailer))
{ {
var val = reader.ReadElementContentAsString(); item.AddTrailerUrl(trailer);
if (!string.IsNullOrWhiteSpace(val))
{
item.AddTrailerUrl(val);
} }
break; break;
}
default: default:
reader.Skip(); reader.Skip();
break; break;
@ -1018,17 +761,13 @@ namespace MediaBrowser.LocalMetadata.Parsers
switch (reader.Name) switch (reader.Name)
{ {
case "Studio": case "Studio":
{ var studio = reader.ReadNormalizedString();
var studio = reader.ReadElementContentAsString(); if (!string.IsNullOrEmpty(studio))
if (!string.IsNullOrWhiteSpace(studio))
{ {
item.AddStudio(studio); item.AddStudio(studio);
} }
break; break;
}
default: default:
reader.Skip(); reader.Skip();
break; break;
@ -1041,83 +780,6 @@ namespace MediaBrowser.LocalMetadata.Parsers
} }
} }
/// <summary>
/// Gets the persons from XML node.
/// </summary>
/// <param name="reader">The reader.</param>
/// <returns>IEnumerable{PersonInfo}.</returns>
private IEnumerable<PersonInfo> GetPersonsFromXmlNode(XmlReader reader)
{
var name = string.Empty;
var type = PersonKind.Actor; // If type is not specified assume actor
var role = string.Empty;
int? sortOrder = null;
reader.MoveToContent();
reader.Read();
// Loop through each element
while (!reader.EOF && reader.ReadState == ReadState.Interactive)
{
if (reader.NodeType == XmlNodeType.Element)
{
switch (reader.Name)
{
case "Name":
name = reader.ReadElementContentAsString();
break;
case "Type":
{
var val = reader.ReadElementContentAsString();
_ = Enum.TryParse(val, true, out type);
break;
}
case "Role":
{
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
role = val;
}
break;
}
case "SortOrder":
{
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
if (int.TryParse(val, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intVal))
{
sortOrder = intVal;
}
}
break;
}
default:
reader.Skip();
break;
}
}
else
{
reader.Read();
}
}
var personInfo = new PersonInfo { Name = name.Trim(), Role = role, Type = type, SortOrder = sortOrder };
return new[] { personInfo };
}
/// <summary> /// <summary>
/// Get linked child. /// Get linked child.
/// </summary> /// </summary>
@ -1138,17 +800,11 @@ namespace MediaBrowser.LocalMetadata.Parsers
switch (reader.Name) switch (reader.Name)
{ {
case "Path": case "Path":
{ linkedItem.Path = reader.ReadNormalizedString();
linkedItem.Path = reader.ReadElementContentAsString();
break; break;
}
case "ItemId": case "ItemId":
{ linkedItem.LibraryItemId = reader.ReadNormalizedString();
linkedItem.LibraryItemId = reader.ReadElementContentAsString();
break; break;
}
default: default:
reader.Skip(); reader.Skip();
break; break;
@ -1189,24 +845,16 @@ namespace MediaBrowser.LocalMetadata.Parsers
switch (reader.Name) switch (reader.Name)
{ {
case "UserId": case "UserId":
{ item.UserId = reader.ReadNormalizedString();
item.UserId = reader.ReadElementContentAsString();
break; break;
}
case "CanEdit": case "CanEdit":
{
item.CanEdit = string.Equals(reader.ReadElementContentAsString(), "true", StringComparison.OrdinalIgnoreCase); item.CanEdit = string.Equals(reader.ReadElementContentAsString(), "true", StringComparison.OrdinalIgnoreCase);
break; break;
}
default: default:
{
reader.Skip(); reader.Skip();
break; break;
} }
} }
}
else else
{ {
reader.Read(); reader.Read();
@ -1221,34 +869,5 @@ namespace MediaBrowser.LocalMetadata.Parsers
return null; return null;
} }
/// <summary>
/// Used to split names of comma or pipe delimited genres and people.
/// </summary>
/// <param name="value">The value.</param>
/// <returns>IEnumerable{System.String}.</returns>
private IEnumerable<string> SplitNames(string value)
{
// Only split by comma if there is no pipe in the string
// We have to be careful to not split names like Matthew, Jr.
var separator = !value.Contains('|', StringComparison.Ordinal)
&& !value.Contains(';', StringComparison.Ordinal) ? new[] { ',' } : new[] { '|', ';' };
value = value.Trim().Trim(separator);
return string.IsNullOrWhiteSpace(value) ? Array.Empty<string>() : Split(value, separator, StringSplitOptions.RemoveEmptyEntries);
}
/// <summary>
/// Provides an additional overload for string.split.
/// </summary>
/// <param name="val">The val.</param>
/// <param name="separators">The separators.</param>
/// <param name="options">The options.</param>
/// <returns>System.String[][].</returns>
private string[] Split(string val, char[] separators, StringSplitOptions options)
{
return val.Split(separators, options);
}
} }
} }

9
MediaBrowser.LocalMetadata/Parsers/PlaylistXmlParser.cs
Unescape View File

@ -1,6 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Xml; using System.Xml;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Extensions;
using MediaBrowser.Controller.Playlists; using MediaBrowser.Controller.Playlists;
using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Providers;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -30,12 +31,8 @@ namespace MediaBrowser.LocalMetadata.Parsers
switch (reader.Name) switch (reader.Name)
{ {
case "PlaylistMediaType": case "PlaylistMediaType":
{ item.PlaylistMediaType = reader.ReadNormalizedString();
item.PlaylistMediaType = reader.ReadElementContentAsString();
break; break;
}
case "PlaylistItems": case "PlaylistItems":
if (!reader.IsEmptyElement) if (!reader.IsEmptyElement)
@ -94,12 +91,10 @@ namespace MediaBrowser.LocalMetadata.Parsers
} }
default: default:
{
reader.Skip(); reader.Skip();
break; break;
} }
} }
}
else else
{ {
reader.Read(); reader.Read();

649
MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
Unescape View File

@ -13,6 +13,7 @@ using MediaBrowser.Common.Providers;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Extensions;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
@ -261,158 +262,84 @@ namespace MediaBrowser.XbmcMetadata.Parsers
protected virtual void FetchDataFromXmlNode(XmlReader reader, MetadataResult<T> itemResult) protected virtual void FetchDataFromXmlNode(XmlReader reader, MetadataResult<T> itemResult)
{ {
var item = itemResult.Item; var item = itemResult.Item;
var nfoConfiguration = _config.GetNfoConfiguration(); var nfoConfiguration = _config.GetNfoConfiguration();
UserItemData? userData = null; UserItemData? userData;
switch (reader.Name) switch (reader.Name)
{ {
// DateCreated
case "dateadded": case "dateadded":
if (reader.TryReadDateTime(out var dateCreated))
{ {
var val = reader.ReadElementContentAsString(); item.DateCreated = dateCreated;
if (DateTime.TryParse(val, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal, out var added))
{
item.DateCreated = added;
}
else
{
Logger.LogWarning("Invalid Added value found: {Value}", val);
} }
break; break;
}
case "originaltitle": case "originaltitle":
{ item.OriginalTitle = reader.ReadNormalizedString();
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrEmpty(val))
{
item.OriginalTitle = val;
}
break; break;
}
case "name": case "name":
case "title": case "title":
case "localtitle": case "localtitle":
item.Name = reader.ReadElementContentAsString(); item.Name = reader.ReadNormalizedString();
break; break;
case "sortname": case "sortname":
item.SortName = reader.ReadElementContentAsString(); item.SortName = reader.ReadNormalizedString();
break; break;
case "criticrating": case "criticrating":
{ var criticRatingText = reader.ReadElementContentAsString();
var text = reader.ReadElementContentAsString(); if (float.TryParse(criticRatingText, CultureInfo.InvariantCulture, out var value))
if (float.TryParse(text, CultureInfo.InvariantCulture, out var value))
{ {
item.CriticRating = value; item.CriticRating = value;
} }
break; break;
}
case "sorttitle": case "sorttitle":
{ item.ForcedSortName = reader.ReadNormalizedString();
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
item.ForcedSortName = val;
}
break; break;
}
case "biography": case "biography":
case "plot": case "plot":
case "review": case "review":
{ item.Overview = reader.ReadNormalizedString();
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
item.Overview = val;
}
break; break;
}
case "language": case "language":
{ item.PreferredMetadataLanguage = reader.ReadNormalizedString();
var val = reader.ReadElementContentAsString();
item.PreferredMetadataLanguage = val;
break; break;
}
case "watched": case "watched":
{ var played = reader.ReadElementContentAsBoolean();
var val = reader.ReadElementContentAsBoolean();
if (!string.IsNullOrWhiteSpace(nfoConfiguration.UserId)) if (!string.IsNullOrWhiteSpace(nfoConfiguration.UserId))
{ {
var user = _userManager.GetUserById(Guid.Parse(nfoConfiguration.UserId)); var user = _userManager.GetUserById(Guid.Parse(nfoConfiguration.UserId));
userData = _userDataManager.GetUserData(user, item); userData = _userDataManager.GetUserData(user, item);
userData.Played = val; userData.Played = played;
_userDataManager.SaveUserData(user, item, userData, UserDataSaveReason.Import, CancellationToken.None); _userDataManager.SaveUserData(user, item, userData, UserDataSaveReason.Import, CancellationToken.None);
} }
break; break;
}
case "playcount": case "playcount":
if (reader.TryReadInt(out var count)
&& Guid.TryParse(nfoConfiguration.UserId, out var playCountUserId))
{ {
var val = reader.ReadElementContentAsString(); var user = _userManager.GetUserById(playCountUserId);
if (int.TryParse(val, NumberStyles.Integer, CultureInfo.InvariantCulture, out var count)
&& Guid.TryParse(nfoConfiguration.UserId, out var guid))
{
var user = _userManager.GetUserById(guid);
userData = _userDataManager.GetUserData(user, item); userData = _userDataManager.GetUserData(user, item);
userData.PlayCount = count; userData.PlayCount = count;
_userDataManager.SaveUserData(user, item, userData, UserDataSaveReason.Import, CancellationToken.None); _userDataManager.SaveUserData(user, item, userData, UserDataSaveReason.Import, CancellationToken.None);
} }
break; break;
}
case "lastplayed": case "lastplayed":
if (reader.TryReadDateTime(out var lastPlayed)
&& Guid.TryParse(nfoConfiguration.UserId, out var lastPlayedUserId))
{ {
var val = reader.ReadElementContentAsString(); var user = _userManager.GetUserById(lastPlayedUserId);
if (Guid.TryParse(nfoConfiguration.UserId, out var guid))
{
if (DateTime.TryParse(val, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal, out var added))
{
var user = _userManager.GetUserById(guid);
userData = _userDataManager.GetUserData(user, item); userData = _userDataManager.GetUserData(user, item);
userData.LastPlayedDate = added; userData.LastPlayedDate = lastPlayed;
_userDataManager.SaveUserData(user, item, userData, UserDataSaveReason.Import, CancellationToken.None); _userDataManager.SaveUserData(user, item, userData, UserDataSaveReason.Import, CancellationToken.None);
} }
else
{
Logger.LogWarning("Invalid lastplayed value found: {Value}", val);
}
}
break; break;
}
case "countrycode": case "countrycode":
{ item.PreferredMetadataCountryCode = reader.ReadNormalizedString();
var val = reader.ReadElementContentAsString();
item.PreferredMetadataCountryCode = val;
break; break;
}
case "lockedfields": case "lockedfields":
{ {
var val = reader.ReadElementContentAsString(); var val = reader.ReadElementContentAsString();
@ -434,9 +361,8 @@ namespace MediaBrowser.XbmcMetadata.Parsers
} }
case "tagline": case "tagline":
item.Tagline = reader.ReadElementContentAsString(); item.Tagline = reader.ReadNormalizedString();
break; break;
case "country": case "country":
{ {
var val = reader.ReadElementContentAsString(); var val = reader.ReadElementContentAsString();
@ -453,94 +379,45 @@ namespace MediaBrowser.XbmcMetadata.Parsers
} }
case "mpaa": case "mpaa":
{ item.OfficialRating = reader.ReadNormalizedString();
var rating = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(rating))
{
item.OfficialRating = rating;
}
break; break;
}
case "customrating": case "customrating":
{ item.CustomRating = reader.ReadNormalizedString();
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
item.CustomRating = val;
}
break; break;
}
case "runtime": case "runtime":
{ var runtimeText = reader.ReadElementContentAsString();
var text = reader.ReadElementContentAsString(); if (int.TryParse(runtimeText.AsSpan().LeftPart(' '), NumberStyles.Integer, CultureInfo.InvariantCulture, out var runtime))
if (int.TryParse(text.AsSpan().LeftPart(' '), NumberStyles.Integer, CultureInfo.InvariantCulture, out var runtime))
{ {
item.RunTimeTicks = TimeSpan.FromMinutes(runtime).Ticks; item.RunTimeTicks = TimeSpan.FromMinutes(runtime).Ticks;
} }
break; break;
}
case "aspectratio": case "aspectratio":
var aspectRatio = reader.ReadNormalizedString();
if (!string.IsNullOrEmpty(aspectRatio) && item is IHasAspectRatio hasAspectRatio)
{ {
var val = reader.ReadElementContentAsString(); hasAspectRatio.AspectRatio = aspectRatio;
if (!string.IsNullOrWhiteSpace(val)
&& item is IHasAspectRatio hasAspectRatio)
{
hasAspectRatio.AspectRatio = val;
} }
break; break;
}
case "lockdata": case "lockdata":
{ item.IsLocked = string.Equals(reader.ReadElementContentAsString(), "true", StringComparison.OrdinalIgnoreCase);
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
item.IsLocked = string.Equals("true", val, StringComparison.OrdinalIgnoreCase);
}
break; break;
}
case "studio": case "studio":
var studio = reader.ReadNormalizedString();
if (!string.IsNullOrEmpty(studio))
{ {
var val = reader.ReadElementContentAsString(); item.AddStudio(studio);
if (!string.IsNullOrWhiteSpace(val))
{
item.AddStudio(val);
} }
break; break;
}
case "director": case "director":
foreach (var director in reader.GetPersonArray(PersonKind.Director))
{ {
var val = reader.ReadElementContentAsString(); itemResult.AddPerson(director);
foreach (var p in SplitNames(val).Select(v => new PersonInfo { Name = v.Trim(), Type = PersonKind.Director }))
{
if (string.IsNullOrWhiteSpace(p.Name))
{
continue;
}
itemResult.AddPerson(p);
} }
break; break;
}
case "credits": case "credits":
{ {
var val = reader.ReadElementContentAsString(); var val = reader.ReadElementContentAsString();
@ -565,141 +442,76 @@ namespace MediaBrowser.XbmcMetadata.Parsers
} }
case "writer": case "writer":
foreach (var writer in reader.GetPersonArray(PersonKind.Writer))
{ {
var val = reader.ReadElementContentAsString(); itemResult.AddPerson(writer);
foreach (var p in SplitNames(val).Select(v => new PersonInfo { Name = v.Trim(), Type = PersonKind.Writer }))
{
if (string.IsNullOrWhiteSpace(p.Name))
{
continue;
}
itemResult.AddPerson(p);
} }
break; break;
}
case "actor": case "actor":
{ var person = reader.GetPersonFromXmlNode();
if (!reader.IsEmptyElement) if (person is not null)
{
using (var subtree = reader.ReadSubtree())
{
var person = GetPersonFromXmlNode(subtree);
if (!string.IsNullOrWhiteSpace(person.Name))
{ {
itemResult.AddPerson(person); itemResult.AddPerson(person);
} }
}
}
else
{
reader.Read();
}
break; break;
}
case "trailer": case "trailer":
var trailer = reader.ReadNormalizedString();
if (!string.IsNullOrEmpty(trailer))
{ {
var val = reader.ReadElementContentAsString(); item.AddTrailerUrl(trailer.Replace(
"plugin://plugin.video.youtube/?action=play_video&videoid=",
if (!string.IsNullOrWhiteSpace(val)) BaseNfoSaver.YouTubeWatchUrl,
{ StringComparison.OrdinalIgnoreCase));
val = val.Replace("plugin://plugin.video.youtube/?action=play_video&videoid=", BaseNfoSaver.YouTubeWatchUrl, StringComparison.OrdinalIgnoreCase);
item.AddTrailerUrl(val);
} }
break; break;
}
case "displayorder": case "displayorder":
var displayOrder = reader.ReadNormalizedString();
if (!string.IsNullOrEmpty(displayOrder) && item is IHasDisplayOrder hasDisplayOrder)
{ {
var val = reader.ReadElementContentAsString(); hasDisplayOrder.DisplayOrder = displayOrder;
if (item is IHasDisplayOrder hasDisplayOrder && !string.IsNullOrWhiteSpace(val))
{
hasDisplayOrder.DisplayOrder = val;
} }
break; break;
}
case "year": case "year":
{ if (reader.TryReadInt(out var productionYear) && productionYear > 1850)
var val = reader.ReadElementContentAsString();
if (int.TryParse(val, out var productionYear) && productionYear > 1850)
{ {
item.ProductionYear = productionYear; item.ProductionYear = productionYear;
} }
break; break;
}
case "rating": case "rating":
{ var rating = reader.ReadElementContentAsString().Replace(',', '.');
var rating = reader.ReadElementContentAsString();
// All external meta is saving this as '.' for decimal I believe...but just to be sure // All external meta is saving this as '.' for decimal I believe...but just to be sure
if (float.TryParse(rating.Replace(',', '.'), NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var val)) if (float.TryParse(rating, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out var communityRating))
{ {
item.CommunityRating = val; item.CommunityRating = communityRating;
} }
break; break;
}
case "ratings": case "ratings":
{ FetchFromRatingsNode(reader, item);
if (!reader.IsEmptyElement)
{
using var subtree = reader.ReadSubtree();
FetchFromRatingsNode(subtree, item);
}
else
{
reader.Read();
}
break; break;
}
case "aired": case "aired":
case "formed": case "formed":
case "premiered": case "premiered":
case "releasedate": case "releasedate":
if (reader.TryReadDateTimeExact(nfoConfiguration.ReleaseDateFormat, out var releaseDate))
{ {
var formatString = nfoConfiguration.ReleaseDateFormat; item.PremiereDate = releaseDate;
item.ProductionYear = releaseDate.Year;
var val = reader.ReadElementContentAsString();
if (DateTime.TryParseExact(val, formatString, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal, out var date) && date.Year > 1850)
{
item.PremiereDate = date;
item.ProductionYear = date.Year;
} }
break; break;
}
case "enddate": case "enddate":
if (reader.TryReadDateTimeExact(nfoConfiguration.ReleaseDateFormat, out var endDate))
{ {
var formatString = nfoConfiguration.ReleaseDateFormat; item.EndDate = endDate;
var val = reader.ReadElementContentAsString();
if (DateTime.TryParseExact(val, formatString, CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal, out var date) && date.Year > 1850)
{
item.EndDate = date;
} }
break; break;
}
case "genre": case "genre":
{ {
var val = reader.ReadElementContentAsString(); var val = reader.ReadElementContentAsString();
@ -721,35 +533,17 @@ namespace MediaBrowser.XbmcMetadata.Parsers
case "style": case "style":
case "tag": case "tag":
var tag = reader.ReadNormalizedString();
if (!string.IsNullOrEmpty(tag))
{ {
var val = reader.ReadElementContentAsString(); item.AddTag(tag);
if (!string.IsNullOrWhiteSpace(val))
{
item.AddTag(val);
} }
break; break;
}
case "fileinfo": case "fileinfo":
{ FetchFromFileInfoNode(reader, item);
if (!reader.IsEmptyElement)
{
using (var subtree = reader.ReadSubtree())
{
FetchFromFileInfoNode(subtree, item);
}
}
else
{
reader.Read();
}
break; break;
}
case "uniqueid": case "uniqueid":
{
if (reader.IsEmptyElement) if (reader.IsEmptyElement)
{ {
reader.Read(); reader.Read();
@ -757,21 +551,16 @@ namespace MediaBrowser.XbmcMetadata.Parsers
} }
var provider = reader.GetAttribute("type"); var provider = reader.GetAttribute("type");
var id = reader.ReadElementContentAsString(); var providerId = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(provider) && !string.IsNullOrWhiteSpace(id)) if (!string.IsNullOrWhiteSpace(provider) && !string.IsNullOrWhiteSpace(providerId))
{ {
item.SetProviderId(provider, id); item.SetProviderId(provider, providerId);
} }
break; break;
}
case "thumb": case "thumb":
{
FetchThumbNode(reader, itemResult, "thumb"); FetchThumbNode(reader, itemResult, "thumb");
break; break;
}
case "fanart": case "fanart":
{ {
if (reader.IsEmptyElement) if (reader.IsEmptyElement)
@ -876,217 +665,162 @@ namespace MediaBrowser.XbmcMetadata.Parsers
} }
} }
private void FetchFromFileInfoNode(XmlReader reader, T item) private void FetchFromFileInfoNode(XmlReader parentReader, T item)
{
if (parentReader.IsEmptyElement)
{ {
parentReader.Read();
return;
}
using var reader = parentReader.ReadSubtree();
reader.MoveToContent(); reader.MoveToContent();
reader.Read(); reader.Read();
// Loop through each element // Loop through each element
while (!reader.EOF && reader.ReadState == ReadState.Interactive) while (!reader.EOF && reader.ReadState == ReadState.Interactive)
{ {
if (reader.NodeType == XmlNodeType.Element) if (reader.NodeType != XmlNodeType.Element)
{
switch (reader.Name)
{
case "streamdetails":
{
if (reader.IsEmptyElement)
{ {
reader.Read(); reader.Read();
continue; continue;
} }
using (var subtree = reader.ReadSubtree()) switch (reader.Name)
{ {
FetchFromStreamDetailsNode(subtree, item); case "streamdetails":
} FetchFromStreamDetailsNode(reader, item);
break; break;
}
default: default:
reader.Skip(); reader.Skip();
break; break;
} }
} }
else
{
reader.Read();
}
}
} }
private void FetchFromStreamDetailsNode(XmlReader reader, T item) private void FetchFromStreamDetailsNode(XmlReader parentReader, T item)
{
if (parentReader.IsEmptyElement)
{ {
parentReader.Read();
return;
}
using var reader = parentReader.ReadSubtree();
reader.MoveToContent(); reader.MoveToContent();
reader.Read(); reader.Read();
// Loop through each element // Loop through each element
while (!reader.EOF && reader.ReadState == ReadState.Interactive) while (!reader.EOF && reader.ReadState == ReadState.Interactive)
{ {
if (reader.NodeType == XmlNodeType.Element) if (reader.NodeType != XmlNodeType.Element)
{
switch (reader.Name)
{
case "video":
{
if (reader.IsEmptyElement)
{ {
reader.Read(); reader.Read();
continue; continue;
} }
using (var subtree = reader.ReadSubtree()) switch (reader.Name)
{ {
FetchFromVideoNode(subtree, item); case "video":
} FetchFromVideoNode(reader, item);
break; break;
}
case "subtitle": case "subtitle":
{ FetchFromSubtitleNode(reader, item);
if (reader.IsEmptyElement)
{
reader.Read();
continue;
}
using (var subtree = reader.ReadSubtree())
{
FetchFromSubtitleNode(subtree, item);
}
break; break;
}
default: default:
reader.Skip(); reader.Skip();
break; break;
} }
} }
else
{
reader.Read();
}
}
} }
private void FetchFromVideoNode(XmlReader reader, T item) private void FetchFromVideoNode(XmlReader parentReader, T item)
{ {
if (parentReader.IsEmptyElement)
{
parentReader.Read();
return;
}
using var reader = parentReader.ReadSubtree();
reader.MoveToContent(); reader.MoveToContent();
reader.Read(); reader.Read();
// Loop through each element // Loop through each element
while (!reader.EOF && reader.ReadState == ReadState.Interactive) while (!reader.EOF && reader.ReadState == ReadState.Interactive)
{ {
if (reader.NodeType == XmlNodeType.Element) if (reader.NodeType != XmlNodeType.Element || item is not Video video)
{ {
reader.Read();
continue;
}
switch (reader.Name) switch (reader.Name)
{ {
case "format3d": case "format3d":
{ var format = reader.ReadElementContentAsString();
var val = reader.ReadElementContentAsString(); if (string.Equals("HSBS", format, StringComparison.OrdinalIgnoreCase))
var video = item as Video;
if (video is not null)
{
if (string.Equals("HSBS", val, StringComparison.OrdinalIgnoreCase))
{ {
video.Video3DFormat = Video3DFormat.HalfSideBySide; video.Video3DFormat = Video3DFormat.HalfSideBySide;
} }
else if (string.Equals("HTAB", val, StringComparison.OrdinalIgnoreCase)) else if (string.Equals("HTAB", format, StringComparison.OrdinalIgnoreCase))
{ {
video.Video3DFormat = Video3DFormat.HalfTopAndBottom; video.Video3DFormat = Video3DFormat.HalfTopAndBottom;
} }
else if (string.Equals("FTAB", val, StringComparison.OrdinalIgnoreCase)) else if (string.Equals("FTAB", format, StringComparison.OrdinalIgnoreCase))
{ {
video.Video3DFormat = Video3DFormat.FullTopAndBottom; video.Video3DFormat = Video3DFormat.FullTopAndBottom;
} }
else if (string.Equals("FSBS", val, StringComparison.OrdinalIgnoreCase)) else if (string.Equals("FSBS", format, StringComparison.OrdinalIgnoreCase))
{ {
video.Video3DFormat = Video3DFormat.FullSideBySide; video.Video3DFormat = Video3DFormat.FullSideBySide;
} }
else if (string.Equals("MVC", val, StringComparison.OrdinalIgnoreCase)) else if (string.Equals("MVC", format, StringComparison.OrdinalIgnoreCase))
{ {
video.Video3DFormat = Video3DFormat.MVC; video.Video3DFormat = Video3DFormat.MVC;
} }
}
break; break;
}
case "aspect": case "aspect":
{ video.AspectRatio = reader.ReadNormalizedString();
var val = reader.ReadElementContentAsString();
if (item is Video video)
{
video.AspectRatio = val;
}
break; break;
}
case "width": case "width":
{ video.Width = reader.ReadElementContentAsInt();
var val = reader.ReadElementContentAsInt();
if (item is Video video)
{
video.Width = val;
}
break; break;
}
case "height": case "height":
{ video.Height = reader.ReadElementContentAsInt();
var val = reader.ReadElementContentAsInt();
if (item is Video video)
{
video.Height = val;
}
break; break;
}
case "durationinseconds": case "durationinseconds":
{ video.RunTimeTicks = new TimeSpan(0, 0, reader.ReadElementContentAsInt()).Ticks;
var val = reader.ReadElementContentAsInt();
if (item is Video video)
{
video.RunTimeTicks = new TimeSpan(0, 0, val).Ticks;
}
break; break;
}
default: default:
reader.Skip(); reader.Skip();
break; break;
} }
} }
else
{
reader.Read();
}
}
} }
private void FetchFromSubtitleNode(XmlReader reader, T item) private void FetchFromSubtitleNode(XmlReader parentReader, T item)
{ {
if (parentReader.IsEmptyElement)
{
parentReader.Read();
return;
}
using var reader = parentReader.ReadSubtree();
reader.MoveToContent(); reader.MoveToContent();
reader.Read(); reader.Read();
// Loop through each element // Loop through each element
while (!reader.EOF && reader.ReadState == ReadState.Interactive) while (!reader.EOF && reader.ReadState == ReadState.Interactive)
{ {
if (reader.NodeType == XmlNodeType.Element) if (reader.NodeType != XmlNodeType.Element)
{ {
reader.Read();
continue;
}
switch (reader.Name) switch (reader.Name)
{ {
case "language": case "language":
@ -1097,21 +831,22 @@ namespace MediaBrowser.XbmcMetadata.Parsers
} }
break; break;
default: default:
reader.Skip(); reader.Skip();
break; break;
} }
} }
else
{
reader.Read();
}
}
} }
private void FetchFromRatingsNode(XmlReader reader, T item) private void FetchFromRatingsNode(XmlReader parentReader, T item)
{
if (parentReader.IsEmptyElement)
{ {
parentReader.Read();
return;
}
using var reader = parentReader.ReadSubtree();
reader.MoveToContent(); reader.MoveToContent();
reader.Read(); reader.Read();
@ -1196,102 +931,6 @@ namespace MediaBrowser.XbmcMetadata.Parsers
} }
} }
/// <summary>
/// Gets the persons from a XML node.
/// </summary>
/// <param name="reader">The <see cref="XmlReader"/>.</param>
/// <returns>IEnumerable{PersonInfo}.</returns>
private PersonInfo GetPersonFromXmlNode(XmlReader reader)
{
var name = string.Empty;
var type = PersonKind.Actor; // If type is not specified assume actor
var role = string.Empty;
int? sortOrder = null;
string? imageUrl = null;
reader.MoveToContent();
reader.Read();
// Loop through each element
while (!reader.EOF && reader.ReadState == ReadState.Interactive)
{
if (reader.NodeType == XmlNodeType.Element)
{
switch (reader.Name)
{
case "name":
name = reader.ReadElementContentAsString();
break;
case "role":
{
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
role = val;
}
break;
}
case "type":
{
var val = reader.ReadElementContentAsString();
if (!Enum.TryParse(val, true, out type))
{
type = PersonKind.Actor;
}
break;
}
case "order":
case "sortorder":
{
var val = reader.ReadElementContentAsString();
if (int.TryParse(val, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intVal))
{
sortOrder = intVal;
}
break;
}
case "thumb":
{
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
imageUrl = val;
}
break;
}
default:
reader.Skip();
break;
}
}
else
{
reader.Read();
}
}
return new PersonInfo
{
Name = name.Trim(),
Role = role,
Type = type,
SortOrder = sortOrder,
ImageUrl = imageUrl
};
}
internal XmlReaderSettings GetXmlReaderSettings() internal XmlReaderSettings GetXmlReaderSettings()
=> new XmlReaderSettings() => new XmlReaderSettings()
{ {
@ -1301,24 +940,6 @@ namespace MediaBrowser.XbmcMetadata.Parsers
IgnoreComments = true IgnoreComments = true
}; };
/// <summary>
/// Used to split names of comma or pipe delimited genres and people.
/// </summary>
/// <param name="value">The value.</param>
/// <returns>IEnumerable{System.String}.</returns>
private IEnumerable<string> SplitNames(string value)
{
// Only split by comma if there is no pipe in the string
// We have to be careful to not split names like Matthew, Jr.
var separator = !value.Contains('|', StringComparison.Ordinal) && !value.Contains(';', StringComparison.Ordinal)
? new[] { ',' }
: new[] { '|', ';' };
value = value.Trim().Trim(separator);
return string.IsNullOrWhiteSpace(value) ? Array.Empty<string>() : value.Split(separator, StringSplitOptions.RemoveEmptyEntries);
}
/// <summary> /// <summary>
/// Parses the <see cref="ImageType"/> from the NFO aspect property. /// Parses the <see cref="ImageType"/> from the NFO aspect property.
/// </summary> /// </summary>

122
MediaBrowser.XbmcMetadata/Parsers/EpisodeNfoParser.cs
Unescape View File

@ -1,11 +1,11 @@
using System; using System;
using System.Globalization;
using System.IO; using System.IO;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Xml; using System.Xml;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Extensions;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Providers;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -148,143 +148,53 @@ namespace MediaBrowser.XbmcMetadata.Parsers
switch (reader.Name) switch (reader.Name)
{ {
case "season": case "season":
if (reader.TryReadInt(out var seasonNumber))
{ {
var number = reader.ReadElementContentAsString(); item.ParentIndexNumber = seasonNumber;
if (!string.IsNullOrWhiteSpace(number))
{
if (int.TryParse(number, out var num))
{
item.ParentIndexNumber = num;
}
} }
break; break;
}
case "episode": case "episode":
if (reader.TryReadInt(out var episodeNumber))
{ {
var number = reader.ReadElementContentAsString(); item.IndexNumber = episodeNumber;
if (!string.IsNullOrWhiteSpace(number))
{
if (int.TryParse(number, out var num))
{
item.IndexNumber = num;
}
} }
break; break;
}
case "episodenumberend": case "episodenumberend":
if (reader.TryReadInt(out var episodeNumberEnd))
{ {
var number = reader.ReadElementContentAsString(); item.IndexNumberEnd = episodeNumberEnd;
if (!string.IsNullOrWhiteSpace(number))
{
if (int.TryParse(number, out var num))
{
item.IndexNumberEnd = num;
}
} }
break; break;
}
case "airsbefore_episode": case "airsbefore_episode":
case "displayepisode":
if (reader.TryReadInt(out var airsBeforeEpisode))
{ {
var val = reader.ReadElementContentAsString(); item.AirsBeforeEpisodeNumber = airsBeforeEpisode;
if (!string.IsNullOrWhiteSpace(val))
{
// int.TryParse is local aware, so it can be problematic, force us culture
if (int.TryParse(val, NumberStyles.Integer, CultureInfo.InvariantCulture, out var rval))
{
item.AirsBeforeEpisodeNumber = rval;
}
} }
break; break;
}
case "displayafterseason":
case "airsafter_season": case "airsafter_season":
case "displayafterseason":
if (reader.TryReadInt(out var airsAfterSeason))
{ {
var val = reader.ReadElementContentAsString(); item.AirsAfterSeasonNumber = airsAfterSeason;
if (!string.IsNullOrWhiteSpace(val))
{
// int.TryParse is local aware, so it can be problematic, force us culture
if (int.TryParse(val, NumberStyles.Integer, CultureInfo.InvariantCulture, out var rval))
{
item.AirsAfterSeasonNumber = rval;
}
} }
break; break;
}
case "airsbefore_season": case "airsbefore_season":
{
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
// int.TryParse is local aware, so it can be problematic, force us culture
if (int.TryParse(val, NumberStyles.Integer, CultureInfo.InvariantCulture, out var rval))
{
item.AirsBeforeSeasonNumber = rval;
}
}
break;
}
case "displayseason": case "displayseason":
if (reader.TryReadInt(out var airsBeforeSeason))
{ {
var val = reader.ReadElementContentAsString(); item.AirsBeforeSeasonNumber = airsBeforeSeason;
if (!string.IsNullOrWhiteSpace(val))
{
// int.TryParse is local aware, so it can be problematic, force us culture
if (int.TryParse(val, NumberStyles.Integer, CultureInfo.InvariantCulture, out var rval))
{
item.AirsBeforeSeasonNumber = rval;
}
} }
break; break;
}
case "displayepisode":
{
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
// int.TryParse is local aware, so it can be problematic, force us culture
if (int.TryParse(val, NumberStyles.Integer, CultureInfo.InvariantCulture, out var rval))
{
item.AirsBeforeEpisodeNumber = rval;
}
}
break;
}
case "showtitle": case "showtitle":
{ item.SeriesName = reader.ReadNormalizedString();
var showtitle = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(showtitle))
{
item.SeriesName = showtitle;
}
break; break;
}
default: default:
base.FetchDataFromXmlNode(reader, itemResult); base.FetchDataFromXmlNode(reader, itemResult);
break; break;

25
MediaBrowser.XbmcMetadata/Parsers/MovieNfoParser.cs
Unescape View File

@ -5,6 +5,7 @@ using System.Xml;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Extensions;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
@ -113,31 +114,23 @@ namespace MediaBrowser.XbmcMetadata.Parsers
} }
case "artist": case "artist":
var artist = reader.ReadNormalizedString();
if (!string.IsNullOrEmpty(artist) && item is MusicVideo artistVideo)
{ {
var val = reader.ReadElementContentAsString(); var list = artistVideo.Artists.ToList();
list.Add(artist);
if (!string.IsNullOrWhiteSpace(val) && item is MusicVideo movie) artistVideo.Artists = list.ToArray();
{
var list = movie.Artists.ToList();
list.Add(val);
movie.Artists = list.ToArray();
} }
break; break;
}
case "album": case "album":
var album = reader.ReadNormalizedString();
if (!string.IsNullOrEmpty(album) && item is MusicVideo albumVideo)
{ {
var val = reader.ReadElementContentAsString(); albumVideo.Album = album;
if (!string.IsNullOrWhiteSpace(val) && item is MusicVideo movie)
{
movie.Album = val;
} }
break; break;
}
default: default:
base.FetchDataFromXmlNode(reader, itemResult); base.FetchDataFromXmlNode(reader, itemResult);
break; break;

25
MediaBrowser.XbmcMetadata/Parsers/SeasonNfoParser.cs
Unescape View File

@ -1,7 +1,7 @@
using System.Globalization;
using System.Xml; using System.Xml;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Extensions;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Providers;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -41,32 +41,15 @@ namespace MediaBrowser.XbmcMetadata.Parsers
switch (reader.Name) switch (reader.Name)
{ {
case "seasonnumber": case "seasonnumber":
if (reader.TryReadInt(out var seasonNumber))
{ {
var number = reader.ReadElementContentAsString(); item.IndexNumber = seasonNumber;
if (!string.IsNullOrWhiteSpace(number))
{
if (int.TryParse(number, NumberStyles.Integer, CultureInfo.InvariantCulture, out var num))
{
item.IndexNumber = num;
}
} }
break; break;
}
case "seasonname": case "seasonname":
{ item.Name = reader.ReadNormalizedString();
var name = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(name))
{
item.Name = name;
}
break; break;
}
default: default:
base.FetchDataFromXmlNode(reader, itemResult); base.FetchDataFromXmlNode(reader, itemResult);
break; break;

16
MediaBrowser.XbmcMetadata/Parsers/SeriesNfoParser.cs
Unescape View File

@ -1,9 +1,9 @@
using System; using System;
using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Xml; using System.Xml;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Extensions;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers; using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
@ -76,23 +76,11 @@ namespace MediaBrowser.XbmcMetadata.Parsers
} }
case "airs_dayofweek": case "airs_dayofweek":
{
item.AirDays = TVUtils.GetAirDays(reader.ReadElementContentAsString()); item.AirDays = TVUtils.GetAirDays(reader.ReadElementContentAsString());
break; break;
}
case "airs_time": case "airs_time":
{ item.AirTime = reader.ReadNormalizedString();
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
item.AirTime = val;
}
break; break;
}
case "status": case "status":
{ {
var status = reader.ReadElementContentAsString(); var status = reader.ReadElementContentAsString();

Write Preview
Loading…
Cancel
Save