starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-21 00:05:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixes #226 - We're holding locks on images

Browse Source
This commit is contained in:
Luke Pulverenti
2013-05-08 14:05:14 -04:00
parent 84714deccc
commit beafdb27f9
2 changed files with 77 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
MediaBrowser.Controller/Drawing/ImageHeader.cs
View File

@@ -1,4 +1,6 @@
using MediaBrowser.Model.Logging;
using System.Threading.Tasks;
using MediaBrowser.Common.IO;
using MediaBrowser.Model.Logging;
using System;
using System.Collections.Generic;
using System.Drawing;
@@ -39,7 +41,7 @@ namespace MediaBrowser.Controller.Drawing
/// <param name="logger">The logger.</param>
/// <returns>The dimensions of the specified image.</returns>
/// <exception cref="ArgumentException">The image was of an unrecognised format.</exception>
public static Size GetDimensions(string path, ILogger logger)
public static async Task<Size> GetDimensions(string path, ILogger logger)
{
try
{
@@ -54,11 +56,17 @@ namespace MediaBrowser.Controller.Drawing
catch
{
logger.Info("Failed to read image header for {0}. Doing it the slow way.", path);
}
using (var fs = File.OpenRead(path))
// Buffer to memory stream to avoid image locking file
using (var fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, StreamDefaults.DefaultFileStreamBufferSize, true))
{
using (var memoryStream = new MemoryStream())
{
await fs.CopyToAsync(memoryStream).ConfigureAwait(false);
// Co it the old fashioned way
using (var b = Image.FromStream(fs, true, false))
using (var b = Image.FromStream(memoryStream, true, false))
{
return b.Size;
}