alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-02 13:58:29 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

sync updates

Browse Source
This commit is contained in:
Luke Pulverenti
2015-03-07 12:19:44 -05:00
parent daf2c28eb7
commit 19ecd450b8
7 changed files with 128 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
MediaBrowser.Common.Implementations/ScheduledTasks/TaskManager.cs
View File

@@ -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>

9
MediaBrowser.Common.Implementations/Serialization/JsonSerializer.cs
View File

@@ -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);
}