tedkulp/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2026-04-27 23:06:29 -04:00
Code Issues Projects Releases Wiki Activity

Updated Nancy to 2.0

Browse Source
This commit is contained in:
ta264
2019-08-28 22:43:55 +01:00
committed by Taloth Saldono
parent 54604e45e0
commit 90fb1646e0
66 changed files with 370 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Sonarr.Http/Extensions/NancyJsonSerializer.cs
+5 -4
View File
@@ -1,22 +1,23 @@
using System.Collections.Generic;
using System.IO;
using Nancy;
using Nancy.Responses.Negotiation;
using NzbDrone.Common.Serializer;
namespace Sonarr.Http.Extensions
{
public class NancyJsonSerializer : ISerializer
{
public bool CanSerialize(string contentType)
public bool CanSerialize(MediaRange contentType)
{
return true;
return contentType == "application/json";
}
public void Serialize<TModel>(string contentType, TModel model, Stream outputStream)
public void Serialize<TModel>(MediaRange contentType, TModel model, Stream outputStream)
{
Json.Serialize(model, outputStream);
}
public IEnumerable<string> Extensions { get; private set; }
}
}
}
src/Sonarr.Http/Extensions/ReqResExtensions.cs
+3 -3
View File
@@ -32,9 +32,9 @@ namespace Sonarr.Http.Extensions
return Json.Deserialize(value, type);
}
public static JsonResponse<TModel> AsResponse<TModel>(this TModel model, HttpStatusCode statusCode = HttpStatusCode.OK)
public static JsonResponse<TModel> AsResponse<TModel>(this TModel model, NancyContext context, HttpStatusCode statusCode = HttpStatusCode.OK)
{
var response = new JsonResponse<TModel>(model, NancySerializer) { StatusCode = statusCode };
var response = new JsonResponse<TModel>(model, NancySerializer, context.Environment) { StatusCode = statusCode };
response.Headers.DisableCache();
return response;
@@ -59,4 +59,4 @@ namespace Sonarr.Http.Extensions
return headers;
}
}
}
}