- Updated editorconfig rules to hopefully look a bit nicer.

- Removed configureawait(false) from everywhere as it doesnt' do anything in a console app and just makes the code look ugly
- Started using .WhenAll extension instead of Task.WhenAll to make it look nicer when chaining methods
This commit is contained in:
Kwoth
2021-12-28 21:14:40 +01:00
parent d093f7eed7
commit 723447c7d4
171 changed files with 1523 additions and 1594 deletions
@@ -1,4 +1,4 @@
#nullable disable
#nullable disable
using NadekoBot.Common.Configs;
using SixLabors.ImageSharp.PixelFormats;
@@ -31,7 +31,7 @@ public sealed class BotConfigService : ConfigServiceBase<BotConfig>
private void Migrate()
{
if (_data.Version < 2)
if (data.Version < 2)
{
ModifyConfig(c => c.Version = 2);
}
@@ -1,4 +1,3 @@
#nullable disable
using System.Linq.Expressions;
using System.Reflection;
using NadekoBot.Common.Yml;
@@ -18,10 +17,10 @@ public abstract class ConfigServiceBase<TSettings> : IConfigService
protected readonly IPubSub _pubSub;
private readonly TypedKey<TSettings> _changeKey;
protected TSettings _data;
protected TSettings data;
// todo future config arrays are not copied - they're not protected from mutations
public TSettings Data => _data.Clone();
public TSettings Data => data.Clone();
public abstract string Name { get; }
@@ -40,16 +39,17 @@ public abstract class ConfigServiceBase<TSettings> : IConfigService
_pubSub = pubSub;
_changeKey = changeKey;
data = new();
Load();
_pubSub.Sub(_changeKey, OnChangePublished);
}
private void PublishChange()
=> _pubSub.Pub(_changeKey, _data);
=> _pubSub.Pub(_changeKey, data);
private ValueTask OnChangePublished(TSettings newData)
{
_data = newData;
data = newData;
OnStateUpdate();
return default;
}
@@ -62,11 +62,11 @@ public abstract class ConfigServiceBase<TSettings> : IConfigService
// if file is deleted, regenerate it with default values
if (!File.Exists(_filePath))
{
_data = new();
data = new();
Save();
}
_data = _serializer.Deserialize<TSettings>(File.ReadAllText(_filePath));
data = _serializer.Deserialize<TSettings>(File.ReadAllText(_filePath));
}
/// <summary>
@@ -75,12 +75,12 @@ public abstract class ConfigServiceBase<TSettings> : IConfigService
public void Reload()
{
Load();
_pubSub.Pub(_changeKey, _data);
_pubSub.Pub(_changeKey, data);
}
/// <summary>
/// Doesn't do anything by default. This method will be executed after
/// <see cref="_data"/> is reloaded from <see cref="_filePath"/> or new data is recieved
/// <see cref="data"/> is reloaded from <see cref="_filePath"/> or new data is recieved
/// from the publish event
/// </summary>
protected virtual void OnStateUpdate()
@@ -90,7 +90,7 @@ public abstract class ConfigServiceBase<TSettings> : IConfigService
private void Save()
{
var strData = _serializer.Serialize(_data);
var strData = _serializer.Serialize(data);
File.WriteAllText(_filePath, strData);
}
@@ -109,7 +109,7 @@ public abstract class ConfigServiceBase<TSettings> : IConfigService
checker ??= _ => true;
key = key.ToLowerInvariant();
_propPrinters[key] = obj => printer((TProp)obj);
_propSelectors[key] = () => selector.Compile()(_data);
_propSelectors[key] = () => selector.Compile()(data);
_propSetters[key] = Magic(selector, parser, checker);
_propComments[key] = ((MemberExpression)selector.Body).Member.GetCustomAttribute<CommentAttribute>()?.Comment;
}
@@ -192,7 +192,7 @@ public abstract class ConfigServiceBase<TSettings> : IConfigService
{
var copy = Data;
action(copy);
_data = copy;
data = copy;
Save();
PublishChange();
}