alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-08 08:48:48 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Updated ApiInteraction.Metro to use json.net

Browse Source
This commit is contained in:
LukePulverenti Luke Pulverenti luke pulverenti
2012-09-06 10:44:45 -04:00
parent 507beb76f6
commit 94c8332e26
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
MediaBrowser.ApiInteraction.Metro/DataSerializer.cs
View File

@@ -1,7 +1,7 @@
using System;
using System.IO;
using Newtonsoft.Json;
using ProtoBuf;
using ServiceStack.Text;
namespace MediaBrowser.ApiInteraction
{
@@ -15,10 +15,16 @@ namespace MediaBrowser.ApiInteraction
}
if (format == ApiInteraction.SerializationFormats.Jsv)
{
return TypeSerializer.DeserializeFromStream<T>(stream);
throw new NotImplementedException();
}
return JsonSerializer.DeserializeFromStream<T>(stream);
using (StreamReader streamReader = new StreamReader(stream))
{
using (JsonReader jsonReader = new JsonTextReader(streamReader))
{
return JsonSerializer.Create(new JsonSerializerSettings()).Deserialize<T>(jsonReader);
}
}
}
public static object DeserializeFromStream(Stream stream, SerializationFormats format, Type type)
@@ -29,17 +35,20 @@ namespace MediaBrowser.ApiInteraction
}
if (format == ApiInteraction.SerializationFormats.Jsv)
{
return TypeSerializer.DeserializeFromStream(type, stream);
throw new NotImplementedException();
}
return JsonSerializer.DeserializeFromStream(type, stream);
using (StreamReader streamReader = new StreamReader(stream))
{
using (JsonReader jsonReader = new JsonTextReader(streamReader))
{
return JsonSerializer.Create(new JsonSerializerSettings()).Deserialize(jsonReader, type);
}
}
}
public static void Configure()
{
JsConfig.DateHandler = ServiceStack.Text.JsonDateHandler.ISO8601;
JsConfig.ExcludeTypeInfo = true;
JsConfig.IncludeNullValues = false;
}
public static bool CanDeSerializeJsv