diff options
Diffstat (limited to 'MediaBrowser.Api')
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/ImageHandler.cs | 94 | ||||
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/VideoHandler.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/WeatherHandler.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Api/ImageProcessor.cs | 104 | ||||
| -rw-r--r-- | MediaBrowser.Api/MediaBrowser.Api.csproj | 1 | ||||
| -rw-r--r-- | MediaBrowser.Api/Plugin.cs | 1 |
6 files changed, 63 insertions, 145 deletions
diff --git a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs index f73f783af..73098c71b 100644 --- a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs @@ -2,6 +2,7 @@ using MediaBrowser.Common.Net;
using MediaBrowser.Common.Net.Handlers;
using MediaBrowser.Controller;
+using MediaBrowser.Controller.Drawing;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Entities;
using System;
@@ -20,7 +21,7 @@ namespace MediaBrowser.Api.HttpHandlers {
return ApiService.IsApiUrlMatch("image", request);
}
-
+
private string _imagePath;
private async Task<string> GetImagePath()
{
@@ -29,49 +30,57 @@ namespace MediaBrowser.Api.HttpHandlers return _imagePath;
}
- private async Task<string> DiscoverImagePath()
+ private BaseEntity _sourceEntity;
+ private async Task<BaseEntity> GetSourceEntity()
{
- string personName = QueryString["personname"];
-
- if (!string.IsNullOrEmpty(personName))
+ if (_sourceEntity == null)
{
- return (await Kernel.Instance.ItemController.GetPerson(personName).ConfigureAwait(false)).PrimaryImagePath;
- }
+ if (!string.IsNullOrEmpty(QueryString["personname"]))
+ {
+ _sourceEntity = await Kernel.Instance.ItemController.GetPerson(QueryString["personname"]).ConfigureAwait(false);
+ }
- string genreName = QueryString["genre"];
+ else if (!string.IsNullOrEmpty(QueryString["genre"]))
+ {
+ _sourceEntity = await Kernel.Instance.ItemController.GetGenre(QueryString["genre"]).ConfigureAwait(false);
+ }
- if (!string.IsNullOrEmpty(genreName))
- {
- return (await Kernel.Instance.ItemController.GetGenre(genreName).ConfigureAwait(false)).PrimaryImagePath;
- }
+ else if (!string.IsNullOrEmpty(QueryString["year"]))
+ {
+ _sourceEntity = await Kernel.Instance.ItemController.GetYear(int.Parse(QueryString["year"])).ConfigureAwait(false);
+ }
- string year = QueryString["year"];
+ else if (!string.IsNullOrEmpty(QueryString["studio"]))
+ {
+ _sourceEntity = await Kernel.Instance.ItemController.GetStudio(QueryString["studio"]).ConfigureAwait(false);
+ }
- if (!string.IsNullOrEmpty(year))
- {
- return (await Kernel.Instance.ItemController.GetYear(int.Parse(year)).ConfigureAwait(false)).PrimaryImagePath;
+ else if (!string.IsNullOrEmpty(QueryString["userid"]))
+ {
+ _sourceEntity = ApiService.GetUserById(QueryString["userid"], false);
+ }
+
+ else
+ {
+ _sourceEntity = ApiService.GetItemById(QueryString["id"]);
+ }
}
- string studio = QueryString["studio"];
+ return _sourceEntity;
+ }
- if (!string.IsNullOrEmpty(studio))
- {
- return (await Kernel.Instance.ItemController.GetStudio(studio).ConfigureAwait(false)).PrimaryImagePath;
- }
+ private async Task<string> DiscoverImagePath()
+ {
+ var entity = await GetSourceEntity().ConfigureAwait(false);
- string userId = QueryString["userid"];
+ var item = entity as BaseItem;
- if (!string.IsNullOrEmpty(userId))
+ if (item != null)
{
- return ApiService.GetUserById(userId, false).PrimaryImagePath;
+ return GetImagePathFromTypes(item, ImageType, ImageIndex);
}
- BaseItem item = ApiService.GetItemById(QueryString["id"]);
-
- string imageIndex = QueryString["index"];
- int index = string.IsNullOrEmpty(imageIndex) ? 0 : int.Parse(imageIndex);
-
- return GetImagePathFromTypes(item, ImageType, index);
+ return entity.PrimaryImagePath;
}
private Stream _sourceStream;
@@ -114,8 +123,6 @@ namespace MediaBrowser.Api.HttpHandlers public async override Task<string> GetContentType()
{
- await EnsureSourceStream().ConfigureAwait(false);
-
if (await GetSourceStream().ConfigureAwait(false) == null)
{
return null;
@@ -134,8 +141,6 @@ namespace MediaBrowser.Api.HttpHandlers protected async override Task<DateTime?> GetLastDateModified()
{
- await EnsureSourceStream().ConfigureAwait(false);
-
if (await GetSourceStream().ConfigureAwait(false) == null)
{
return null;
@@ -144,6 +149,21 @@ namespace MediaBrowser.Api.HttpHandlers return File.GetLastWriteTimeUtc(await GetImagePath().ConfigureAwait(false));
}
+ private int ImageIndex
+ {
+ get
+ {
+ string val = QueryString["index"];
+
+ if (string.IsNullOrEmpty(val))
+ {
+ return 0;
+ }
+
+ return int.Parse(val);
+ }
+ }
+
private int? Height
{
get
@@ -236,7 +256,11 @@ namespace MediaBrowser.Api.HttpHandlers protected override async Task WriteResponseToOutputStream(Stream stream)
{
- ImageProcessor.ProcessImage(await GetSourceStream().ConfigureAwait(false), stream, Width, Height, MaxWidth, MaxHeight, Quality);
+ Stream sourceStream = await GetSourceStream().ConfigureAwait(false);
+
+ var entity = await GetSourceEntity().ConfigureAwait(false);
+
+ ImageProcessor.ProcessImage(sourceStream, stream, Width, Height, MaxWidth, MaxHeight, Quality, entity, ImageType, ImageIndex);
}
private string GetImagePathFromTypes(BaseItem item, ImageType imageType, int imageIndex)
diff --git a/MediaBrowser.Api/HttpHandlers/VideoHandler.cs b/MediaBrowser.Api/HttpHandlers/VideoHandler.cs index 9d52136f0..e34a1b41f 100644 --- a/MediaBrowser.Api/HttpHandlers/VideoHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/VideoHandler.cs @@ -1,5 +1,5 @@ -using MediaBrowser.Common.Drawing;
-using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Controller.Drawing;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.DTO;
using MediaBrowser.Model.Entities;
@@ -7,7 +7,6 @@ using System; using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.Drawing;
-using System.IO;
using System.Linq;
using System.Net;
diff --git a/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs b/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs index 93d4c8877..90ecae122 100644 --- a/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs @@ -3,6 +3,7 @@ using MediaBrowser.Controller; using MediaBrowser.Model.Weather;
using System;
using System.ComponentModel.Composition;
+using System.Linq;
using System.Net;
using System.Threading.Tasks;
@@ -27,7 +28,7 @@ namespace MediaBrowser.Api.HttpHandlers zipCode = Kernel.Instance.Configuration.WeatherZipCode;
}
- return Kernel.Instance.WeatherClient.GetWeatherInfoAsync(zipCode);
+ return Kernel.Instance.WeatherProviders.First().GetWeatherInfoAsync(zipCode);
}
/// <summary>
diff --git a/MediaBrowser.Api/ImageProcessor.cs b/MediaBrowser.Api/ImageProcessor.cs deleted file mode 100644 index f02b90c22..000000000 --- a/MediaBrowser.Api/ImageProcessor.cs +++ /dev/null @@ -1,104 +0,0 @@ -using MediaBrowser.Common.Drawing;
-using System;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Imaging;
-using System.IO;
-
-namespace MediaBrowser.Api
-{
- public static class ImageProcessor
- {
- /// <summary>
- /// Resizes an image from a source stream and saves the result to an output stream
- /// </summary>
- /// <param name="width">Use if a fixed width is required. Aspect ratio will be preserved.</param>
- /// <param name="height">Use if a fixed height is required. Aspect ratio will be preserved.</param>
- /// <param name="maxWidth">Use if a max width is required. Aspect ratio will be preserved.</param>
- /// <param name="maxHeight">Use if a max height is required. Aspect ratio will be preserved.</param>
- /// <param name="quality">Quality level, from 0-100. Currently only applies to JPG. The default value should suffice.</param>
- public static void ProcessImage(Stream sourceImageStream, Stream toStream, int? width, int? height, int? maxWidth, int? maxHeight, int? quality)
- {
- Image originalImage = Image.FromStream(sourceImageStream);
-
- Size newSize = DrawingUtils.Resize(originalImage.Size, width, height, maxWidth, maxHeight);
-
- Bitmap thumbnail;
-
- // Graphics.FromImage will throw an exception if the PixelFormat is Indexed, so we need to handle that here
- if (originalImage.PixelFormat.HasFlag(PixelFormat.Indexed))
- {
- thumbnail = new Bitmap(originalImage, newSize.Width, newSize.Height);
- }
- else
- {
- thumbnail = new Bitmap(newSize.Width, newSize.Height, originalImage.PixelFormat);
- }
-
- thumbnail.SetResolution(originalImage.HorizontalResolution, originalImage.VerticalResolution);
-
- Graphics thumbnailGraph = Graphics.FromImage(thumbnail);
-
- thumbnailGraph.CompositingQuality = CompositingQuality.HighQuality;
- thumbnailGraph.SmoothingMode = SmoothingMode.HighQuality;
- thumbnailGraph.InterpolationMode = InterpolationMode.HighQualityBicubic;
- thumbnailGraph.PixelOffsetMode = PixelOffsetMode.HighQuality;
- thumbnailGraph.CompositingMode = CompositingMode.SourceOver;
-
- thumbnailGraph.DrawImage(originalImage, 0, 0, newSize.Width, newSize.Height);
-
- Write(originalImage, thumbnail, toStream, quality);
-
- thumbnailGraph.Dispose();
- thumbnail.Dispose();
- originalImage.Dispose();
- }
-
- private static void Write(Image originalImage, Image newImage, Stream toStream, int? quality)
- {
- // Use special save methods for jpeg and png that will result in a much higher quality image
- // All other formats use the generic Image.Save
- if (ImageFormat.Jpeg.Equals(originalImage.RawFormat))
- {
- SaveJpeg(newImage, toStream, quality);
- }
- else if (ImageFormat.Png.Equals(originalImage.RawFormat))
- {
- newImage.Save(toStream, ImageFormat.Png);
- }
- else
- {
- newImage.Save(toStream, originalImage.RawFormat);
- }
- }
-
- private static void SaveJpeg(Image newImage, Stream target, int? quality)
- {
- if (!quality.HasValue)
- {
- quality = 90;
- }
-
- using (var encoderParameters = new EncoderParameters(1))
- {
- encoderParameters.Param[0] = new EncoderParameter(Encoder.Quality, quality.Value);
- newImage.Save(target, GetImageCodeInfo("image/jpeg"), encoderParameters);
- }
- }
-
- private static ImageCodecInfo GetImageCodeInfo(string mimeType)
- {
- ImageCodecInfo[] info = ImageCodecInfo.GetImageEncoders();
-
- for (int i = 0; i < info.Length; i++)
- {
- ImageCodecInfo ici = info[i];
- if (ici.MimeType.Equals(mimeType, StringComparison.OrdinalIgnoreCase))
- {
- return ici;
- }
- }
- return info[1];
- }
- }
-}
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj index 858717e6e..44b58852b 100644 --- a/MediaBrowser.Api/MediaBrowser.Api.csproj +++ b/MediaBrowser.Api/MediaBrowser.Api.csproj @@ -83,7 +83,6 @@ <Compile Include="HttpHandlers\WeatherHandler.cs" />
<Compile Include="HttpHandlers\YearHandler.cs" />
<Compile Include="HttpHandlers\YearsHandler.cs" />
- <Compile Include="ImageProcessor.cs" />
<Compile Include="Plugin.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
diff --git a/MediaBrowser.Api/Plugin.cs b/MediaBrowser.Api/Plugin.cs index b2bcefd1f..8def96da8 100644 --- a/MediaBrowser.Api/Plugin.cs +++ b/MediaBrowser.Api/Plugin.cs @@ -1,5 +1,4 @@ using MediaBrowser.Common.Plugins;
-using MediaBrowser.Model.Plugins;
using System.ComponentModel.Composition;
namespace MediaBrowser.Api
|