Lots of fixes. Becoming more stable now. #865

This commit is contained in:
tidusjar 2017-06-21 17:02:29 +01:00
commit dcf97a1008
31 changed files with 1021 additions and 381 deletions

View file

@ -4,11 +4,20 @@ using System.Net.Http;
using System.Threading.Tasks;
using System.Xml.Serialization;
using Newtonsoft.Json;
using Microsoft.Extensions.Logging;
using Ombi.Helpers;
namespace Ombi.Api
{
public class Api
public class Api : IApi
{
public Api(ILogger<Api> log)
{
Logger = log;
}
private ILogger<Api> Logger { get; }
private static readonly JsonSerializerSettings Settings = new JsonSerializerSettings
{
NullValueHandling = NullValueHandling.Ignore
@ -36,12 +45,10 @@ namespace Ombi.Api
{
if (!httpResponseMessage.IsSuccessStatusCode)
{
// Logging
Logger.LogError(LoggingEvents.ApiException, $"StatusCode: {httpResponseMessage.StatusCode}, Reason: {httpResponseMessage.ReasonPhrase}");
}
// do something with the response
var data = httpResponseMessage.Content;
var receivedString = await data.ReadAsStringAsync();
if (request.ContentType == ContentType.Json)
{
@ -82,7 +89,7 @@ namespace Ombi.Api
{
if (!httpResponseMessage.IsSuccessStatusCode)
{
// Logging
Logger.LogError(LoggingEvents.ApiException, $"StatusCode: {httpResponseMessage.StatusCode}, Reason: {httpResponseMessage.ReasonPhrase}");
}
// do something with the response
var data = httpResponseMessage.Content;
@ -116,7 +123,7 @@ namespace Ombi.Api
{
if (!httpResponseMessage.IsSuccessStatusCode)
{
// Logging
Logger.LogError(LoggingEvents.ApiException, $"StatusCode: {httpResponseMessage.StatusCode}, Reason: {httpResponseMessage.ReasonPhrase}");
}
}
}

11
src/Ombi.Api/IApi.cs Normal file
View file

@ -0,0 +1,11 @@
using System.Threading.Tasks;
namespace Ombi.Api
{
public interface IApi
{
Task Request(Request request);
Task<T> Request<T>(Request request);
Task<string> RequestContent(Request request);
}
}

View file

@ -6,8 +6,13 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Ombi.Helpers\Ombi.Helpers.csproj" />
</ItemGroup>
</Project>