aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/HttpHandlers
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Api/HttpHandlers')
-rw-r--r--MediaBrowser.Api/HttpHandlers/GenreHandler.cs6
-rw-r--r--MediaBrowser.Api/HttpHandlers/GenresHandler.cs10
-rw-r--r--MediaBrowser.Api/HttpHandlers/ImageHandler.cs24
-rw-r--r--MediaBrowser.Api/HttpHandlers/InProgressItemsHandler.cs6
-rw-r--r--MediaBrowser.Api/HttpHandlers/ItemHandler.cs33
-rw-r--r--MediaBrowser.Api/HttpHandlers/ItemListHandler.cs10
-rw-r--r--MediaBrowser.Api/HttpHandlers/JsonHandler.cs16
-rw-r--r--MediaBrowser.Api/HttpHandlers/MediaHandler.cs26
-rw-r--r--MediaBrowser.Api/HttpHandlers/PersonHandler.cs8
-rw-r--r--MediaBrowser.Api/HttpHandlers/RecentlyAddedItemsHandler.cs6
-rw-r--r--MediaBrowser.Api/HttpHandlers/StudioHandler.cs6
-rw-r--r--MediaBrowser.Api/HttpHandlers/StudiosHandler.cs11
-rw-r--r--MediaBrowser.Api/HttpHandlers/UsersHandler.cs8
13 files changed, 42 insertions, 128 deletions
diff --git a/MediaBrowser.Api/HttpHandlers/GenreHandler.cs b/MediaBrowser.Api/HttpHandlers/GenreHandler.cs
index f43e3e1b0..477705e82 100644
--- a/MediaBrowser.Api/HttpHandlers/GenreHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/GenreHandler.cs
@@ -1,5 +1,4 @@
using System.Collections.Generic;
-using MediaBrowser.Common.Net;
using MediaBrowser.Controller;
using MediaBrowser.Model.Entities;
@@ -10,11 +9,6 @@ namespace MediaBrowser.Api.HttpHandlers
/// </summary>
public class GenreHandler : ItemListHandler
{
- public GenreHandler(RequestContext ctx)
- : base(ctx)
- {
- }
-
protected override IEnumerable<BaseItem> ItemsToSerialize
{
get
diff --git a/MediaBrowser.Api/HttpHandlers/GenresHandler.cs b/MediaBrowser.Api/HttpHandlers/GenresHandler.cs
index 794b746cd..e8e3fd80b 100644
--- a/MediaBrowser.Api/HttpHandlers/GenresHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/GenresHandler.cs
@@ -1,17 +1,11 @@
using System;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Controller;
using MediaBrowser.Model.Entities;
namespace MediaBrowser.Api.HttpHandlers
{
public class GenresHandler : JsonHandler
{
- public GenresHandler(RequestContext ctx)
- : base(ctx)
- {
- }
-
protected sealed override object ObjectToSerialize
{
get
@@ -19,7 +13,7 @@ namespace MediaBrowser.Api.HttpHandlers
Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder;
Guid userId = Guid.Parse(QueryString["userid"]);
- return ApiService.GetAllGenres(parent, userId);
+ return Kernel.Instance.GetAllGenres(parent, userId);
}
}
}
diff --git a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs
index ed6dcc3a9..ae6228ae8 100644
--- a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs
@@ -1,27 +1,14 @@
using System;
using System.IO;
-using System.IO.Compression;
using System.Linq;
-using MediaBrowser.Common.Net;
using MediaBrowser.Controller;
using MediaBrowser.Model.Entities;
+using MediaBrowser.Net.Handlers;
namespace MediaBrowser.Api.HttpHandlers
{
- public class ImageHandler : Response
+ public class ImageHandler : BaseHandler
{
- public ImageHandler(RequestContext ctx)
- : base(ctx)
- {
- Headers["Content-Encoding"] = "gzip";
-
- WriteStream = s =>
- {
- WriteReponse(s);
- s.Close();
- };
- }
-
private string _ImagePath = string.Empty;
private string ImagePath
{
@@ -149,12 +136,9 @@ namespace MediaBrowser.Api.HttpHandlers
}
}
- private void WriteReponse(Stream stream)
+ protected override void WriteResponseToOutputStream(Stream stream)
{
- using (GZipStream gzipStream = new GZipStream(stream, CompressionMode.Compress, false))
- {
- ImageProcessor.ProcessImage(ImagePath, gzipStream, Width, Height, MaxWidth, MaxHeight, Quality);
- }
+ ImageProcessor.ProcessImage(ImagePath, stream, Width, Height, MaxWidth, MaxHeight, Quality);
}
private string GetImagePath()
diff --git a/MediaBrowser.Api/HttpHandlers/InProgressItemsHandler.cs b/MediaBrowser.Api/HttpHandlers/InProgressItemsHandler.cs
index e13cee866..2bee275a4 100644
--- a/MediaBrowser.Api/HttpHandlers/InProgressItemsHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/InProgressItemsHandler.cs
@@ -1,5 +1,4 @@
using System.Collections.Generic;
-using MediaBrowser.Common.Net;
using MediaBrowser.Controller;
using MediaBrowser.Model.Entities;
@@ -7,11 +6,6 @@ namespace MediaBrowser.Api.HttpHandlers
{
class InProgressItemsHandler : ItemListHandler
{
- public InProgressItemsHandler(RequestContext ctx)
- : base(ctx)
- {
- }
-
protected override IEnumerable<BaseItem> ItemsToSerialize
{
get
diff --git a/MediaBrowser.Api/HttpHandlers/ItemHandler.cs b/MediaBrowser.Api/HttpHandlers/ItemHandler.cs
index dd508d103..2ff235493 100644
--- a/MediaBrowser.Api/HttpHandlers/ItemHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/ItemHandler.cs
@@ -1,48 +1,19 @@
using System;
-using MediaBrowser.Api.Model;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Common.Net.Handlers;
-using MediaBrowser.Controller;
+using MediaBrowser.Net.Handlers;
using MediaBrowser.Model.Entities;
namespace MediaBrowser.Api.HttpHandlers
{
public class ItemHandler : JsonHandler
{
- public ItemHandler(RequestContext ctx)
- : base(ctx)
- {
- }
-
protected sealed override object ObjectToSerialize
{
get
{
Guid userId = Guid.Parse(QueryString["userid"]);
- return GetSerializationObject(ItemToSerialize, true, userId);
- }
- }
-
- public static object GetSerializationObject(BaseItem item, bool includeChildren, Guid userId)
- {
- BaseItemInfo wrapper = new BaseItemInfo()
- {
- Item = item,
- UserItemData = Kernel.Instance.GetUserItemData(userId, item.Id)
- };
-
- if (includeChildren)
- {
- var folder = item as Folder;
-
- if (folder != null)
- {
- wrapper.Children = Kernel.Instance.GetParentalAllowedChildren(folder, userId);
- }
+ return ApiService.GetSerializationObject(ItemToSerialize, true, userId);
}
-
- return wrapper;
}
protected virtual BaseItem ItemToSerialize
diff --git a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs
index ed6e895f3..54af1b7e9 100644
--- a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs
@@ -1,26 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Net.Handlers;
using MediaBrowser.Model.Entities;
namespace MediaBrowser.Api.HttpHandlers
{
public abstract class ItemListHandler : JsonHandler
{
- public ItemListHandler(RequestContext ctx)
- : base(ctx)
- {
- }
-
protected sealed override object ObjectToSerialize
{
get
{
return ItemsToSerialize.Select(i =>
{
- return ItemHandler.GetSerializationObject(i, false, UserId);
+ return ApiService.GetSerializationObject(i, false, UserId);
});
}
diff --git a/MediaBrowser.Api/HttpHandlers/JsonHandler.cs b/MediaBrowser.Api/HttpHandlers/JsonHandler.cs
new file mode 100644
index 000000000..e663085ec
--- /dev/null
+++ b/MediaBrowser.Api/HttpHandlers/JsonHandler.cs
@@ -0,0 +1,16 @@
+using System.IO;
+using MediaBrowser.Common.Json;
+using MediaBrowser.Net.Handlers;
+
+namespace MediaBrowser.Api.HttpHandlers
+{
+ public abstract class JsonHandler : BaseJsonHandler
+ {
+ protected abstract object ObjectToSerialize { get; }
+
+ protected override void WriteResponseToOutputStream(Stream stream)
+ {
+ JsonSerializer.SerializeToStream(ObjectToSerialize, stream);
+ }
+ }
+}
diff --git a/MediaBrowser.Api/HttpHandlers/MediaHandler.cs b/MediaBrowser.Api/HttpHandlers/MediaHandler.cs
index d04ff2199..47aab3c41 100644
--- a/MediaBrowser.Api/HttpHandlers/MediaHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/MediaHandler.cs
@@ -1,23 +1,12 @@
using System;
using System.IO;
-using System.IO.Compression;
-using MediaBrowser.Common.Net;
using MediaBrowser.Model.Entities;
+using MediaBrowser.Net.Handlers;
namespace MediaBrowser.Api.HttpHandlers
{
- class MediaHandler : Response
+ class MediaHandler : BaseHandler
{
- public MediaHandler(RequestContext ctx)
- : base(ctx)
- {
- WriteStream = s =>
- {
- WriteReponse(s);
- s.Close();
- };
- }
-
private string _MediaPath = string.Empty;
private string MediaPath
{
@@ -46,6 +35,14 @@ namespace MediaBrowser.Api.HttpHandlers
return item.Path;
}
+ public override bool GzipResponse
+ {
+ get
+ {
+ return false;
+ }
+ }
+
public override string ContentType
{
get
@@ -87,7 +84,7 @@ namespace MediaBrowser.Api.HttpHandlers
}
}
- private void WriteReponse(Stream stream)
+ protected override void WriteResponseToOutputStream(Stream stream)
{
try
{
@@ -100,6 +97,5 @@ namespace MediaBrowser.Api.HttpHandlers
{
}
}
-
}
}
diff --git a/MediaBrowser.Api/HttpHandlers/PersonHandler.cs b/MediaBrowser.Api/HttpHandlers/PersonHandler.cs
index 6a9d37679..3c1a0ecf3 100644
--- a/MediaBrowser.Api/HttpHandlers/PersonHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/PersonHandler.cs
@@ -1,16 +1,10 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller;
+using MediaBrowser.Controller;
using MediaBrowser.Model.Entities;
namespace MediaBrowser.Api.HttpHandlers
{
public class PersonHandler : ItemHandler
{
- public PersonHandler(RequestContext ctx)
- : base(ctx)
- {
- }
-
protected override BaseItem ItemToSerialize
{
get
diff --git a/MediaBrowser.Api/HttpHandlers/RecentlyAddedItemsHandler.cs b/MediaBrowser.Api/HttpHandlers/RecentlyAddedItemsHandler.cs
index 8d85eedf4..f36c9c997 100644
--- a/MediaBrowser.Api/HttpHandlers/RecentlyAddedItemsHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/RecentlyAddedItemsHandler.cs
@@ -1,5 +1,4 @@
using System.Collections.Generic;
-using MediaBrowser.Common.Net;
using MediaBrowser.Controller;
using MediaBrowser.Model.Entities;
@@ -7,11 +6,6 @@ namespace MediaBrowser.Api.HttpHandlers
{
class RecentlyAddedItemsHandler : ItemListHandler
{
- public RecentlyAddedItemsHandler(RequestContext ctx)
- : base(ctx)
- {
- }
-
protected override IEnumerable<BaseItem> ItemsToSerialize
{
get
diff --git a/MediaBrowser.Api/HttpHandlers/StudioHandler.cs b/MediaBrowser.Api/HttpHandlers/StudioHandler.cs
index 9426d0b7c..019ced028 100644
--- a/MediaBrowser.Api/HttpHandlers/StudioHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/StudioHandler.cs
@@ -1,5 +1,4 @@
using System.Collections.Generic;
-using MediaBrowser.Common.Net;
using MediaBrowser.Controller;
using MediaBrowser.Model.Entities;
@@ -10,11 +9,6 @@ namespace MediaBrowser.Api.HttpHandlers
/// </summary>
public class StudioHandler : ItemListHandler
{
- public StudioHandler(RequestContext ctx)
- : base(ctx)
- {
- }
-
protected override IEnumerable<BaseItem> ItemsToSerialize
{
get
diff --git a/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs b/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs
index 6b83b9e64..66daca777 100644
--- a/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs
@@ -1,17 +1,12 @@
using System;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Net.Handlers;
+using MediaBrowser.Controller;
using MediaBrowser.Model.Entities;
namespace MediaBrowser.Api.HttpHandlers
{
public class StudiosHandler : JsonHandler
{
- public StudiosHandler(RequestContext ctx)
- : base(ctx)
- {
- }
-
protected sealed override object ObjectToSerialize
{
get
@@ -19,7 +14,7 @@ namespace MediaBrowser.Api.HttpHandlers
Folder parent = ApiService.GetItemById(QueryString["id"]) as Folder;
Guid userId = Guid.Parse(QueryString["userid"]);
- return ApiService.GetAllStudios(parent, userId);
+ return Kernel.Instance.GetAllStudios(parent, userId);
}
}
}
diff --git a/MediaBrowser.Api/HttpHandlers/UsersHandler.cs b/MediaBrowser.Api/HttpHandlers/UsersHandler.cs
index aa8dac11e..816d4e83a 100644
--- a/MediaBrowser.Api/HttpHandlers/UsersHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/UsersHandler.cs
@@ -1,16 +1,10 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Common.Net.Handlers;
+using MediaBrowser.Net.Handlers;
using MediaBrowser.Controller;
namespace MediaBrowser.Api.HttpHandlers
{
class UsersHandler : JsonHandler
{
- public UsersHandler(RequestContext ctx)
- : base(ctx)
- {
- }
-
protected override object ObjectToSerialize
{
get
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-07 15:12:12 +0000