From f1a5261e0a1aabc2a27689a0bd138c554ad060ae Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Sun, 17 May 2015 18:24:00 +0200 Subject: [PATCH] Properly dispose filestream after getting mediainfo. --- .../MediaInfo/VideoFileInfoReaderFixture.cs | 12 ++++++++++++ .../MediaFiles/MediaInfo/VideoFileInfoReader.cs | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/VideoFileInfoReaderFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/VideoFileInfoReaderFixture.cs index 438766c0f..475c0b3c4 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/VideoFileInfoReaderFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/VideoFileInfoReaderFixture.cs @@ -88,5 +88,17 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo info.Width.Should().Be(480); } + + [Test] + public void should_dispose_file_after_scanning_mediainfo() + { + var path = Path.Combine(Directory.GetCurrentDirectory(), "Files", "Media", "H264_sample.mp4"); + + var info = Subject.GetMediaInfo(path); + + var stream = new FileStream(path, FileMode.Open, FileAccess.Write); + + stream.Close(); + } } } \ No newline at end of file diff --git a/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs b/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs index e43b3cf48..61a1d84ef 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/VideoFileInfoReader.cs @@ -41,7 +41,12 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo mediaInfo.Option("ParseSpeed", "0.2"); - int open = mediaInfo.Open(_diskProvider.OpenReadStream(filename)); + int open; + + using (var stream = _diskProvider.OpenReadStream(filename)) + { + open = mediaInfo.Open(stream); + } if (open != 0) {