diff options
Diffstat (limited to 'MediaBrowser.Api/HttpHandlers')
| -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 |
3 files changed, 63 insertions, 39 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>
|