diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-09-09 01:30:07 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-09-09 01:30:07 -0400 |
| commit | e6d689bdd3429cd5017de355093ee9c2f3fad069 (patch) | |
| tree | 75e6c4eef0bb48ceae70ea802cb36a6073c2f218 /MediaBrowser.ApiInteraction | |
| parent | 50f88997bab58f4cfcbd3f420521776a54eb372d (diff) | |
Added a precompiled protobuf serializer assembly
Diffstat (limited to 'MediaBrowser.ApiInteraction')
| -rw-r--r-- | MediaBrowser.ApiInteraction/BaseApiClient.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.ApiInteraction/DataSerializer.cs | 26 | ||||
| -rw-r--r-- | MediaBrowser.ApiInteraction/MediaBrowser.ApiInteraction.csproj | 3 |
3 files changed, 25 insertions, 5 deletions
diff --git a/MediaBrowser.ApiInteraction/BaseApiClient.cs b/MediaBrowser.ApiInteraction/BaseApiClient.cs index 59fb72911d..02895283c4 100644 --- a/MediaBrowser.ApiInteraction/BaseApiClient.cs +++ b/MediaBrowser.ApiInteraction/BaseApiClient.cs @@ -350,6 +350,7 @@ namespace MediaBrowser.ApiInteraction }
protected T DeserializeFromStream<T>(Stream stream)
+ where T : class
{
return DataSerializer.DeserializeFromStream<T>(stream, SerializationFormat);
}
diff --git a/MediaBrowser.ApiInteraction/DataSerializer.cs b/MediaBrowser.ApiInteraction/DataSerializer.cs index c455bd15ef..ae3a72e622 100644 --- a/MediaBrowser.ApiInteraction/DataSerializer.cs +++ b/MediaBrowser.ApiInteraction/DataSerializer.cs @@ -1,17 +1,29 @@ -using System;
+using ServiceStack.Text;
+using System;
using System.IO;
-using ProtoBuf;
-using ServiceStack.Text;
namespace MediaBrowser.ApiInteraction
{
public static class DataSerializer
{
+ /// <summary>
+ /// This is an auto-generated Protobuf Serialization assembly for best performance.
+ /// It is created during the Model project's post-build event.
+ /// This means that this class can currently only handle types within the Model project.
+ /// If we need to, we can always add a param indicating whether or not the model serializer should be used.
+ /// </summary>
+ private static ProtobufModelSerializer ProtobufModelSerializer = new ProtobufModelSerializer();
+
+ /// <summary>
+ /// Deserializes an object using generics
+ /// </summary>
public static T DeserializeFromStream<T>(Stream stream, SerializationFormats format)
+ where T : class
{
if (format == ApiInteraction.SerializationFormats.Protobuf)
{
- return Serializer.Deserialize<T>(stream);
+ //return Serializer.Deserialize<T>(stream);
+ return ProtobufModelSerializer.Deserialize(stream, null, typeof(T)) as T;
}
else if (format == ApiInteraction.SerializationFormats.Jsv)
{
@@ -25,11 +37,15 @@ namespace MediaBrowser.ApiInteraction throw new NotImplementedException();
}
+ /// <summary>
+ /// Deserializes an object
+ /// </summary>
public static object DeserializeFromStream(Stream stream, SerializationFormats format, Type type)
{
if (format == ApiInteraction.SerializationFormats.Protobuf)
{
- throw new NotImplementedException();
+ //throw new NotImplementedException();
+ return ProtobufModelSerializer.Deserialize(stream, null, type);
}
else if (format == ApiInteraction.SerializationFormats.Jsv)
{
diff --git a/MediaBrowser.ApiInteraction/MediaBrowser.ApiInteraction.csproj b/MediaBrowser.ApiInteraction/MediaBrowser.ApiInteraction.csproj index aba95a93ad..a1c5f5175c 100644 --- a/MediaBrowser.ApiInteraction/MediaBrowser.ApiInteraction.csproj +++ b/MediaBrowser.ApiInteraction/MediaBrowser.ApiInteraction.csproj @@ -33,6 +33,9 @@ <Reference Include="protobuf-net">
<HintPath>..\protobuf-net\Full\net30\protobuf-net.dll</HintPath>
</Reference>
+ <Reference Include="ProtobufModelSerializer">
+ <HintPath>..\MediaBrowser.Model\bin\ProtobufModelSerializer.dll</HintPath>
+ </Reference>
<Reference Include="ServiceStack.Text">
<HintPath>..\packages\ServiceStack.Text.3.9.5\lib\net35\ServiceStack.Text.dll</HintPath>
</Reference>
|