From 3fa2a001c7275737e4ff4011c23ca9dc359d721d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 31 Jul 2014 20:37:06 -0400 Subject: add error handling to dlna channel support --- MediaBrowser.Api/Images/ImageService.cs | 41 +-------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) (limited to 'MediaBrowser.Api/Images/ImageService.cs') diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs index 30db91da85..276aba365c 100644 --- a/MediaBrowser.Api/Images/ImageService.cs +++ b/MediaBrowser.Api/Images/ImageService.cs @@ -40,6 +40,7 @@ namespace MediaBrowser.Api.Images [Route("/Items/{Id}/Images/{Type}", "GET")] [Route("/Items/{Id}/Images/{Type}/{Index}", "GET")] + [Route("/Items/{Id}/Images/{Type}/{Index}/{Tag}/{Format}/{MaxWidth}/{MaxHeight}", "GET")] [Api(Description = "Gets an item image")] public class GetItemImage : ImageRequest { @@ -49,8 +50,6 @@ namespace MediaBrowser.Api.Images /// The id. [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")] public string Id { get; set; } - - public string Params { get; set; } } /// @@ -366,47 +365,9 @@ namespace MediaBrowser.Api.Images _libraryManager.RootFolder : _libraryManager.GetItemById(request.Id); - if (!string.IsNullOrEmpty(request.Params)) - { - ParseOptions(request, request.Params); - } - return GetImage(request, item); } - private readonly CultureInfo _usCulture = new CultureInfo("en-US"); - private void ParseOptions(ImageRequest request, string options) - { - var vals = options.Split(';'); - - for (var i = 0; i < vals.Length; i++) - { - var val = vals[i]; - - if (string.IsNullOrWhiteSpace(val)) - { - continue; - } - - if (i == 0) - { - request.Tag = val; - } - else if (i == 1) - { - request.Format = (ImageOutputFormat)Enum.Parse(typeof(ImageOutputFormat), val, true); - } - else if (i == 2) - { - request.MaxWidth = int.Parse(val, _usCulture); - } - else if (i == 3) - { - request.MaxHeight = int.Parse(val, _usCulture); - } - } - } - /// /// Gets the specified request. /// -- cgit v1.2.3