From 19ecd450b830aab55a270b5b1e0ba71b45adb489 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 7 Mar 2015 12:19:44 -0500
Subject: sync updates

---
 .../ScheduledTasks/TaskManager.cs                            | 12 ++++++++++++
 .../Serialization/JsonSerializer.cs                          |  9 +++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Common.Implementations')

diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/TaskManager.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/TaskManager.cs
index a77efe855b..4f84652c60 100644
--- a/MediaBrowser.Common.Implementations/ScheduledTasks/TaskManager.cs
+++ b/MediaBrowser.Common.Implementations/ScheduledTasks/TaskManager.cs
@@ -79,6 +79,12 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
             QueueScheduledTask<T>(options);
         }
 
+        public void CancelIfRunningAndQueue<T>()
+               where T : IScheduledTask
+        {
+            CancelIfRunningAndQueue<T>(new TaskExecutionOptions());
+        }
+
         /// <summary>
         /// Cancels if running
         /// </summary>
@@ -103,6 +109,12 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
             QueueScheduledTask(scheduledTask, options);
         }
 
+        public void QueueScheduledTask<T>()
+            where T : IScheduledTask
+        {
+            QueueScheduledTask<T>(new TaskExecutionOptions());
+        }
+        
         /// <summary>
         /// Queues the scheduled task.
         /// </summary>
diff --git a/MediaBrowser.Common.Implementations/Serialization/JsonSerializer.cs b/MediaBrowser.Common.Implementations/Serialization/JsonSerializer.cs
index e7fd121788..b49551ea99 100644
--- a/MediaBrowser.Common.Implementations/Serialization/JsonSerializer.cs
+++ b/MediaBrowser.Common.Implementations/Serialization/JsonSerializer.cs
@@ -59,6 +59,11 @@ namespace MediaBrowser.Common.Implementations.Serialization
             }
         }
 
+        private Stream OpenFile(string path)
+        {
+            return new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read);
+        }
+
         /// <summary>
         /// Deserializes from file.
         /// </summary>
@@ -78,7 +83,7 @@ namespace MediaBrowser.Common.Implementations.Serialization
                 throw new ArgumentNullException("file");
             }
 
-            using (Stream stream = File.OpenRead(file))
+            using (Stream stream = OpenFile(file))
             {
                 return DeserializeFromStream(stream, type);
             }
@@ -99,7 +104,7 @@ namespace MediaBrowser.Common.Implementations.Serialization
                 throw new ArgumentNullException("file");
             }
 
-            using (Stream stream = File.OpenRead(file))
+            using (Stream stream = OpenFile(file))
             {
                 return DeserializeFromStream<T>(stream);
             }
-- 
cgit v1.2.3