1 files changed, 26 insertions, 22 deletions
diff --git a/MediaBrowser.ApiInteraction/DataSerializer.cs b/MediaBrowser.ApiInteraction/DataSerializer.cs
index 15039cd45..45fd60ecf 100644
--- a/MediaBrowser.ApiInteraction/DataSerializer.cs
+++ b/MediaBrowser.ApiInteraction/DataSerializer.cs
@@ -7,30 +7,33 @@ namespace MediaBrowser.ApiInteraction
 {
     public static class DataSerializer
     {
-        public static T DeserializeJsonFromStream<T>(Stream stream)
+        public static T DeserializeFromStream<T>(Stream stream, SerializationFormats format)
         {
-            return JsonSerializer.DeserializeFromStream<T>(stream);
-        }
+            if (format == ApiInteraction.SerializationFormats.Protobuf)
+            {
+                return Serializer.Deserialize<T>(stream);
+            }
+            if (format == ApiInteraction.SerializationFormats.Jsv)
+            {
+                return TypeSerializer.DeserializeFromStream<T>(stream);
+            }
 
-        public static T DeserializeJsvFromStream<T>(Stream stream)
-        {
-            return TypeSerializer.DeserializeFromStream<T>(stream);
+            return JsonSerializer.DeserializeFromStream<T>(stream);
         }
 
-        public static object DeserializeJsvFromStream(Stream stream, Type type)
+        public static object DeserializeFromStream(Stream stream, SerializationFormats format, Type type)
         {
-            return TypeSerializer.DeserializeFromStream(type, stream);
-        }
+            if (format == ApiInteraction.SerializationFormats.Protobuf)
+            {
+                throw new NotImplementedException();
+            }
+            if (format == ApiInteraction.SerializationFormats.Jsv)
+            {
+                return TypeSerializer.DeserializeFromStream(type, stream);
+            }
 
-        public static object DeserializeJsonFromStream(Stream stream, Type type)
-        {
             return JsonSerializer.DeserializeFromStream(type, stream);
         }
-        
-        public static T DeserializeProtobufFromStream<T>(Stream stream)
-        {
-            return Serializer.Deserialize<T>(stream);
-        }
 
         public static void Configure()
         {
@@ -38,12 +41,13 @@ namespace MediaBrowser.ApiInteraction
             JsConfig.ExcludeTypeInfo = true;
             JsConfig.IncludeNullValues = false;
         }
-    }
 
-    public enum SerializationFormat
-    {
-        Json,
-        Jsv,
-        Protobuf
+        public static bool CanDeSerializeJsv
+        {
+            get
+            {
+                return true;
+            }
+        }
     }
 }