From 47aa0d03af4ae418ad0a14a3a233c0ad13fee055 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Sun, 28 Jul 2019 21:15:35 +0200 Subject: [PATCH] Code cleanup --- ArchiSteamFarm.sln.DotSettings | 4 ++-- .../Collections/FixedSizeConcurrentQueue.cs | 18 +++++++------- ArchiSteamFarm/GitHub.cs | 24 +++++++++---------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ArchiSteamFarm.sln.DotSettings b/ArchiSteamFarm.sln.DotSettings index c2a288a8e..a105ed21b 100644 --- a/ArchiSteamFarm.sln.DotSettings +++ b/ArchiSteamFarm.sln.DotSettings @@ -526,8 +526,8 @@ limitations under the License. XML False <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"><ExtraRule Prefix="I" Suffix="" Style="AaBb" /></Policy> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"><ExtraRule Prefix="_" Suffix="" Style="AaBb" /></Policy> - <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb"><ExtraRule Prefix="_" Suffix="" Style="AaBb" /></Policy> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> + <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> False LIVE_MONITOR diff --git a/ArchiSteamFarm/Collections/FixedSizeConcurrentQueue.cs b/ArchiSteamFarm/Collections/FixedSizeConcurrentQueue.cs index 5598c62fa..301eadc54 100644 --- a/ArchiSteamFarm/Collections/FixedSizeConcurrentQueue.cs +++ b/ArchiSteamFarm/Collections/FixedSizeConcurrentQueue.cs @@ -26,10 +26,10 @@ using System.Collections.Generic; namespace ArchiSteamFarm.Collections { internal sealed class FixedSizeConcurrentQueue : IEnumerable { - private readonly ConcurrentQueue BackingQueue = new ConcurrentQueue(); + private readonly ConcurrentQueue Queue = new ConcurrentQueue(); internal byte MaxCount { - get => _MaxCount; + get => BackingMaxCount; set { if (value == 0) { @@ -38,13 +38,13 @@ namespace ArchiSteamFarm.Collections { return; } - _MaxCount = value; + BackingMaxCount = value; - while ((BackingQueue.Count > MaxCount) && BackingQueue.TryDequeue(out _)) { } + while ((Queue.Count > MaxCount) && Queue.TryDequeue(out _)) { } } } - private byte _MaxCount; + private byte BackingMaxCount; internal FixedSizeConcurrentQueue(byte maxCount) { if (maxCount == 0) { @@ -54,17 +54,17 @@ namespace ArchiSteamFarm.Collections { MaxCount = maxCount; } - public IEnumerator GetEnumerator() => BackingQueue.GetEnumerator(); + public IEnumerator GetEnumerator() => Queue.GetEnumerator(); IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); internal void Enqueue(T obj) { - BackingQueue.Enqueue(obj); + Queue.Enqueue(obj); - if (BackingQueue.Count <= MaxCount) { + if (Queue.Count <= MaxCount) { return; } - BackingQueue.TryDequeue(out _); + Queue.TryDequeue(out _); } } } diff --git a/ArchiSteamFarm/GitHub.cs b/ArchiSteamFarm/GitHub.cs index 5c8bdb4f3..e1ab9db6c 100644 --- a/ArchiSteamFarm/GitHub.cs +++ b/ArchiSteamFarm/GitHub.cs @@ -132,8 +132,8 @@ namespace ArchiSteamFarm { internal string ChangelogHTML { get { - if (_ChangelogHTML != null) { - return _ChangelogHTML; + if (BackingChangelogHTML != null) { + return BackingChangelogHTML; } if (Changelog == null) { @@ -147,15 +147,15 @@ namespace ArchiSteamFarm { renderer.Render(Changelog); writer.Flush(); - return _ChangelogHTML = writer.ToString(); + return BackingChangelogHTML = writer.ToString(); } } } internal string ChangelogPlainText { get { - if (_ChangelogPlainText != null) { - return _ChangelogPlainText; + if (BackingChangelogPlainText != null) { + return BackingChangelogPlainText; } if (Changelog == null) { @@ -173,7 +173,7 @@ namespace ArchiSteamFarm { renderer.Render(Changelog); writer.Flush(); - return _ChangelogPlainText = writer.ToString(); + return BackingChangelogPlainText = writer.ToString(); } } } @@ -185,17 +185,17 @@ namespace ArchiSteamFarm { private MarkdownDocument Changelog { get { - if (_Changelog != null) { - return _Changelog; + if (BackingChangelog != null) { + return BackingChangelog; } - return _Changelog = ExtractChangelogFromBody(MarkdownBody); + return BackingChangelog = ExtractChangelogFromBody(MarkdownBody); } } - private MarkdownDocument _Changelog; - private string _ChangelogHTML; - private string _ChangelogPlainText; + private MarkdownDocument BackingChangelog; + private string BackingChangelogHTML; + private string BackingChangelogPlainText; [JsonConstructor] private ReleaseResponse() { }