diff options
| author | Bond-009 <bond.009@outlook.com> | 2019-07-06 23:08:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-06 23:08:52 +0200 |
| commit | 82f041d050f998d20818efff063b6000dfcbf5d2 (patch) | |
| tree | 3be5cf1a79180c57a5381e26f60d61088a27b49e /MediaBrowser.Controller/MediaEncoding/JobLogger.cs | |
| parent | 4f17ed961e2756e0c65b1bb0246e7f62a5f44a8a (diff) | |
| parent | ba551b48e1e1c80192e10b1bb340d974c6b6dee2 (diff) | |
Merge branch 'master' into release-10.3.z
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/JobLogger.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/JobLogger.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/JobLogger.cs b/MediaBrowser.Controller/MediaEncoding/JobLogger.cs index 2755bf581..ac989f6ba 100644 --- a/MediaBrowser.Controller/MediaEncoding/JobLogger.cs +++ b/MediaBrowser.Controller/MediaEncoding/JobLogger.cs @@ -3,6 +3,7 @@ using System.Globalization; using System.IO; using System.Linq; using System.Text; +using System.Threading.Tasks; using MediaBrowser.Model.Extensions; using Microsoft.Extensions.Logging; @@ -18,10 +19,11 @@ namespace MediaBrowser.Controller.MediaEncoding _logger = logger; } - public async void StartStreamingLog(EncodingJobInfo state, Stream source, Stream target) + public async Task StartStreamingLog(EncodingJobInfo state, Stream source, Stream target) { try { + using (target) using (var reader = new StreamReader(source)) { while (!reader.EndOfStream && reader.BaseStream.CanRead) @@ -97,8 +99,7 @@ namespace MediaBrowser.Controller.MediaEncoding { var currentMs = startMs + val.TotalMilliseconds; - var percentVal = currentMs / totalMs; - percent = 100 * percentVal; + percent = 100.0 * currentMs / totalMs; transcodingPosition = val; } |
