diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-09-03 17:56:30 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-09-03 17:56:30 -0400 |
| commit | fc735e918723f5bfdd64979afa4995a6fec80e7c (patch) | |
| tree | 7777e8f0954a29953ed64beb79f4f58c5bda6aab /MediaBrowser.Common/Serialization | |
| parent | 7f8a4772786ed32781eab011cedb3260c9e2dd33 (diff) | |
Tweaked plugin downloading a bit
Diffstat (limited to 'MediaBrowser.Common/Serialization')
4 files changed, 31 insertions, 4 deletions
diff --git a/MediaBrowser.Common/Serialization/JsonSerializer.cs b/MediaBrowser.Common/Serialization/JsonSerializer.cs index e73048f17..b1c0726e5 100644 --- a/MediaBrowser.Common/Serialization/JsonSerializer.cs +++ b/MediaBrowser.Common/Serialization/JsonSerializer.cs @@ -52,6 +52,13 @@ namespace MediaBrowser.Common.Serialization return ServiceStack.Text.JsonSerializer.DeserializeFromStream<T>(stream);
}
+ public static object DeserializeFromStream(Stream stream, Type type)
+ {
+ Configure();
+
+ return ServiceStack.Text.JsonSerializer.DeserializeFromStream(type, stream);
+ }
+
private static bool IsConfigured = false;
private static void Configure()
{
diff --git a/MediaBrowser.Common/Serialization/JsvSerializer.cs b/MediaBrowser.Common/Serialization/JsvSerializer.cs index 24c4b074e..d482348af 100644 --- a/MediaBrowser.Common/Serialization/JsvSerializer.cs +++ b/MediaBrowser.Common/Serialization/JsvSerializer.cs @@ -1,4 +1,5 @@ -using System.IO;
+using System;
+using System.IO;
namespace MediaBrowser.Common.Serialization
{
@@ -19,11 +20,16 @@ namespace MediaBrowser.Common.Serialization return ServiceStack.Text.TypeSerializer.DeserializeFromStream<T>(stream);
}
+ public static object DeserializeFromStream(Stream stream, Type type)
+ {
+ return ServiceStack.Text.TypeSerializer.DeserializeFromStream(type, stream);
+ }
+
public static void SerializeToFile<T>(T obj, string file)
{
using (Stream stream = File.Open(file, FileMode.Create))
{
- ServiceStack.Text.TypeSerializer.SerializeToStream<T>(obj, stream);
+ SerializeToStream<T>(obj, stream);
}
}
@@ -31,7 +37,7 @@ namespace MediaBrowser.Common.Serialization {
using (Stream stream = File.OpenRead(file))
{
- return ServiceStack.Text.TypeSerializer.DeserializeFromStream<T>(stream);
+ return DeserializeFromStream<T>(stream);
}
}
}
diff --git a/MediaBrowser.Common/Serialization/ProtobufSerializer.cs b/MediaBrowser.Common/Serialization/ProtobufSerializer.cs index 701ef7029..6151e8341 100644 --- a/MediaBrowser.Common/Serialization/ProtobufSerializer.cs +++ b/MediaBrowser.Common/Serialization/ProtobufSerializer.cs @@ -1,4 +1,5 @@ -using System.IO;
+using System;
+using System.IO;
namespace MediaBrowser.Common.Serialization
{
@@ -18,6 +19,11 @@ namespace MediaBrowser.Common.Serialization return ProtoBuf.Serializer.Deserialize<T>(stream);
}
+ public static object DeserializeFromStream(Stream stream, Type type)
+ {
+ throw new NotImplementedException();
+ }
+
public static void SerializeToFile<T>(T obj, string file)
{
using (Stream stream = File.Open(file, FileMode.Create))
diff --git a/MediaBrowser.Common/Serialization/XmlSerializer.cs b/MediaBrowser.Common/Serialization/XmlSerializer.cs index 90361e2b9..b881591dd 100644 --- a/MediaBrowser.Common/Serialization/XmlSerializer.cs +++ b/MediaBrowser.Common/Serialization/XmlSerializer.cs @@ -39,6 +39,14 @@ namespace MediaBrowser.Common.Serialization }
}
+ public static void SerializeToFile(object obj, string file)
+ {
+ using (FileStream stream = new FileStream(file, FileMode.Create))
+ {
+ ServiceStack.Text.XmlSerializer.SerializeToStream(obj, stream);
+ }
+ }
+
public static object DeserializeFromFile(Type type, string file)
{
using (Stream stream = File.OpenRead(file))
|