unkin/jellyfin-ha-src
4
0
Fork 0
Code Issues 12 Pull Requests 2 Packages Projects Releases Wiki Activity

Fix subtitle encoding for local files (#17281)

Browse Source 
* Fix subtitle encoding

* Add short-circuit

* Use IsTextFormat

* Update MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs

Co-authored-by: Bond-009 <bond.009@outlook.com>

---------

Co-authored-by: Bond-009 <bond.009@outlook.com>
This commit is contained in:
Tim Eisele
2026-07-21 14:52:59 +02:00
committed by GitHub
parent 9b9b609c83
commit ed61acc19a
2 changed files with 204 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+22 -14
View File
@@ -163,28 +163,36 @@ namespace MediaBrowser.MediaEncoding.Subtitles
return (stream, fileInfo);
}
private async Task<Stream> GetSubtitleStream(SubtitleInfo fileInfo, CancellationToken cancellationToken)
internal async Task<Stream> GetSubtitleStream(SubtitleInfo fileInfo, CancellationToken cancellationToken)
{
if (fileInfo.Protocol == MediaProtocol.Http)
if (fileInfo.IsExternal && MediaStream.IsTextFormat(fileInfo.Format))
{
var result = await DetectCharset(fileInfo.Path, cancellationToken).ConfigureAwait(false);
var detected = result.Detected;
if (detected is not null)
{
_logger.LogDebug("charset {CharSet} detected for {Path}", detected.EncodingName, fileInfo.Path);
using var stream = await _httpClientFactory.CreateClient(NamedClient.Default)
var stream = fileInfo.Protocol == MediaProtocol.Http
? await _httpClientFactory.CreateClient(NamedClient.Default)
.GetStreamAsync(new Uri(fileInfo.Path), cancellationToken)
.ConfigureAwait(false);
.ConfigureAwait(false)
: AsyncFile.OpenRead(fileInfo.Path);
await using (stream.ConfigureAwait(false))
{
using var reader = new StreamReader(stream, detected.Encoding);
var text = await reader.ReadToEndAsync(cancellationToken).ConfigureAwait(false);
// Short-circuit when the file is already UTF-8/ASCII.
if (detected is null
|| string.Equals(detected.EncodingName, "utf-8", StringComparison.OrdinalIgnoreCase)
|| string.Equals(detected.EncodingName, "ascii", StringComparison.OrdinalIgnoreCase)
|| string.Equals(detected.EncodingName, "us-ascii", StringComparison.OrdinalIgnoreCase))
{
return stream;
}
return new MemoryStream(Encoding.UTF8.GetBytes(text));
}
_logger.LogDebug("charset {CharSet} detected for {Path}", detected.EncodingName, fileInfo.Path);
await using (stream.ConfigureAwait(false))
{
using var reader = new StreamReader(stream, detected.Encoding);
var text = await reader.ReadToEndAsync(cancellationToken).ConfigureAwait(false);
return new MemoryStream(Encoding.UTF8.GetBytes(text));
}
}