Merge pull request #8 from jellyfin/master

rebase to latest master

13 files changed, 165 insertions, 155 deletions

diff --git a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
index 71fefba44..605504418 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/AssParser.cs
@@ -1,4 +1,3 @@
-using MediaBrowser.Model.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -6,6 +5,7 @@ using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.MediaInfo;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
@@ -17,26 +17,26 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         public SubtitleTrackInfo Parse(Stream stream, CancellationToken cancellationToken)
         {
             var trackInfo = new SubtitleTrackInfo();
-            List<SubtitleTrackEvent> trackEvents = new List<SubtitleTrackEvent>();
+            var trackEvents = new List<SubtitleTrackEvent>();
             var eventIndex = 1;
             using (var reader = new StreamReader(stream))
             {
                 string line;
                 while (reader.ReadLine() != "[Events]")
-                {}
+                { }
                 var headers = ParseFieldHeaders(reader.ReadLine());
 
                 while ((line = reader.ReadLine()) != null)
                 {
                     cancellationToken.ThrowIfCancellationRequested();
-                    
+
                     if (string.IsNullOrWhiteSpace(line))
                     {
                         continue;
                     }
-                    if(line.StartsWith("["))
+                    if (line.StartsWith("["))
                         break;
-                    if(string.IsNullOrEmpty(line))
+                    if (string.IsNullOrEmpty(line))
                         continue;
                     var subEvent = new SubtitleTrackEvent { Id = eventIndex.ToString(_usCulture) };
                     eventIndex++;
@@ -49,7 +49,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     RemoteNativeFormatting(subEvent);
 
                     subEvent.Text = subEvent.Text.Replace("\\n", ParserValues.NewLine, StringComparison.OrdinalIgnoreCase);
-                    
+
                     subEvent.Text = Regex.Replace(subEvent.Text, @"\{(\\[\w]+\(?([\w\d]+,?)+\)?)+\}", string.Empty, RegexOptions.IgnoreCase);
 
                     trackEvents.Add(subEvent);
@@ -61,13 +61,13 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
         long GetTicks(string time)
         {
-            TimeSpan span;
-            return TimeSpan.TryParseExact(time, @"h\:mm\:ss\.ff", _usCulture, out span)
-                ? span.Ticks: 0;
+            return TimeSpan.TryParseExact(time, @"h\:mm\:ss\.ff", _usCulture, out var span)
+                ? span.Ticks : 0;
         }
 
-        private Dictionary<string,int> ParseFieldHeaders(string line) {
-            var fields = line.Substring(8).Split(',').Select(x=>x.Trim()).ToList();
+        private Dictionary<string, int> ParseFieldHeaders(string line)
+        {
+            var fields = line.Substring(8).Split(',').Select(x => x.Trim()).ToList();
 
             var result = new Dictionary<string, int> {
                                                          {"Start", fields.IndexOf("Start")},
diff --git a/MediaBrowser.MediaEncoding/Subtitles/ConfigurationExtension.cs b/MediaBrowser.MediaEncoding/Subtitles/ConfigurationExtension.cs
index 973c653a4..92544f4f6 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/ConfigurationExtension.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/ConfigurationExtension.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.Providers;
 
diff --git a/MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs b/MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs
index 75de81f46..f0d107196 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/ISubtitleParser.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Threading;
 using MediaBrowser.Model.MediaInfo;
 
diff --git a/MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs
index e28da9185..3401c2d67 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/ISubtitleWriter.cs
@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Threading;
 using MediaBrowser.Model.MediaInfo;
 
diff --git a/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
index 474f712f9..8995fcfe1 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/JsonWriter.cs
@@ -1,8 +1,8 @@
-using MediaBrowser.Model.MediaInfo;
-using MediaBrowser.Model.Serialization;
 using System.IO;
 using System.Text;
 using System.Threading;
+using MediaBrowser.Model.MediaInfo;
+using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
diff --git a/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs b/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs
index 2d29f29e3..a1d925881 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/OpenSubtitleDownloader.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
@@ -46,7 +46,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             _config.NamedConfigurationUpdating += _config_NamedConfigurationUpdating;
 
             Utilities.HttpClient = httpClient;
-            OpenSubtitles.SetUserAgent("mediabrowser.tv");
+            OpenSubtitles.SetUserAgent("jellyfin");
         }
 
         private const string PasswordHashPrefix = "h:";
@@ -83,10 +83,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             return _encryption.DecryptString(password.Substring(2));
         }
 
-        public string Name
-        {
-            get { return "Open Subtitles"; }
-        }
+        public string Name => "Open Subtitles";
 
         private SubtitleOptions GetOptions()
         {
@@ -121,7 +118,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         {
             if (string.IsNullOrWhiteSpace(id))
             {
-                throw new ArgumentNullException("id");
+                throw new ArgumentNullException(nameof(id));
             }
 
             var idParts = id.Split(new[] { '-' }, 3);
diff --git a/MediaBrowser.MediaEncoding/Subtitles/ParserValues.cs b/MediaBrowser.MediaEncoding/Subtitles/ParserValues.cs
index b8c2fef1e..bf8808eb8 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/ParserValues.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/ParserValues.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.MediaEncoding.Subtitles
+namespace MediaBrowser.MediaEncoding.Subtitles
 {
     public class ParserValues
     {
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
index 7ca8aa1fd..0606dbdb2 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SrtParser.cs
@@ -1,12 +1,12 @@
-using MediaBrowser.Model.Extensions;
-using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.MediaInfo;
+using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
@@ -24,8 +24,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         public SubtitleTrackInfo Parse(Stream stream, CancellationToken cancellationToken)
         {
             var trackInfo = new SubtitleTrackInfo();
-            List<SubtitleTrackEvent> trackEvents = new List<SubtitleTrackEvent>();
-            using ( var reader = new StreamReader(stream))
+            var trackEvents = new List<SubtitleTrackEvent>();
+            using (var reader = new StreamReader(stream))
             {
                 string line;
                 while ((line = reader.ReadLine()) != null)
@@ -36,14 +36,14 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     {
                         continue;
                     }
-                    var subEvent = new SubtitleTrackEvent {Id = line};
+                    var subEvent = new SubtitleTrackEvent { Id = line };
                     line = reader.ReadLine();
 
                     if (string.IsNullOrWhiteSpace(line))
                     {
                         continue;
                     }
-                    
+
                     var time = Regex.Split(line, @"[\t ]*-->[\t ]*");
 
                     if (time.Length < 2)
@@ -81,11 +81,11 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             return trackInfo;
         }
 
-        long GetTicks(string time) {
-            TimeSpan span;
-            return TimeSpan.TryParseExact(time, @"hh\:mm\:ss\.fff", _usCulture, out span)
+        long GetTicks(string time)
+        {
+            return TimeSpan.TryParseExact(time, @"hh\:mm\:ss\.fff", _usCulture, out var span)
                 ? span.Ticks
-                : (TimeSpan.TryParseExact(time, @"hh\:mm\:ss\,fff", _usCulture, out span) 
+                : (TimeSpan.TryParseExact(time, @"hh\:mm\:ss\,fff", _usCulture, out span)
                 ? span.Ticks : 0);
         }
     }
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs
index c05929fde..6f96a641e 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SrtWriter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.IO;
 using System.Text;
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
index a2cee7793..2c18a02ef 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
@@ -1,10 +1,10 @@
-using MediaBrowser.Model.Extensions;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Threading;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.MediaInfo;
-using System.Collections.Generic;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
@@ -16,7 +16,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         public SubtitleTrackInfo Parse(Stream stream, CancellationToken cancellationToken)
         {
             var trackInfo = new SubtitleTrackInfo();
-            List<SubtitleTrackEvent> trackEvents = new List<SubtitleTrackEvent>();
+            var trackEvents = new List<SubtitleTrackEvent>();
 
             using (var reader = new StreamReader(stream))
             {
@@ -129,10 +129,10 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                             }
                         }
                     }
-                } 
-                
+                }
+
                 //if (header.Length > 0)
-                    //subtitle.Header = header.ToString();
+                //subtitle.Header = header.ToString();
 
                 //subtitle.Renumber(1);
             }
@@ -288,8 +288,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
         private static bool IsInteger(string s)
         {
-            int i;
-            if (int.TryParse(s, out i))
+            if (int.TryParse(s, out var i))
                 return true;
             return false;
         }
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index a1dc9b7d4..59a624433 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -1,26 +1,25 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.Model.Entities;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.MediaInfo;
-using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Concurrent;
-using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Model.IO;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Diagnostics;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Text;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.MediaInfo;
+using MediaBrowser.Model.Serialization;
+using Microsoft.Extensions.Logging;
+using UtfUnknown;
 
 namespace MediaBrowser.MediaEncoding.Subtitles
 {
@@ -35,22 +34,20 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         private readonly IHttpClient _httpClient;
         private readonly IMediaSourceManager _mediaSourceManager;
         private readonly IProcessFactory _processFactory;
-        private readonly ITextEncoding _textEncoding;
 
         public SubtitleEncoder(
             ILibraryManager libraryManager,
-            ILogger logger,
+            ILoggerFactory loggerFactory,
             IApplicationPaths appPaths,
             IFileSystem fileSystem,
             IMediaEncoder mediaEncoder,
             IJsonSerializer json,
             IHttpClient httpClient,
             IMediaSourceManager mediaSourceManager,
-            IProcessFactory processFactory,
-            ITextEncoding textEncoding)
+            IProcessFactory processFactory)
         {
             _libraryManager = libraryManager;
-            _logger = logger;
+            _logger = loggerFactory.CreateLogger(nameof(SubtitleEncoder));
             _appPaths = appPaths;
             _fileSystem = fileSystem;
             _mediaEncoder = mediaEncoder;
@@ -58,22 +55,15 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             _httpClient = httpClient;
             _mediaSourceManager = mediaSourceManager;
             _processFactory = processFactory;
-            _textEncoding = textEncoding;
         }
 
-        private string SubtitleCachePath
-        {
-            get
-            {
-                return Path.Combine(_appPaths.DataPath, "subtitles");
-            }
-        }
+        private string SubtitleCachePath => Path.Combine(_appPaths.DataPath, "subtitles");
 
         private Stream ConvertSubtitles(Stream stream,
             string inputFormat,
             string outputFormat,
             long startTimeTicks,
-            long? endTimeTicks,
+            long endTimeTicks,
             bool preserveOriginalTimestamps,
             CancellationToken cancellationToken)
         {
@@ -101,19 +91,17 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             return ms;
         }
 
-        private void FilterEvents(SubtitleTrackInfo track, long startPositionTicks, long? endTimeTicks, bool preserveTimestamps)
+        private void FilterEvents(SubtitleTrackInfo track, long startPositionTicks, long endTimeTicks, bool preserveTimestamps)
         {
             // Drop subs that are earlier than what we're looking for
             track.TrackEvents = track.TrackEvents
                 .SkipWhile(i => (i.StartPositionTicks - startPositionTicks) < 0 || (i.EndPositionTicks - startPositionTicks) < 0)
                 .ToArray();
 
-            if (endTimeTicks.HasValue)
+            if (endTimeTicks > 0)
             {
-                var endTime = endTimeTicks.Value;
-
                 track.TrackEvents = track.TrackEvents
-                    .TakeWhile(i => i.StartPositionTicks <= endTime)
+                    .TakeWhile(i => i.StartPositionTicks <= endTimeTicks)
                     .ToArray();
             }
 
@@ -131,11 +119,11 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         {
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
             if (string.IsNullOrWhiteSpace(mediaSourceId))
             {
-                throw new ArgumentNullException("mediaSourceId");
+                throw new ArgumentNullException(nameof(mediaSourceId));
             }
 
             // TODO network path substition useful ?
@@ -150,48 +138,51 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             var subtitle = await GetSubtitleStream(mediaSource, subtitleStream, cancellationToken)
                         .ConfigureAwait(false);
 
-            var inputFormat = subtitle.Item2;
+            var inputFormat = subtitle.format;
             var writer = TryGetWriter(outputFormat);
 
             // Return the original if we don't have any way of converting it
             if (writer == null)
             {
-                return subtitle.Item1;
+                return subtitle.stream;
             }
 
             // Return the original if the same format is being requested
             // Character encoding was already handled in GetSubtitleStream
             if (string.Equals(inputFormat, outputFormat, StringComparison.OrdinalIgnoreCase))
             {
-                return subtitle.Item1;
+                return subtitle.stream;
             }
 
-            using (var stream = subtitle.Item1)
+            using (var stream = subtitle.stream)
             {
-                return  ConvertSubtitles(stream, inputFormat, outputFormat, startTimeTicks, endTimeTicks, preserveOriginalTimestamps, cancellationToken);
+                return ConvertSubtitles(stream, inputFormat, outputFormat, startTimeTicks, endTimeTicks, preserveOriginalTimestamps, cancellationToken);
             }
         }
 
-        private async Task<Tuple<Stream, string>> GetSubtitleStream(MediaSourceInfo mediaSource,
+        private async Task<(Stream stream, string format)> GetSubtitleStream(
+            MediaSourceInfo mediaSource,
             MediaStream subtitleStream,
             CancellationToken cancellationToken)
         {
-            var inputFiles = new[] { mediaSource.Path };
+            string[] inputFiles;
 
-            if (mediaSource.VideoType.HasValue)
+            if (mediaSource.VideoType.HasValue
+                && (mediaSource.VideoType.Value == VideoType.BluRay || mediaSource.VideoType.Value == VideoType.Dvd))
             {
-                if (mediaSource.VideoType.Value == VideoType.BluRay || mediaSource.VideoType.Value == VideoType.Dvd)
-                {
-                    var mediaSourceItem = (Video)_libraryManager.GetItemById(new Guid(mediaSource.Id));
-                    inputFiles = mediaSourceItem.GetPlayableStreamFileNames(_mediaEncoder).ToArray();
-                }
+                var mediaSourceItem = (Video)_libraryManager.GetItemById(new Guid(mediaSource.Id));
+                inputFiles = mediaSourceItem.GetPlayableStreamFileNames(_mediaEncoder);
+            }
+            else
+            {
+                inputFiles = new[] { mediaSource.Path };
             }
 
             var fileInfo = await GetReadableFile(mediaSource.Path, inputFiles, mediaSource.Protocol, subtitleStream, cancellationToken).ConfigureAwait(false);
 
-            var stream = await GetSubtitleStream(fileInfo.Item1, subtitleStream.Language, fileInfo.Item2, fileInfo.Item4, cancellationToken).ConfigureAwait(false);
+            var stream = await GetSubtitleStream(fileInfo.Path, subtitleStream.Language, fileInfo.Protocol, fileInfo.IsExternal, cancellationToken).ConfigureAwait(false);
 
-            return new Tuple<Stream, string>(stream, fileInfo.Item3);
+            return (stream, fileInfo.Format);
         }
 
         private async Task<Stream> GetSubtitleStream(string path, string language, MediaProtocol protocol, bool requiresCharset, CancellationToken cancellationToken)
@@ -200,21 +191,21 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             {
                 var bytes = await GetBytes(path, protocol, cancellationToken).ConfigureAwait(false);
 
-                var charset = _textEncoding.GetDetectedEncodingName(bytes, bytes.Length, language, true);
-                _logger.LogDebug("charset {0} detected for {1}", charset ?? "null", path);
+                var charset = CharsetDetector.DetectFromBytes(bytes).Detected?.EncodingName;
+                _logger.LogDebug("charset {CharSet} detected for {Path}", charset ?? "null", path);
 
                 if (!string.IsNullOrEmpty(charset))
                 {
+                    // Make sure we have all the code pages we can get
+                    Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
                     using (var inputStream = new MemoryStream(bytes))
+                    using (var reader = new StreamReader(inputStream, Encoding.GetEncoding(charset)))
                     {
-                        using (var reader = new StreamReader(inputStream, _textEncoding.GetEncodingFromCharset(charset)))
-                        {
-                            var text = await reader.ReadToEndAsync().ConfigureAwait(false);
+                        var text = await reader.ReadToEndAsync().ConfigureAwait(false);
 
-                            bytes = Encoding.UTF8.GetBytes(text);
+                        bytes = Encoding.UTF8.GetBytes(text);
 
-                            return new MemoryStream(bytes);
-                        }
+                        return new MemoryStream(bytes);
                     }
                 }
             }
@@ -222,7 +213,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             return _fileSystem.OpenRead(path);
         }
 
-        private async Task<Tuple<string, MediaProtocol, string, bool>> GetReadableFile(string mediaPath,
+        private async Task<SubtitleInfo> GetReadableFile(
+            string mediaPath,
             string[] inputFiles,
             MediaProtocol protocol,
             MediaStream subtitleStream,
@@ -237,30 +229,30 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     string.Equals(subtitleStream.Codec, "ssa", StringComparison.OrdinalIgnoreCase) ||
                     string.Equals(subtitleStream.Codec, "srt", StringComparison.OrdinalIgnoreCase))
                 {
-                    // Extract    
+                    // Extract
                     outputCodec = "copy";
                     outputFormat = subtitleStream.Codec;
                 }
                 else if (string.Equals(subtitleStream.Codec, "subrip", StringComparison.OrdinalIgnoreCase))
                 {
-                    // Extract    
+                    // Extract
                     outputCodec = "copy";
                     outputFormat = "srt";
                 }
                 else
                 {
-                    // Extract    
+                    // Extract
                     outputCodec = "srt";
                     outputFormat = "srt";
                 }
 
-                // Extract    
+                // Extract
                 var outputPath = GetSubtitleCachePath(mediaPath, protocol, subtitleStream.Index, "." + outputFormat);
 
                 await ExtractTextSubtitle(inputFiles, protocol, subtitleStream.Index, outputCodec, outputPath, cancellationToken)
                         .ConfigureAwait(false);
 
-                return new Tuple<string, MediaProtocol, string, bool>(outputPath, MediaProtocol.File, outputFormat, false);
+                return new SubtitleInfo(outputPath, MediaProtocol.File, outputFormat, false);
             }
 
             var currentFormat = (Path.GetExtension(subtitleStream.Path) ?? subtitleStream.Codec)
@@ -268,22 +260,38 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             if (GetReader(currentFormat, false) == null)
             {
-                // Convert    
+                // Convert
                 var outputPath = GetSubtitleCachePath(mediaPath, protocol, subtitleStream.Index, ".srt");
 
                 await ConvertTextSubtitleToSrt(subtitleStream.Path, subtitleStream.Language, protocol, outputPath, cancellationToken).ConfigureAwait(false);
 
-                return new Tuple<string, MediaProtocol, string, bool>(outputPath, MediaProtocol.File, "srt", true);
+                return new SubtitleInfo(outputPath, MediaProtocol.File, "srt", true);
+            }
+
+            return new SubtitleInfo(subtitleStream.Path, protocol, currentFormat, true);
+        }
+
+        private struct SubtitleInfo
+        {
+            public SubtitleInfo(string path, MediaProtocol protocol, string format, bool isExternal)
+            {
+                Path = path;
+                Protocol = protocol;
+                Format = format;
+                IsExternal = isExternal;
             }
 
-            return new Tuple<string, MediaProtocol, string, bool>(subtitleStream.Path, protocol, currentFormat, true);
+            public string Path { get; set; }
+            public MediaProtocol Protocol { get; set; }
+            public string Format { get; set; }
+            public bool IsExternal { get; set; }
         }
 
         private ISubtitleParser GetReader(string format, bool throwIfMissing)
         {
             if (string.IsNullOrEmpty(format))
             {
-                throw new ArgumentNullException("format");
+                throw new ArgumentNullException(nameof(format));
             }
 
             if (string.Equals(format, SubtitleFormat.SRT, StringComparison.OrdinalIgnoreCase))
@@ -311,7 +319,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         {
             if (string.IsNullOrEmpty(format))
             {
-                throw new ArgumentNullException("format");
+                throw new ArgumentNullException(nameof(format));
             }
 
             if (string.Equals(format, "json", StringComparison.OrdinalIgnoreCase))
@@ -397,7 +405,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         /// <param name="outputPath">The output path.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentNullException">
+        /// <exception cref="ArgumentNullException">
         /// inputPath
         /// or
         /// outputPath
@@ -406,12 +414,12 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         {
             if (string.IsNullOrEmpty(inputPath))
             {
-                throw new ArgumentNullException("inputPath");
+                throw new ArgumentNullException(nameof(inputPath));
             }
 
             if (string.IsNullOrEmpty(outputPath))
             {
-                throw new ArgumentNullException("outputPath");
+                throw new ArgumentNullException(nameof(outputPath));
             }
 
             _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(outputPath));
@@ -482,7 +490,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                     }
                     catch (IOException ex)
                     {
-                        _logger.LogError(ex, "Error deleting converted subtitle {0}", outputPath);
+                        _logger.LogError(ex, "Error deleting converted subtitle {Path}", outputPath);
                     }
                 }
             }
@@ -493,7 +501,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             if (failed)
             {
-                var msg = string.Format("ffmpeg subtitle conversion failed for {0}", inputPath);
+                var msg = string.Format("ffmpeg subtitle conversion failed for {Path}", inputPath);
 
                 _logger.LogError(msg);
 
@@ -501,7 +509,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             }
             await SetAssFont(outputPath).ConfigureAwait(false);
 
-            _logger.LogInformation("ffmpeg subtitle conversion succeeded for {0}", inputPath);
+            _logger.LogInformation("ffmpeg subtitle conversion succeeded for {Path}", inputPath);
         }
 
         /// <summary>
@@ -514,9 +522,14 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         /// <param name="outputPath">The output path.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        /// <exception cref="System.ArgumentException">Must use inputPath list overload</exception>
-        private async Task ExtractTextSubtitle(string[] inputFiles, MediaProtocol protocol, int subtitleStreamIndex,
-            string outputCodec, string outputPath, CancellationToken cancellationToken)
+        /// <exception cref="ArgumentException">Must use inputPath list overload</exception>
+        private async Task ExtractTextSubtitle(
+            string[] inputFiles,
+            MediaProtocol protocol,
+            int subtitleStreamIndex,
+            string outputCodec,
+            string outputPath,
+            CancellationToken cancellationToken)
         {
             var semaphore = GetLock(outputPath);
 
@@ -535,17 +548,21 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             }
         }
 
-        private async Task ExtractTextSubtitleInternal(string inputPath, int subtitleStreamIndex,
-            string outputCodec, string outputPath, CancellationToken cancellationToken)
+        private async Task ExtractTextSubtitleInternal(
+            string inputPath,
+            int subtitleStreamIndex,
+            string outputCodec,
+            string outputPath,
+            CancellationToken cancellationToken)
         {
             if (string.IsNullOrEmpty(inputPath))
             {
-                throw new ArgumentNullException("inputPath");
+                throw new ArgumentNullException(nameof(inputPath));
             }
 
             if (string.IsNullOrEmpty(outputPath))
             {
-                throw new ArgumentNullException("outputPath");
+                throw new ArgumentNullException(nameof(outputPath));
             }
 
             _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(outputPath));
@@ -564,7 +581,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 ErrorDialog = false
             });
 
-            _logger.LogInformation("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
+            _logger.LogInformation("{File} {Arguments}", process.StartInfo.FileName, process.StartInfo.Arguments);
 
             try
             {
@@ -583,7 +600,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             {
                 try
                 {
-                    _logger.LogInformation("Killing ffmpeg subtitle extraction process");
+                    _logger.LogWarning("Killing ffmpeg subtitle extraction process");
 
                     process.Kill();
                 }
@@ -605,7 +622,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
                 try
                 {
-                    _logger.LogInformation("Deleting extracted subtitle due to failure: {0}", outputPath);
+                    _logger.LogWarning("Deleting extracted subtitle due to failure: {Path}", outputPath);
                     _fileSystem.DeleteFile(outputPath);
                 }
                 catch (FileNotFoundException)
@@ -614,7 +631,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 }
                 catch (IOException ex)
                 {
-                    _logger.LogError(ex, "Error deleting extracted subtitle {0}", outputPath);
+                    _logger.LogError(ex, "Error deleting extracted subtitle {Path}", outputPath);
                 }
             }
             else if (!_fileSystem.FileExists(outputPath))
@@ -624,7 +641,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
             if (failed)
             {
-                var msg = string.Format("ffmpeg subtitle extraction failed for {0} to {1}", inputPath, outputPath);
+                var msg = $"ffmpeg subtitle extraction failed for {inputPath} to {outputPath}";
 
                 _logger.LogError(msg);
 
@@ -632,7 +649,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             }
             else
             {
-                var msg = string.Format("ffmpeg subtitle extraction completed for {0} to {1}", inputPath, outputPath);
+                var msg = $"ffmpeg subtitle extraction completed for {inputPath} to {outputPath}";
 
                 _logger.LogInformation(msg);
             }
@@ -650,19 +667,17 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         /// <returns>Task.</returns>
         private async Task SetAssFont(string file)
         {
-            _logger.LogInformation("Setting ass font within {0}", file);
+            _logger.LogInformation("Setting ass font within {File}", file);
 
             string text;
             Encoding encoding;
 
             using (var fileStream = _fileSystem.OpenRead(file))
+            using (var reader = new StreamReader(fileStream, true))
             {
-                using (var reader = new StreamReader(fileStream, true))
-                {
-                    encoding = reader.CurrentEncoding;
+                encoding = reader.CurrentEncoding;
 
-                    text = await reader.ReadToEndAsync().ConfigureAwait(false);
-                }
+                text = await reader.ReadToEndAsync().ConfigureAwait(false);
             }
 
             var newText = text.Replace(",Arial,", ",Arial Unicode MS,");
@@ -705,9 +720,9 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         {
             var bytes = await GetBytes(path, protocol, cancellationToken).ConfigureAwait(false);
 
-            var charset = _textEncoding.GetDetectedEncodingName(bytes, bytes.Length, language, true);
+            var charset = CharsetDetector.DetectFromBytes(bytes).Detected?.EncodingName;
 
-            _logger.LogDebug("charset {0} detected for {1}", charset ?? "null", path);
+            _logger.LogDebug("charset {0} detected for {Path}", charset ?? "null", path);
 
             return charset;
         }
@@ -716,18 +731,18 @@ namespace MediaBrowser.MediaEncoding.Subtitles
         {
             if (protocol == MediaProtocol.Http)
             {
-                HttpRequestOptions opts = new HttpRequestOptions();
-                opts.Url = path;
-                opts.CancellationToken = cancellationToken;
+                var opts = new HttpRequestOptions()
+                {
+                    Url = path,
+                    CancellationToken = cancellationToken
+                };
                 using (var file = await _httpClient.Get(opts).ConfigureAwait(false))
+                using (var memoryStream = new MemoryStream())
                 {
-                    using (var memoryStream = new MemoryStream())
-                    {
-                        await file.CopyToAsync(memoryStream).ConfigureAwait(false);
-                        memoryStream.Position = 0;
+                    await file.CopyToAsync(memoryStream).ConfigureAwait(false);
+                    memoryStream.Position = 0;
 
-                        return memoryStream.ToArray();
-                    }
+                    return memoryStream.ToArray();
                 }
             }
             if (protocol == MediaProtocol.File)
@@ -735,8 +750,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 return _fileSystem.ReadAllBytes(path);
             }
 
-            throw new ArgumentOutOfRangeException("protocol");
+            throw new ArgumentOutOfRangeException(nameof(protocol));
         }
-
     }
 }
diff --git a/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs
index c32005f89..cdaf94964 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/TtmlWriter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -45,7 +45,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
                 writer.WriteLine("</div>");
                 writer.WriteLine("</body>");
-                
+
                 writer.WriteLine("</tt>");
             }
         }
diff --git a/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs b/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
index 092add992..2e328ba63 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/VttWriter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -19,8 +19,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                 {
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    TimeSpan startTime = TimeSpan.FromTicks(trackEvent.StartPositionTicks);
-                    TimeSpan endTime = TimeSpan.FromTicks(trackEvent.EndPositionTicks);
+                    var startTime = TimeSpan.FromTicks(trackEvent.StartPositionTicks);
+                    var endTime = TimeSpan.FromTicks(trackEvent.EndPositionTicks);
 
                     // make sure the start and end times are different and seqential
                     if (endTime.TotalMilliseconds <= startTime.TotalMilliseconds)