aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-08-22 13:01:05 -0400
committerLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-08-22 13:01:05 -0400
commita2f120b76b4e5192b7d104e505f70921caa64f93 (patch)
treeb9d27bc739ec40303caae7906149280dd8611772
parent020c20bd7d8503d2acdaa1b3c495f1d7f7785636 (diff)
Tweaked json and jsv serializers
-rw-r--r--MediaBrowser.Common/Serialization/JsonSerializer.cs11
-rw-r--r--MediaBrowser.Common/Serialization/JsvSerializer.cs16
2 files changed, 18 insertions, 9 deletions
diff --git a/MediaBrowser.Common/Serialization/JsonSerializer.cs b/MediaBrowser.Common/Serialization/JsonSerializer.cs
index 57b285cee..e73048f17 100644
--- a/MediaBrowser.Common/Serialization/JsonSerializer.cs
+++ b/MediaBrowser.Common/Serialization/JsonSerializer.cs
@@ -19,9 +19,9 @@ namespace MediaBrowser.Common.Serialization
{
Configure();
- using (StreamWriter streamWriter = new StreamWriter(file))
+ using (Stream stream = File.Open(file, FileMode.Create))
{
- ServiceStack.Text.JsonSerializer.SerializeToWriter<T>(obj, streamWriter);
+ ServiceStack.Text.JsonSerializer.SerializeToStream<T>(obj, stream);
}
}
@@ -52,13 +52,6 @@ namespace MediaBrowser.Common.Serialization
return ServiceStack.Text.JsonSerializer.DeserializeFromStream<T>(stream);
}
- public static T DeserializeFromString<T>(string data)
- {
- Configure();
-
- return ServiceStack.Text.JsonSerializer.DeserializeFromString<T>(data);
- }
-
private static bool IsConfigured = false;
private static void Configure()
{
diff --git a/MediaBrowser.Common/Serialization/JsvSerializer.cs b/MediaBrowser.Common/Serialization/JsvSerializer.cs
index c643d41b0..d2a12e059 100644
--- a/MediaBrowser.Common/Serialization/JsvSerializer.cs
+++ b/MediaBrowser.Common/Serialization/JsvSerializer.cs
@@ -18,5 +18,21 @@ namespace MediaBrowser.Common.Serialization
{
return ServiceStack.Text.TypeSerializer.DeserializeFromStream<T>(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);
+ }
+ }
+
+ public static T DeserializeFromFile<T>(string file)
+ {
+ using (Stream stream = File.OpenRead(file))
+ {
+ return ServiceStack.Text.TypeSerializer.DeserializeFromStream<T>(stream);
+ }
+ }
}
}