diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-08-08 00:36:51 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-08-08 00:36:51 -0400 |
| commit | 0f508dab47ebcc27d973840d03025f28f52a14b6 (patch) | |
| tree | 15d5b63f2c8cddb71be3ed713a8151d5105b442d /MediaBrowser.Api/Images/ImageService.cs | |
| parent | 515f21cc4f844c8f5b4701be84c6d5f290b044f5 (diff) | |
add additional playlist buttons
Diffstat (limited to 'MediaBrowser.Api/Images/ImageService.cs')
| -rw-r--r-- | MediaBrowser.Api/Images/ImageService.cs | 37 |
1 files changed, 26 insertions, 11 deletions
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs index ffbb5229b..ea7eaa947 100644 --- a/MediaBrowser.Api/Images/ImageService.cs +++ b/MediaBrowser.Api/Images/ImageService.cs @@ -14,7 +14,6 @@ using ServiceStack.Text.Controller; using ServiceStack.Web; using System; using System.Collections.Generic; -using System.Globalization; using System.IO; using System.Linq; using System.Threading; @@ -341,7 +340,7 @@ namespace MediaBrowser.Api.Images ImageIndex = imageIndex, ImageType = info.Type, ImageTag = _imageProcessor.GetImageCacheTag(item, info), - Size = info.Length ?? fileInfo.Length, + Size = fileInfo.Length, Width = Convert.ToInt32(size.Width), Height = Convert.ToInt32(size.Height) }; @@ -365,7 +364,21 @@ namespace MediaBrowser.Api.Images _libraryManager.RootFolder : _libraryManager.GetItemById(request.Id); - return GetImage(request, item); + return GetImage(request, item, false); + } + + /// <summary> + /// Gets the specified request. + /// </summary> + /// <param name="request">The request.</param> + /// <returns>System.Object.</returns> + public object Head(GetItemImage request) + { + var item = string.IsNullOrEmpty(request.Id) ? + _libraryManager.RootFolder : + _libraryManager.GetItemById(request.Id); + + return GetImage(request, item, true); } /// <summary> @@ -377,7 +390,7 @@ namespace MediaBrowser.Api.Images { var item = _userManager.Users.First(i => i.Id == request.Id); - return GetImage(request, item); + return GetImage(request, item, false); } public object Get(GetItemByNameImage request) @@ -387,7 +400,7 @@ namespace MediaBrowser.Api.Images var item = GetItemByName(request.Name, type, _libraryManager); - return GetImage(request, item); + return GetImage(request, item, false); } /// <summary> @@ -484,10 +497,10 @@ namespace MediaBrowser.Api.Images /// </summary> /// <param name="request">The request.</param> /// <param name="item">The item.</param> + /// <param name="isHeadRequest">if set to <c>true</c> [is head request].</param> /// <returns>System.Object.</returns> - /// <exception cref="ResourceNotFoundException"> - /// </exception> - public object GetImage(ImageRequest request, IHasImages item) + /// <exception cref="ResourceNotFoundException"></exception> + public object GetImage(ImageRequest request, IHasImages item, bool isHeadRequest) { var imageInfo = GetImageInfo(request, item); @@ -534,7 +547,8 @@ namespace MediaBrowser.Api.Images supportedImageEnhancers, contentType, cacheDuration, - responseHeaders) + responseHeaders, + isHeadRequest) .Result; } @@ -544,7 +558,8 @@ namespace MediaBrowser.Api.Images List<IImageEnhancer> enhancers, string contentType, TimeSpan? cacheDuration, - IDictionary<string,string> headers) + IDictionary<string,string> headers, + bool isHeadRequest) { var cropwhitespace = request.Type == ImageType.Logo || request.Type == ImageType.Art; @@ -574,7 +589,7 @@ namespace MediaBrowser.Api.Images var file = await _imageProcessor.ProcessImage(options).ConfigureAwait(false); - return ResultFactory.GetStaticFileResult(Request, file, contentType, cacheDuration, FileShare.Read, headers); + return ResultFactory.GetStaticFileResult(Request, file, contentType, cacheDuration, FileShare.Read, headers, isHeadRequest); } private string GetMimeType(ImageOutputFormat format, string path) |
