diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-23 01:45:26 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-23 01:45:26 -0400 |
| commit | c80c8c1cfd594f2597e46b09d44360ade9f4fec2 (patch) | |
| tree | 6e4ad0b3f3fff80512e9693695aa80725fdbb7ce /MediaBrowser.Common | |
| parent | 882e364326006f19f272b6084ae0e3863945ee5a (diff) | |
Switched all i/o to win32 methods and added protobuf serialization for ffprobe caching
Diffstat (limited to 'MediaBrowser.Common')
| -rw-r--r-- | MediaBrowser.Common/MediaBrowser.Common.csproj | 4 | ||||
| -rw-r--r-- | MediaBrowser.Common/Serialization/ProtobufSerializer.cs | 38 | ||||
| -rw-r--r-- | MediaBrowser.Common/UI/BaseApplication.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Common/packages.config | 1 |
4 files changed, 48 insertions, 0 deletions
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index 7c736affb..c38847b5c 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -33,6 +33,9 @@ <ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
+ <Reference Include="protobuf-net">
+ <HintPath>..\packages\protobuf-net.2.0.0.480\lib\net40\protobuf-net.dll</HintPath>
+ </Reference>
<Reference Include="ServiceStack.Text, Version=3.9.5.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\ServiceStack.Text.3.9.5\lib\net35\ServiceStack.Text.dll</HintPath>
@@ -89,6 +92,7 @@ <Compile Include="Plugins\BasePlugin.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Serialization\JsvSerializer.cs" />
+ <Compile Include="Serialization\ProtobufSerializer.cs" />
<Compile Include="Serialization\XmlSerializer.cs" />
<Compile Include="UI\BaseApplication.cs" />
<Compile Include="UI\Splash.xaml.cs">
diff --git a/MediaBrowser.Common/Serialization/ProtobufSerializer.cs b/MediaBrowser.Common/Serialization/ProtobufSerializer.cs new file mode 100644 index 000000000..9737c9b59 --- /dev/null +++ b/MediaBrowser.Common/Serialization/ProtobufSerializer.cs @@ -0,0 +1,38 @@ +using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.IO;
+
+namespace MediaBrowser.Common.Serialization
+{
+ public static class ProtobufSerializer
+ {
+ public static void SerializeToStream<T>(T obj, Stream stream)
+ {
+ ProtoBuf.Serializer.Serialize<T>(stream, obj);
+ }
+
+ public static T DeserializeFromStream<T>(Stream stream)
+ {
+ return ProtoBuf.Serializer.Deserialize<T>(stream);
+ }
+
+ public static void SerializeToFile<T>(T obj, string file)
+ {
+ using (Stream stream = File.Open(file, FileMode.Create))
+ {
+ SerializeToStream<T>(obj, stream);
+ }
+ }
+
+ public static T DeserializeFromFile<T>(string file)
+ {
+ using (Stream stream = File.OpenRead(file))
+ {
+ return DeserializeFromStream<T>(stream);
+ }
+ }
+ }
+}
diff --git a/MediaBrowser.Common/UI/BaseApplication.cs b/MediaBrowser.Common/UI/BaseApplication.cs index 27c64f451..b526781df 100644 --- a/MediaBrowser.Common/UI/BaseApplication.cs +++ b/MediaBrowser.Common/UI/BaseApplication.cs @@ -48,6 +48,11 @@ namespace MediaBrowser.Common.UI }
catch (Exception ex)
{
+ if (Logger.LoggerInstance != null)
+ {
+ Logger.LogException(ex);
+ }
+
MessageBox.Show("There was an error launching Media Browser: " + ex.Message);
splash.Close();
diff --git a/MediaBrowser.Common/packages.config b/MediaBrowser.Common/packages.config index 6d863a76a..a4e0c9817 100644 --- a/MediaBrowser.Common/packages.config +++ b/MediaBrowser.Common/packages.config @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>
<packages>
+ <package id="protobuf-net" version="2.0.0.480" targetFramework="net45" />
<package id="Rx-Core" version="2.0.20814" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.0.20814" targetFramework="net45" />
<package id="Rx-Linq" version="2.0.20814" targetFramework="net45" />
|