pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplified Conditionals and returns

This commit is contained in:
Patrick Barron 2020-04-05 14:44:14 -04:00
parent 80cfcf5643
commit add0a2088d
12 changed files with 299 additions and 372 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
MediaBrowser.Api/ApiEntryPoint.cs
View File

@ -86,12 +86,9 @@ namespace MediaBrowser.Api
return Array.Empty<string>(); return Array.Empty<string>();
} }
if (removeEmpty) return removeEmpty
{ ? value.Split(new[] { separator }, StringSplitOptions.RemoveEmptyEntries)
return value.Split(new[] { separator }, StringSplitOptions.RemoveEmptyEntries); : value.Split(separator);
}
return value.Split(separator);
} }
public SemaphoreSlim GetTranscodingLock(string outputPath) public SemaphoreSlim GetTranscodingLock(string outputPath)
@ -487,16 +484,9 @@ namespace MediaBrowser.Api
/// <returns>Task.</returns> /// <returns>Task.</returns>
internal Task KillTranscodingJobs(string deviceId, string playSessionId, Func<string, bool> deleteFiles) internal Task KillTranscodingJobs(string deviceId, string playSessionId, Func<string, bool> deleteFiles)
{ {
return KillTranscodingJobs(j => return KillTranscodingJobs(j => !string.IsNullOrWhiteSpace(playSessionId)
{ ? string.Equals(playSessionId, j.PlaySessionId, StringComparison.OrdinalIgnoreCase)
if (!string.IsNullOrWhiteSpace(playSessionId)) : string.Equals(deviceId, j.DeviceId, StringComparison.OrdinalIgnoreCase), deleteFiles);
{
return string.Equals(playSessionId, j.PlaySessionId, StringComparison.OrdinalIgnoreCase);
}
return string.Equals(deviceId, j.DeviceId, StringComparison.OrdinalIgnoreCase);
}, deleteFiles);
} }
/// <summary> /// <summary>

22
MediaBrowser.Api/BaseApiService.cs
View File

@ -58,12 +58,9 @@ namespace MediaBrowser.Api
public static string[] SplitValue(string value, char delim) public static string[] SplitValue(string value, char delim)
{ {
if (value == null) return value == null
{ ? Array.Empty<string>()
return Array.Empty<string>(); : value.Split(new[] { delim }, StringSplitOptions.RemoveEmptyEntries);
}
return value.Split(new[] { delim }, StringSplitOptions.RemoveEmptyEntries);
} }
public static Guid[] GetGuids(string value) public static Guid[] GetGuids(string value)
@ -97,21 +94,12 @@ namespace MediaBrowser.Api
var authenticatedUser = auth.User; var authenticatedUser = auth.User;
// If they're going to update the record of another user, they must be an administrator // If they're going to update the record of another user, they must be an administrator
if (!userId.Equals(auth.UserId)) if ((!userId.Equals(auth.UserId) && !authenticatedUser.Policy.IsAdministrator)
{ || (restrictUserPreferences && !authenticatedUser.Policy.EnableUserPreferenceAccess))
if (!authenticatedUser.Policy.IsAdministrator)
{ {
throw new SecurityException("Unauthorized access."); throw new SecurityException("Unauthorized access.");
} }
} }
else if (restrictUserPreferences)
{
if (!authenticatedUser.Policy.EnableUserPreferenceAccess)
{
throw new SecurityException("Unauthorized access.");
}
}
}
/// <summary> /// <summary>
/// Gets the session. /// Gets the session.

18
MediaBrowser.Api/ChannelService.cs
View File

@ -116,12 +116,9 @@ namespace MediaBrowser.Api
{ {
var val = Filters; var val = Filters;
if (string.IsNullOrEmpty(val)) return string.IsNullOrEmpty(val)
{ ? new ItemFilter[] { }
return new ItemFilter[] { }; : val.Split(',').Select(v => (ItemFilter)Enum.Parse(typeof(ItemFilter), v, true));
}
return val.Split(',').Select(v => (ItemFilter)Enum.Parse(typeof(ItemFilter), v, true));
} }
/// <summary> /// <summary>
@ -175,12 +172,9 @@ namespace MediaBrowser.Api
{ {
var val = Filters; var val = Filters;
if (string.IsNullOrEmpty(val)) return string.IsNullOrEmpty(val)
{ ? new ItemFilter[] { }
return new ItemFilter[] { }; : val.Split(',').Select(v => (ItemFilter)Enum.Parse(typeof(ItemFilter), v, true));
}
return val.Split(',').Select(v => (ItemFilter)Enum.Parse(typeof(ItemFilter), v, true));
} }
} }

