diff options
Diffstat (limited to 'MediaBrowser.Api')
| -rw-r--r-- | MediaBrowser.Api/Images/ImageService.cs | 43 | ||||
| -rw-r--r-- | MediaBrowser.Api/UserLibrary/ItemsService.cs | 3 |
2 files changed, 41 insertions, 5 deletions
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs index da21342ac..a5bb291ae 100644 --- a/MediaBrowser.Api/Images/ImageService.cs +++ b/MediaBrowser.Api/Images/ImageService.cs @@ -1,8 +1,7 @@ -using MediaBrowser.Common.Configuration; +using System.Globalization; using MediaBrowser.Common.Extensions; using MediaBrowser.Common.IO; using MediaBrowser.Controller.Drawing; -using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Persistence; @@ -48,6 +47,8 @@ namespace MediaBrowser.Api.Images /// <value>The id.</value> [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")] public string Id { get; set; } + + public string Params { get; set; } } /// <summary> @@ -358,9 +359,47 @@ 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); + } + } + } + /// <summary> /// Gets the specified request. /// </summary> diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index 8f3016769..1cd819197 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -502,9 +502,6 @@ namespace MediaBrowser.Api.UserLibrary return userdata != null && userdata.IsFavorite; }); - case ItemFilter.IsRecentlyAdded: - return items.Where(item => item.IsRecentlyAdded()); - case ItemFilter.IsResumable: return items.Where(item => { |