starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-17 14:33:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

3.2.20.5

Browse Source
This commit is contained in:
Luke Pulverenti
2017-06-18 03:11:55 -04:00
parent 0e7cbb0465
commit ce47f63389
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Emby.Common.Implementations/TextEncoding/TextEncoding.cs
View File

@@ -68,7 +68,7 @@ namespace Emby.Common.Implementations.TextEncoding
}
private bool _langDetectInitialized;
public string GetDetectedEncodingName(byte[] bytes, string language)
public string GetDetectedEncodingName(byte[] bytes, string language, bool enableLanguageDetection)
{
var encoding = GetInitialEncoding(bytes);
@@ -77,14 +77,14 @@ namespace Emby.Common.Implementations.TextEncoding
return "utf-8";
}
if (!_langDetectInitialized)
if (string.IsNullOrWhiteSpace(language) && enableLanguageDetection)
{
_langDetectInitialized = true;
LanguageDetector.Initialize(_json);
}
if (!_langDetectInitialized)
{
_langDetectInitialized = true;
LanguageDetector.Initialize(_json);
}
if (string.IsNullOrWhiteSpace(language))
{
language = DetectLanguage(bytes);
if (!string.IsNullOrWhiteSpace(language))
@@ -167,9 +167,9 @@ namespace Emby.Common.Implementations.TextEncoding
}
}
public Encoding GetDetectedEncoding(byte[] bytes, string language)
public Encoding GetDetectedEncoding(byte[] bytes, string language, bool enableLanguageDetection)
{
var charset = GetDetectedEncodingName(bytes, language);
var charset = GetDetectedEncodingName(bytes, language, enableLanguageDetection);
return GetEncodingFromCharset(charset);
}