Merge pull request #6613 from Bond-009/randomaccess

pull/5735/head^2
Claus Vium 3 years ago committed by GitHub
commit c5491dc46c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -246,9 +246,9 @@ namespace Emby.Server.Implementations.IO
{ {
try try
{ {
using (Stream thisFileStream = new FileStream(fileInfo.FullName, FileMode.Open, FileAccess.Read, FileShare.Read, 1)) using (var fileHandle = File.OpenHandle(fileInfo.FullName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
{ {
result.Length = thisFileStream.Length; result.Length = RandomAccess.GetLength(fileHandle);
} }
} }
catch (FileNotFoundException ex) catch (FileNotFoundException ex)

@ -55,8 +55,8 @@ namespace Jellyfin.Server.Infrastructure
// This may or may not be fixed in .NET 6, but looks like it will not https://github.com/dotnet/aspnetcore/issues/34371 // This may or may not be fixed in .NET 6, but looks like it will not https://github.com/dotnet/aspnetcore/issues/34371
if ((fileInfo.Attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint) if ((fileInfo.Attributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint)
{ {
using Stream thisFileStream = File.OpenRead(path); using var fileHandle = File.OpenHandle(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
length = thisFileStream.Length; length = RandomAccess.GetLength(fileHandle);
} }
return new FileMetadata return new FileMetadata

Loading…
Cancel
Save