aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Common/Json/JsonSerializer.cs
diff options
context:
space:
mode:
authorLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-07-29 11:19:25 -0400
committerLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-07-29 11:19:25 -0400
commit5d88dc857513344a4ecd1b337c1529250e5e2dfa (patch)
tree33142d3b022ab64df737eed584a0a3a723bda6d5 /MediaBrowser.Common/Json/JsonSerializer.cs
parent77e81432f7ff49fed71677c4f7b0cb8b4acc92e3 (diff)
Configuration and serialization improvements
Diffstat (limited to 'MediaBrowser.Common/Json/JsonSerializer.cs')
-rw-r--r--MediaBrowser.Common/Json/JsonSerializer.cs14
1 files changed, 12 insertions, 2 deletions
diff --git a/MediaBrowser.Common/Json/JsonSerializer.cs b/MediaBrowser.Common/Json/JsonSerializer.cs
index a88233489..b7db1d900 100644
--- a/MediaBrowser.Common/Json/JsonSerializer.cs
+++ b/MediaBrowser.Common/Json/JsonSerializer.cs
@@ -1,5 +1,5 @@
-using System.IO;
-using System;
+using System;
+using System.IO;
namespace MediaBrowser.Common.Json
{
@@ -22,6 +22,16 @@ namespace MediaBrowser.Common.Json
}
}
+ public static object DeserializeFromFile(Type type, string file)
+ {
+ Configure();
+
+ using (Stream stream = File.OpenRead(file))
+ {
+ return ServiceStack.Text.JsonSerializer.DeserializeFromStream(type, stream);
+ }
+ }
+
public static T DeserializeFromFile<T>(string file)
{
Configure();