diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-09-06 14:38:29 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-09-06 14:38:29 -0400 |
| commit | 3538789e46d3332a2f20cd6b3db13b2aa9fbe475 (patch) | |
| tree | c0c07f4912fc3c632ca38dc02053ff2108619b02 /MediaBrowser.ApiInteraction/DataSerializer.cs | |
| parent | a529f07869f68918d07f607ca908f89f658236fb (diff) | |
Added User authentication
Diffstat (limited to 'MediaBrowser.ApiInteraction/DataSerializer.cs')
| -rw-r--r-- | MediaBrowser.ApiInteraction/DataSerializer.cs | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/MediaBrowser.ApiInteraction/DataSerializer.cs b/MediaBrowser.ApiInteraction/DataSerializer.cs index 45fd60ecfa..c455bd15ef 100644 --- a/MediaBrowser.ApiInteraction/DataSerializer.cs +++ b/MediaBrowser.ApiInteraction/DataSerializer.cs @@ -13,12 +13,16 @@ namespace MediaBrowser.ApiInteraction {
return Serializer.Deserialize<T>(stream);
}
- if (format == ApiInteraction.SerializationFormats.Jsv)
+ else if (format == ApiInteraction.SerializationFormats.Jsv)
{
return TypeSerializer.DeserializeFromStream<T>(stream);
}
+ else if (format == ApiInteraction.SerializationFormats.Json)
+ {
+ return JsonSerializer.DeserializeFromStream<T>(stream);
+ }
- return JsonSerializer.DeserializeFromStream<T>(stream);
+ throw new NotImplementedException();
}
public static object DeserializeFromStream(Stream stream, SerializationFormats format, Type type)
@@ -27,12 +31,16 @@ namespace MediaBrowser.ApiInteraction {
throw new NotImplementedException();
}
- if (format == ApiInteraction.SerializationFormats.Jsv)
+ else if (format == ApiInteraction.SerializationFormats.Jsv)
{
return TypeSerializer.DeserializeFromStream(type, stream);
}
+ else if (format == ApiInteraction.SerializationFormats.Json)
+ {
+ return JsonSerializer.DeserializeFromStream(type, stream);
+ }
- return JsonSerializer.DeserializeFromStream(type, stream);
+ throw new NotImplementedException();
}
public static void Configure()
|