starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 22:13:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update to 3.5.2 and .net core 2.1

Browse Source
This commit is contained in:
stefan
2018-09-12 19:26:21 +02:00
parent c32d865638
commit 48facb797e
1419 changed files with 27525 additions and 88927 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
View File

@@ -253,18 +253,6 @@ namespace MediaBrowser.LocalMetadata.Parsers
break;
}
case "Website":
{
var val = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(val))
{
item.HomePageUrl = val;
}
break;
}
case "LockedFields":
{
var val = reader.ReadElementContentAsString();
@@ -462,13 +450,9 @@ namespace MediaBrowser.LocalMetadata.Parsers
{
var val = reader.ReadElementContentAsString();
var hasTrailers = item as IHasTrailers;
if (hasTrailers != null)
if (!string.IsNullOrWhiteSpace(val))
{
if (!string.IsNullOrWhiteSpace(val))
{
hasTrailers.AddTrailerUrl(val);
}
item.AddTrailerUrl(val);
}
break;
}
@@ -494,11 +478,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
{
using (var subtree = reader.ReadSubtree())
{
var hasTrailers = item as IHasTrailers;
if (hasTrailers != null)
{
FetchDataFromTrailersNode(subtree, hasTrailers);
}
FetchDataFromTrailersNode(subtree, item);
}
}
else
@@ -726,9 +706,10 @@ namespace MediaBrowser.LocalMetadata.Parsers
}
}
}
private void FetchFromSharesNode(XmlReader reader, IHasShares item)
{
var list = new List<Share>();
reader.MoveToContent();
reader.Read();
@@ -746,20 +727,24 @@ namespace MediaBrowser.LocalMetadata.Parsers
reader.Read();
continue;
}
using (var subtree = reader.ReadSubtree())
using (var subReader = reader.ReadSubtree())
{
var share = GetShareFromNode(subtree);
if (share != null)
var child = GetShare(subReader);
if (child != null)
{
item.Shares.Add(share);
list.Add(child);
}
}
break;
}
default:
reader.Skip();
break;
{
reader.Skip();
break;
}
}
}
else
@@ -767,6 +752,8 @@ namespace MediaBrowser.LocalMetadata.Parsers
reader.Read();
}
}
item.Shares = list.ToArray();
}
private Share GetShareFromNode(XmlReader reader)
@@ -1012,7 +999,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
}
}
private void FetchDataFromTrailersNode(XmlReader reader, IHasTrailers item)
private void FetchDataFromTrailersNode(XmlReader reader, T item)
{
reader.MoveToContent();
reader.Read();
@@ -1193,6 +1180,11 @@ namespace MediaBrowser.LocalMetadata.Parsers
linkedItem.Path = reader.ReadElementContentAsString();
break;
}
case "ItemId":
{
linkedItem.LibraryItemId = reader.ReadElementContentAsString();
break;
}
default:
reader.Skip();
@@ -1206,7 +1198,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
}
// This is valid
if (!string.IsNullOrWhiteSpace(linkedItem.Path))
if (!string.IsNullOrWhiteSpace(linkedItem.Path) || !string.IsNullOrWhiteSpace(linkedItem.LibraryItemId))
{
return linkedItem;
}
@@ -1277,7 +1269,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
value = value.Trim().Trim(separator);
return string.IsNullOrWhiteSpace(value) ? new string[] { } : Split(value, separator, StringSplitOptions.RemoveEmptyEntries);
return string.IsNullOrWhiteSpace(value) ? Array.Empty<string>() : Split(value, separator, StringSplitOptions.RemoveEmptyEntries);
}
/// <summary>
@@ -1287,7 +1279,7 @@ namespace MediaBrowser.LocalMetadata.Parsers
/// <param name="separators">The separators.</param>
/// <param name="options">The options.</param>
/// <returns>System.String[][].</returns>
private static string[] Split(string val, char[] separators, StringSplitOptions options)
private string[] Split(string val, char[] separators, StringSplitOptions options)
{
return val.Split(separators, options);
}