Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7300 from cvium/fix_keepreading

Browse Source
This commit is contained in:
Bond-009 2022-02-12 20:24:02 +01:00 committed by GitHub
commit 69e7deb07d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Jellyfin.Api/Helpers/ProgressiveFileStream.cs
View File

@ -83,10 +83,10 @@ namespace Jellyfin.Api.Helpers
int totalBytesRead = 0; int totalBytesRead = 0;
var stopwatch = Stopwatch.StartNew(); var stopwatch = Stopwatch.StartNew();
while (KeepReading(stopwatch.ElapsedMilliseconds)) while (true)
{ {
totalBytesRead += _stream.Read(buffer); totalBytesRead += _stream.Read(buffer);
if (totalBytesRead > 0) if (StopReading(totalBytesRead, stopwatch.ElapsedMilliseconds))
{ {
break; break;
} }
@ -109,10 +109,10 @@ namespace Jellyfin.Api.Helpers
int totalBytesRead = 0; int totalBytesRead = 0;
var stopwatch = Stopwatch.StartNew(); var stopwatch = Stopwatch.StartNew();
while (KeepReading(stopwatch.ElapsedMilliseconds)) while (true)
{ {
totalBytesRead += await _stream.ReadAsync(buffer, cancellationToken).ConfigureAwait(false); totalBytesRead += await _stream.ReadAsync(buffer, cancellationToken).ConfigureAwait(false);
if (totalBytesRead > 0) if (StopReading(totalBytesRead, stopwatch.ElapsedMilliseconds))
{ {
break; break;
} }
@ -172,10 +172,12 @@ namespace Jellyfin.Api.Helpers
} }
} }
private bool KeepReading(long elapsed) private bool StopReading(int bytesRead, long elapsed)
{ {
// If the job is null it's a live stream and will require user action to close, but don't keep it open indefinitely // It should stop reading when anything has been successfully read or if the job has exited
return !_job?.HasExited ?? elapsed < _timeoutMs; // If the job is null, however, it's a live stream and will require user action to close,
// but don't keep it open indefinitely if it isn't reading anything
return bytesRead > 0 || (_job?.HasExited ?? elapsed >= _timeoutMs);
} }
} }
} }