diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-07-30 15:03:07 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-07-30 15:03:07 -0400 |
| commit | 7d48e20aea2e2a08137ec23d0076b86755f648d3 (patch) | |
| tree | 1c8caad19a000b4062546e755729ed1c130c5106 /MediaBrowser.Api/HttpHandlers | |
| parent | 45cde97a585ca295be8defa11e85376ec1bd0ada (diff) | |
Reworked CategoryInfo and added ImageType enum
Diffstat (limited to 'MediaBrowser.Api/HttpHandlers')
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/ImageHandler.cs | 30 | ||||
| -rw-r--r-- | MediaBrowser.Api/HttpHandlers/StudiosHandler.cs | 2 |
2 files changed, 23 insertions, 9 deletions
diff --git a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs index 33beb29019..c61768a6d0 100644 --- a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs @@ -136,6 +136,21 @@ namespace MediaBrowser.Api.HttpHandlers }
}
+ private ImageType ImageType
+ {
+ get
+ {
+ string imageType = QueryString["type"];
+
+ if (string.IsNullOrEmpty(imageType))
+ {
+ return Model.Entities.ImageType.Primary;
+ }
+
+ return (ImageType)Enum.Parse(typeof(ImageType), imageType, true);
+ }
+ }
+
protected override void WriteResponseToOutputStream(Stream stream)
{
ImageProcessor.ProcessImage(ImagePath, stream, Width, Height, MaxWidth, MaxHeight, Quality);
@@ -152,7 +167,6 @@ namespace MediaBrowser.Api.HttpHandlers string id = QueryString["id"];
string personName = QueryString["personname"];
- string imageType = QueryString["type"] ?? string.Empty;
string imageIndex = QueryString["index"];
BaseItem item;
@@ -168,28 +182,28 @@ namespace MediaBrowser.Api.HttpHandlers int index = string.IsNullOrEmpty(imageIndex) ? 0 : int.Parse(imageIndex);
- return GetImagePathFromTypes(item, imageType, index);
+ return GetImagePathFromTypes(item, ImageType, index);
}
- private string GetImagePathFromTypes(BaseItem item, string imageType, int imageIndex)
+ private string GetImagePathFromTypes(BaseItem item, ImageType imageType, int imageIndex)
{
- if (imageType.Equals("logo", StringComparison.OrdinalIgnoreCase))
+ if (imageType == ImageType.Logo)
{
return item.LogoImagePath;
}
- else if (imageType.Equals("backdrop", StringComparison.OrdinalIgnoreCase))
+ else if (imageType == ImageType.Backdrop)
{
return item.BackdropImagePaths.ElementAt(imageIndex);
}
- else if (imageType.Equals("banner", StringComparison.OrdinalIgnoreCase))
+ else if (imageType == ImageType.Banner)
{
return item.BannerImagePath;
}
- else if (imageType.Equals("art", StringComparison.OrdinalIgnoreCase))
+ else if (imageType == ImageType.Art)
{
return item.ArtImagePath;
}
- else if (imageType.Equals("thumbnail", StringComparison.OrdinalIgnoreCase))
+ else if (imageType == ImageType.Thumbnail)
{
return item.ThumbnailImagePath;
}
diff --git a/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs b/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs index d2898104fc..ff48ae6e36 100644 --- a/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs @@ -6,7 +6,7 @@ namespace MediaBrowser.Api.HttpHandlers {
public class StudiosHandler : JsonHandler
{
- protected sealed override object ObjectToSerialize
+ protected override object ObjectToSerialize
{
get
{
|