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

Cleanup streaming services

Browse Source
This commit is contained in:
Bond-009
2019-02-02 23:55:47 +01:00
committed by Bond_009
parent 32f393d57f
commit ab0e851db9
11 changed files with 294 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
MediaBrowser.Api/BaseApiService.cs
View File

@@ -43,7 +43,7 @@ namespace MediaBrowser.Api
public static string[] SplitValue(string value, char delim)
{
if (string.IsNullOrWhiteSpace(value))
if (value == null)
{
return Array.Empty<string>();
}
@@ -53,8 +53,14 @@ namespace MediaBrowser.Api
public static Guid[] GetGuids(string value)
{
// Unfortunately filtermenu.js was using |. This can be deprecated after a while.
return (value ?? string.Empty).Split(new[] { ',', '|' }, StringSplitOptions.RemoveEmptyEntries).Select(i => new Guid(i)).ToArray();
if (value == null)
{
return Array.Empty<Guid>();
}
return value.Split(new[] { ',', '|' }, StringSplitOptions.RemoveEmptyEntries)
.Select(i => new Guid(i))
.ToArray();
}
/// <summary>
@@ -118,7 +124,8 @@ namespace MediaBrowser.Api
options.Fields = hasFields.GetItemFields();
}
if (!options.ContainsField(Model.Querying.ItemFields.RecursiveItemCount) || !options.ContainsField(Model.Querying.ItemFields.ChildCount))
if (!options.ContainsField(Model.Querying.ItemFields.RecursiveItemCount)
|| !options.ContainsField(Model.Querying.ItemFields.ChildCount))
{
var client = authContext.GetAuthorizationInfo(Request).Client ?? string.Empty;
if (client.IndexOf("kodi", StringComparison.OrdinalIgnoreCase) != -1 ||
@@ -145,8 +152,7 @@ namespace MediaBrowser.Api
}
}
var hasDtoOptions = request as IHasDtoOptions;
if (hasDtoOptions != null)
if (request is IHasDtoOptions hasDtoOptions)
{
options.EnableImages = hasDtoOptions.EnableImages ?? true;
@@ -294,7 +300,7 @@ namespace MediaBrowser.Api
return pathInfo[index];
}
private List<string> Parse(string pathUri)
private string[] Parse(string pathUri)
{
var actionParts = pathUri.Split(new[] { "://" }, StringSplitOptions.None);
@@ -308,7 +314,7 @@ namespace MediaBrowser.Api
var args = pathInfo.Split('/');
return args.Skip(1).ToList();
return args.Skip(1).ToArray();
}
/// <summary>