4
MediaBrowser.Api/Devices/DeviceService.cs
View File

@ -155,8 +155,7 @@ namespace MediaBrowser.Api.Devices
Id = id Id = id
}); });
} }
else
{
return _deviceManager.AcceptCameraUpload(deviceId, request.RequestStream, new LocalFileInfo return _deviceManager.AcceptCameraUpload(deviceId, request.RequestStream, new LocalFileInfo
{ {
MimeType = Request.ContentType, MimeType = Request.ContentType,
@ -166,5 +165,4 @@ namespace MediaBrowser.Api.Devices
}); });
} }
} }
}
} }

7
MediaBrowser.Api/EnvironmentService.cs
View File

@ -258,12 +258,7 @@ namespace MediaBrowser.Api
return false; return false;
} }
if (!request.IncludeDirectories && isDirectory) return request.IncludeDirectories || !isDirectory;
{
return false;
}
return true;
}); });
return entries.Select(f => new FileSystemEntryInfo return entries.Select(f => new FileSystemEntryInfo

65
MediaBrowser.Api/Library/LibraryService.cs
View File

@ -348,28 +348,19 @@ namespace MediaBrowser.Api.Library
private string[] GetRepresentativeItemTypes(string contentType) private string[] GetRepresentativeItemTypes(string contentType)
{ {
switch (contentType) return contentType switch
{ {
case CollectionType.BoxSets: CollectionType.BoxSets => new[] {"BoxSet"},
return new[] { "BoxSet" }; CollectionType.Playlists => new[] {"Playlist"},
case CollectionType.Playlists: CollectionType.Movies => new[] {"Movie"},
return new[] { "Playlist" }; CollectionType.TvShows => new[] {"Series", "Season", "Episode"},
case CollectionType.Movies: CollectionType.Books => new[] {"Book"},
return new[] { "Movie" }; CollectionType.Music => new[] {"MusicAlbum", "MusicArtist", "Audio", "MusicVideo"},
case CollectionType.TvShows: CollectionType.HomeVideos => new[] {"Video", "Photo"},
return new[] { "Series", "Season", "Episode" }; CollectionType.Photos => new[] {"Video", "Photo"},
case CollectionType.Books: CollectionType.MusicVideos => new[] {"MusicVideo"},
return new[] { "Book" }; _ => new[] {"Series", "Season", "Episode", "Movie"}
case CollectionType.Music: };
return new[] { "MusicAlbum", "MusicArtist", "Audio", "MusicVideo" };
case CollectionType.HomeVideos:
case CollectionType.Photos:
return new[] { "Video", "Photo" };
case CollectionType.MusicVideos:
return new[] { "MusicVideo" };
default:
return new[] { "Series", "Season", "Episode", "Movie" };
}
} }
private bool IsSaverEnabledByDefault(string name, string[] itemTypes, bool isNewLibrary) private bool IsSaverEnabledByDefault(string name, string[] itemTypes, bool isNewLibrary)
@ -397,22 +388,18 @@ namespace MediaBrowser.Api.Library
{ {
if (string.Equals(name, "TheMovieDb", StringComparison.OrdinalIgnoreCase)) if (string.Equals(name, "TheMovieDb", StringComparison.OrdinalIgnoreCase))
{ {
if (string.Equals(type, "Series", StringComparison.OrdinalIgnoreCase)) if (string.Equals(type, "Series", StringComparison.OrdinalIgnoreCase))
{ {
return true; return true;
} }
if (string.Equals(type, "Season", StringComparison.OrdinalIgnoreCase)) if (string.Equals(type, "Season", StringComparison.OrdinalIgnoreCase)
{ || string.Equals(type, "Episode", StringComparison.OrdinalIgnoreCase)
return false; || string.Equals(type, "MusicVideo", StringComparison.OrdinalIgnoreCase))
}
if (string.Equals(type, "Episode", StringComparison.OrdinalIgnoreCase))
{
return false;
}
if (string.Equals(type, "MusicVideo", StringComparison.OrdinalIgnoreCase))
{ {
return false; return false;
} }
return true; return true;
} }
else if (string.Equals(name, "TheTVDB", StringComparison.OrdinalIgnoreCase)) else if (string.Equals(name, "TheTVDB", StringComparison.OrdinalIgnoreCase))
@ -439,12 +426,8 @@ namespace MediaBrowser.Api.Library
.Where(i => string.Equals(i.ItemType, type, StringComparison.OrdinalIgnoreCase)) .Where(i => string.Equals(i.ItemType, type, StringComparison.OrdinalIgnoreCase))
.ToArray(); .ToArray();
if (metadataOptions.Length == 0) return metadataOptions.Length == 0
{ || metadataOptions.Any(i => !i.DisabledMetadataFetchers.Contains(name, StringComparer.OrdinalIgnoreCase));
return true;
}
return metadataOptions.Any(i => !i.DisabledMetadataFetchers.Contains(name, StringComparer.OrdinalIgnoreCase));
} }
private bool IsImageFetcherEnabledByDefault(string name, string type, bool isNewLibrary) private bool IsImageFetcherEnabledByDefault(string name, string type, bool isNewLibrary)
@ -919,12 +902,10 @@ namespace MediaBrowser.Api.Library
private BaseItem TranslateParentItem(BaseItem item, User user) private BaseItem TranslateParentItem(BaseItem item, User user)
{ {
if (item.GetParent() is AggregateFolder) return item.GetParent() is AggregateFolder
{ ? _libraryManager.GetUserRootFolder().GetChildren(user, true)
return _libraryManager.GetUserRootFolder().GetChildren(user, true).FirstOrDefault(i => i.PhysicalLocations.Contains(item.Path)); .FirstOrDefault(i => i.PhysicalLocations.Contains(item.Path))
} : item;
return item;
} }
/// <summary> /// <summary>

170
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -137,12 +137,7 @@ namespace MediaBrowser.Api.Playback
var ext = outputFileExtension.ToLowerInvariant(); var ext = outputFileExtension.ToLowerInvariant();
var folder = ServerConfigurationManager.GetTranscodePath(); var folder = ServerConfigurationManager.GetTranscodePath();
if (EnableOutputInSubFolder) return EnableOutputInSubFolder ? Path.Combine(folder, filename, filename + ext) : Path.Combine(folder, filename + ext);
{
return Path.Combine(folder, filename, filename + ext);
}
return Path.Combine(folder, filename + ext);
} }
protected virtual string GetDefaultEncoderPreset() protected virtual string GetDefaultEncoderPreset()
@ -383,143 +378,156 @@ namespace MediaBrowser.Api.Playback
continue; continue;
} }
if (i == 0) switch (i)
{ {
case 0:
request.DeviceProfileId = val; request.DeviceProfileId = val;
} break;
else if (i == 1) case 1:
{
request.DeviceId = val; request.DeviceId = val;
} break;
else if (i == 2) case 2:
{
request.MediaSourceId = val; request.MediaSourceId = val;
} break;
else if (i == 3) case 3:
{
request.Static = string.Equals("true", val, StringComparison.OrdinalIgnoreCase); request.Static = string.Equals("true", val, StringComparison.OrdinalIgnoreCase);
} break;
else if (i == 4) case 4:
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.VideoCodec = val; videoRequest.VideoCodec = val;
} }
break;
} }
else if (i == 5) case 5:
{
request.AudioCodec = val; request.AudioCodec = val;
} break;
else if (i == 6) case 6:
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.AudioStreamIndex = int.Parse(val, CultureInfo.InvariantCulture); videoRequest.AudioStreamIndex = int.Parse(val, CultureInfo.InvariantCulture);
} }
break;
} }
else if (i == 7) case 7:
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.SubtitleStreamIndex = int.Parse(val, CultureInfo.InvariantCulture); videoRequest.SubtitleStreamIndex = int.Parse(val, CultureInfo.InvariantCulture);
} }
break;
} }
else if (i == 8) case 8:
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.VideoBitRate = int.Parse(val, CultureInfo.InvariantCulture); videoRequest.VideoBitRate = int.Parse(val, CultureInfo.InvariantCulture);
} }
break;
} }
else if (i == 9) case 9:
{
request.AudioBitRate = int.Parse(val, CultureInfo.InvariantCulture); request.AudioBitRate = int.Parse(val, CultureInfo.InvariantCulture);
} break;
else if (i == 10) case 10:
{
request.MaxAudioChannels = int.Parse(val, CultureInfo.InvariantCulture); request.MaxAudioChannels = int.Parse(val, CultureInfo.InvariantCulture);
} break;
else if (i == 11) case 11:
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.MaxFramerate = float.Parse(val, CultureInfo.InvariantCulture); videoRequest.MaxFramerate = float.Parse(val, CultureInfo.InvariantCulture);
} }
break;
} }
else if (i == 12) case 12:
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.MaxWidth = int.Parse(val, CultureInfo.InvariantCulture); videoRequest.MaxWidth = int.Parse(val, CultureInfo.InvariantCulture);
} }
break;
} }
else if (i == 13) case 13:
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.MaxHeight = int.Parse(val, CultureInfo.InvariantCulture); videoRequest.MaxHeight = int.Parse(val, CultureInfo.InvariantCulture);
} }
break;
} }
else if (i == 14) case 14:
{
request.StartTimeTicks = long.Parse(val, CultureInfo.InvariantCulture); request.StartTimeTicks = long.Parse(val, CultureInfo.InvariantCulture);
} break;
else if (i == 15) case 15:
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.Level = val; videoRequest.Level = val;
} }
break;
} }
else if (i == 16) case 16:
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.MaxRefFrames = int.Parse(val, CultureInfo.InvariantCulture); videoRequest.MaxRefFrames = int.Parse(val, CultureInfo.InvariantCulture);
} }
break;
} }
else if (i == 17) case 17:
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.MaxVideoBitDepth = int.Parse(val, CultureInfo.InvariantCulture); videoRequest.MaxVideoBitDepth = int.Parse(val, CultureInfo.InvariantCulture);
} }
break;
} }
else if (i == 18) case 18:
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.Profile = val; videoRequest.Profile = val;
} }
break;
} }
else if (i == 19) case 19:
{
// cabac no longer used // cabac no longer used
} break;
else if (i == 20) case 20:
{
request.PlaySessionId = val; request.PlaySessionId = val;
} break;
else if (i == 21) case 21:
{
// api_key // api_key
} break;
else if (i == 22) case 22:
{
request.LiveStreamId = val; request.LiveStreamId = val;
} break;
else if (i == 23) case 23:
{
// Duplicating ItemId because of MediaMonkey // Duplicating ItemId because of MediaMonkey
} break;
else if (i == 24) case 24:
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.CopyTimestamps = string.Equals("true", val, StringComparison.OrdinalIgnoreCase); videoRequest.CopyTimestamps = string.Equals("true", val, StringComparison.OrdinalIgnoreCase);
} }
break;
} }
else if (i == 25) case 25:
{ {
if (!string.IsNullOrWhiteSpace(val) && videoRequest != null) if (!string.IsNullOrWhiteSpace(val) && videoRequest != null)
{ {
@ -528,50 +536,57 @@ namespace MediaBrowser.Api.Playback
videoRequest.SubtitleMethod = method; videoRequest.SubtitleMethod = method;
} }
} }
break;
} }
else if (i == 26) case 26:
{
request.TranscodingMaxAudioChannels = int.Parse(val, CultureInfo.InvariantCulture); request.TranscodingMaxAudioChannels = int.Parse(val, CultureInfo.InvariantCulture);
} break;
else if (i == 27) case 27:
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.EnableSubtitlesInManifest = string.Equals("true", val, StringComparison.OrdinalIgnoreCase); videoRequest.EnableSubtitlesInManifest = string.Equals("true", val, StringComparison.OrdinalIgnoreCase);
} }
break;
} }
else if (i == 28) case 28:
{
request.Tag = val; request.Tag = val;
} break;
else if (i == 29) case 29:
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.RequireAvc = string.Equals("true", val, StringComparison.OrdinalIgnoreCase); videoRequest.RequireAvc = string.Equals("true", val, StringComparison.OrdinalIgnoreCase);
} }
break;
} }
else if (i == 30) case 30:
{
request.SubtitleCodec = val; request.SubtitleCodec = val;
} break;
else if (i == 31) case 31:
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.RequireNonAnamorphic = string.Equals("true", val, StringComparison.OrdinalIgnoreCase); videoRequest.RequireNonAnamorphic = string.Equals("true", val, StringComparison.OrdinalIgnoreCase);
} }
break;
} }
else if (i == 32) case 32:
{ {
if (videoRequest != null) if (videoRequest != null)
{ {
videoRequest.DeInterlace = string.Equals("true", val, StringComparison.OrdinalIgnoreCase); videoRequest.DeInterlace = string.Equals("true", val, StringComparison.OrdinalIgnoreCase);
} }
break;
} }
else if (i == 33) case 33:
{
request.TranscodeReasons = val; request.TranscodeReasons = val;
break;
} }
} }
} }
@ -624,14 +639,9 @@ namespace MediaBrowser.Api.Playback
throw new ArgumentException("Invalid timeseek header"); throw new ArgumentException("Invalid timeseek header");
} }
int index = value.IndexOf('-'); int index = value.IndexOf('-');
if (index == -1) value = index == -1
{ ? value.Substring(Npt.Length)
value = value.Substring(Npt.Length); : value.Substring(Npt.Length, index - Npt.Length);
}
else
{
value = value.Substring(Npt.Length, index - Npt.Length);
}
if (value.IndexOf(':') == -1) if (value.IndexOf(':') == -1)
{ {

12
MediaBrowser.Api/Playback/MediaInfoService.cs
View File

@ -662,17 +662,9 @@ namespace MediaBrowser.Api.Playback
}; };
}).ThenBy(i => }).ThenBy(i =>
{ {
if (maxBitrate.HasValue) if (maxBitrate.HasValue && i.Bitrate.HasValue)
{ {
if (i.Bitrate.HasValue) return i.Bitrate.Value <= maxBitrate.Value ? 0 : 2;
{
if (i.Bitrate.Value <= maxBitrate.Value)
{
return 0;
}
return 2;
}
} }
return 1; return 1;

43
MediaBrowser.Api/SearchService.cs
View File

@ -234,46 +234,44 @@ namespace MediaBrowser.Api
SetThumbImageInfo(result, item); SetThumbImageInfo(result, item);
SetBackdropImageInfo(result, item); SetBackdropImageInfo(result, item);
if (item is LiveTvProgram program) switch (item)
{
result.StartDate = program.StartDate;
}
if (item is IHasSeries hasSeries)
{ {
case IHasSeries hasSeries:
result.Series = hasSeries.SeriesName; result.Series = hasSeries.SeriesName;
} break;
case LiveTvProgram program:
if (item is Series series) result.StartDate = program.StartDate;
break;
case Series series:
{ {
if (series.Status.HasValue) if (series.Status.HasValue)
{ {
result.Status = series.Status.Value.ToString(); result.Status = series.Status.Value.ToString();
} }
}
if (item is MusicAlbum album) break;
{ }
case MusicAlbum album:
result.Artists = album.Artists; result.Artists = album.Artists;
result.AlbumArtist = album.AlbumArtist; result.AlbumArtist = album.AlbumArtist;
} break;
case Audio song:
if (item is Audio song)
{
result.AlbumArtist = song.AlbumArtists.FirstOrDefault(); result.AlbumArtist = song.AlbumArtists.FirstOrDefault();
result.Artists = song.Artists; result.Artists = song.Artists;
album = song.AlbumEntity; MusicAlbum musicAlbum = song.AlbumEntity;
if (album != null) if (musicAlbum != null)
{ {
result.Album = album.Name; result.Album = musicAlbum.Name;
result.AlbumId = album.Id; result.AlbumId = musicAlbum.Id;
} }
else else
{ {
result.Album = song.Album; result.Album = song.Album;
} }
break;
} }
if (!item.ChannelId.Equals(Guid.Empty)) if (!item.ChannelId.Equals(Guid.Empty))
@ -289,13 +287,10 @@ namespace MediaBrowser.Api
{ {
var itemWithImage = item.HasImage(ImageType.Thumb) ? item : null; var itemWithImage = item.HasImage(ImageType.Thumb) ? item : null;
if (itemWithImage == null) if (itemWithImage == null && item is Episode)
{
if (item is Episode)
{ {
itemWithImage = GetParentWithImage<Series>(item, ImageType.Thumb); itemWithImage = GetParentWithImage<Series>(item, ImageType.Thumb);
} }
}
if (itemWithImage == null) if (itemWithImage == null)
{ {

8
MediaBrowser.Api/System/SystemService.cs
View File

@ -168,12 +168,8 @@ namespace MediaBrowser.Api.System
.First(i => string.Equals(i.Name, request.Name, StringComparison.OrdinalIgnoreCase)); .First(i => string.Equals(i.Name, request.Name, StringComparison.OrdinalIgnoreCase));
// For older files, assume fully static // For older files, assume fully static
if (file.LastWriteTimeUtc < DateTime.UtcNow.AddHours(-1)) return ResultFactory.GetStaticFileResult(Request, file.FullName,
{ file.LastWriteTimeUtc < DateTime.UtcNow.AddHours(-1) ? FileShare.Read : FileShare.ReadWrite);
return ResultFactory.GetStaticFileResult(Request, file.FullName, FileShare.Read);
}
return ResultFactory.GetStaticFileResult(Request, file.FullName, FileShare.ReadWrite);
} }
/// <summary> /// <summary>

7
MediaBrowser.Api/UserLibrary/ArtistsService.cs
View File

@ -126,12 +126,7 @@ namespace MediaBrowser.Api.UserLibrary
protected override QueryResult<(BaseItem, ItemCounts)> GetItems(GetItemsByName request, InternalItemsQuery query) protected override QueryResult<(BaseItem, ItemCounts)> GetItems(GetItemsByName request, InternalItemsQuery query)
{ {
if (request is GetAlbumArtists) return request is GetAlbumArtists ? LibraryManager.GetAlbumArtists(query) : LibraryManager.GetArtists(query);
{
return LibraryManager.GetAlbumArtists(query);
}
return LibraryManager.GetArtists(query);
} }
/// <summary> /// <summary>

29
MediaBrowser.Api/UserLibrary/BaseItemsRequest.cs
View File

@ -396,12 +396,10 @@ namespace MediaBrowser.Api.UserLibrary
public VideoType[] GetVideoTypes() public VideoType[] GetVideoTypes()
{ {
if (string.IsNullOrEmpty(VideoTypes)) return string.IsNullOrEmpty(VideoTypes)
{ ? Array.Empty<VideoType>()
return Array.Empty<VideoType>(); : VideoTypes.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
} .Select(v => (VideoType)Enum.Parse(typeof(VideoType), v, true)).ToArray();
return VideoTypes.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(v => (VideoType)Enum.Parse(typeof(VideoType), v, true)).ToArray();
} }
/// <summary> /// <summary>
@ -412,12 +410,10 @@ namespace MediaBrowser.Api.UserLibrary
{ {
var val = Filters; var val = Filters;
if (string.IsNullOrEmpty(val)) return string.IsNullOrEmpty(val)
{ ? new ItemFilter[] { }
return new ItemFilter[] { }; : val.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).
} Select(v => (ItemFilter)Enum.Parse(typeof(ItemFilter), v, true)).ToArray();
return val.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(v => (ItemFilter)Enum.Parse(typeof(ItemFilter), v, true)).ToArray();
} }
/// <summary> /// <summary>
@ -428,12 +424,9 @@ namespace MediaBrowser.Api.UserLibrary
{ {
var val = ImageTypes; var val = ImageTypes;
if (string.IsNullOrEmpty(val)) return string.IsNullOrEmpty(val)
{ ? new ImageType[] { }
return new ImageType[] { }; : val.Split(',').Select(v => (ImageType)Enum.Parse(typeof(ImageType), v, true)).ToArray();
}
return val.Split(',').Select(v => (ImageType)Enum.Parse(typeof(ImageType), v, true)).ToArray();
} }
/// <summary> /// <summary>