mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed .convert, closes #1377

Browse Source
This commit is contained in:
Master Kwoth 2017-07-10 21:35:45 +02:00
parent 34b56c6353
commit dc0176365b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/NadekoBot/Services/Utility/ConverterService.cs
View File

@ -20,6 +20,7 @@ namespace NadekoBot.Services.Utility
private readonly Timer _currencyUpdater; private readonly Timer _currencyUpdater;
private readonly TimeSpan _updateInterval = new TimeSpan(12, 0, 0); private readonly TimeSpan _updateInterval = new TimeSpan(12, 0, 0);
private readonly DbService _db; private readonly DbService _db;
private readonly ConvertUnit[] fileData;
public ConverterService(DiscordSocketClient client, DbService db) public ConverterService(DiscordSocketClient client, DbService db)
{ {
@ -30,7 +31,7 @@ namespace NadekoBot.Services.Utility
{ {
try try
{ {
var data = JsonConvert.DeserializeObject<List<MeasurementUnit>>( fileData = JsonConvert.DeserializeObject<List<MeasurementUnit>>(
File.ReadAllText("data/units.json")) File.ReadAllText("data/units.json"))
.Select(u => new ConvertUnit() .Select(u => new ConvertUnit()
{ {
@ -43,7 +44,7 @@ namespace NadekoBot.Services.Utility
{ {
if (uow.ConverterUnits.Empty()) if (uow.ConverterUnits.Empty())
{ {
uow.ConverterUnits.AddRange(data); uow.ConverterUnits.AddRange(fileData);
Units = uow.ConverterUnits.GetAll().ToList(); Units = uow.ConverterUnits.GetAll().ToList();
uow.Complete(); uow.Complete();
@ -104,6 +105,7 @@ namespace NadekoBot.Services.Utility
Units.RemoveAll(u => u.UnitType == unitTypeString); Units.RemoveAll(u => u.UnitType == unitTypeString);
Units.Add(baseType); Units.Add(baseType);
Units.AddRange(range); Units.AddRange(range);
Units.AddRange(fileData);
} }
else else
{ {