mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2024-11-19 09:54:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not crash on bad language file

Browse Source
This commit is contained in:
Kukks 2022-07-21 11:09:51 +02:00
parent 5fd620556e
commit b02542f3be
No known key found for this signature in database
GPG Key ID: 8E5530D9D1C93097
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
BTCPayServer/Services/LanguageService.cs
View File

@ -7,6 +7,7 @@ using BTCPayServer.Client.Models;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization;
@ -27,19 +28,29 @@ namespace BTCPayServer.Services
public class LanguageService
{
private readonly ILogger<LanguageService> _logger;
private readonly Language[] _languages;
public LanguageService(IWebHostEnvironment environment)
public LanguageService(IWebHostEnvironment environment, ILogger<LanguageService> logger)
{
_logger = logger;
var path = environment.WebRootPath;
path = Path.Combine(path, "locales");
var files = Directory.GetFiles(path, "*.json");
var result = new List<Language>();
foreach (var file in files)
{
using var stream = new StreamReader(file);
var json = stream.ReadToEnd();
result.Add(JObject.Parse(json).ToObject<Language>());
try
{
using var stream = new StreamReader(file);
var json = stream.ReadToEnd();
result.Add(JObject.Parse(json).ToObject<Language>());
}
catch (Exception e)
{
_logger.LogError(e, $"Could not parse language file {file}");
}
}
_languages = result.ToArray();