From a04fb3334392eef5460aa97a59452b7606daa7af Mon Sep 17 00:00:00 2001 From: JustArchi Date: Sat, 8 Sep 2018 01:03:55 +0200 Subject: [PATCH] Structure cleanup --- ArchiSteamFarm/ASF.cs | 1 + ArchiSteamFarm/ArchiHandler.cs | 1 + ArchiSteamFarm/Bot.cs | 2 ++ ArchiSteamFarm/BotDatabase.cs | 1 + ArchiSteamFarm/CardsFarmer.cs | 8 +++----- ArchiSteamFarm/{ => Collections}/ConcurrentHashSet.cs | 2 +- .../{ => Collections}/ConcurrentSortedHashSet.cs | 2 +- .../{ => Collections}/FixedSizeConcurrentQueue.cs | 2 +- ArchiSteamFarm/GlobalDatabase.cs | 1 + ArchiSteamFarm/IPC/ArchiKestrel.cs | 1 + ArchiSteamFarm/IPC/Controllers/Api/LogController.cs | 1 + ArchiSteamFarm/{ => NLog}/ArchiLogger.cs | 2 +- ArchiSteamFarm/{ => NLog}/HistoryTarget.cs | 3 ++- ArchiSteamFarm/{ => NLog}/Logging.cs | 3 ++- ArchiSteamFarm/{ => NLog}/SteamTarget.cs | 2 +- ArchiSteamFarm/Program.cs | 1 + .../{ => SteamKit2}/InMemoryServerListProvider.cs | 3 ++- ArchiSteamFarm/{ => SteamKit2}/ServerRecordEndPoint.cs | 2 +- ArchiSteamFarm/Trading.cs | 1 + ArchiSteamFarm/WebBrowser.cs | 1 + 20 files changed, 26 insertions(+), 14 deletions(-) rename ArchiSteamFarm/{ => Collections}/ConcurrentHashSet.cs (99%) rename ArchiSteamFarm/{ => Collections}/ConcurrentSortedHashSet.cs (99%) rename ArchiSteamFarm/{ => Collections}/FixedSizeConcurrentQueue.cs (98%) rename ArchiSteamFarm/{ => NLog}/ArchiLogger.cs (99%) rename ArchiSteamFarm/{ => NLog}/HistoryTarget.cs (97%) rename ArchiSteamFarm/{ => NLog}/Logging.cs (98%) rename ArchiSteamFarm/{ => NLog}/SteamTarget.cs (99%) rename ArchiSteamFarm/{ => SteamKit2}/InMemoryServerListProvider.cs (97%) rename ArchiSteamFarm/{ => SteamKit2}/ServerRecordEndPoint.cs (98%) diff --git a/ArchiSteamFarm/ASF.cs b/ArchiSteamFarm/ASF.cs index 3ab52c2ac..2a0e37261 100644 --- a/ArchiSteamFarm/ASF.cs +++ b/ArchiSteamFarm/ASF.cs @@ -29,6 +29,7 @@ using System.Threading; using System.Threading.Tasks; using ArchiSteamFarm.JSON; using ArchiSteamFarm.Localization; +using ArchiSteamFarm.NLog; namespace ArchiSteamFarm { internal static class ASF { diff --git a/ArchiSteamFarm/ArchiHandler.cs b/ArchiSteamFarm/ArchiHandler.cs index 50188e0bb..8bc2b2e8b 100644 --- a/ArchiSteamFarm/ArchiHandler.cs +++ b/ArchiSteamFarm/ArchiHandler.cs @@ -28,6 +28,7 @@ using System.Net; using System.Threading.Tasks; using ArchiSteamFarm.CMsgs; using ArchiSteamFarm.Localization; +using ArchiSteamFarm.NLog; using SteamKit2; using SteamKit2.Internal; using SteamKit2.Unified.Internal; diff --git a/ArchiSteamFarm/Bot.cs b/ArchiSteamFarm/Bot.cs index fca453b2d..6d0ed23c5 100755 --- a/ArchiSteamFarm/Bot.cs +++ b/ArchiSteamFarm/Bot.cs @@ -32,8 +32,10 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; +using ArchiSteamFarm.Collections; using ArchiSteamFarm.Json; using ArchiSteamFarm.Localization; +using ArchiSteamFarm.NLog; using Newtonsoft.Json; using SteamKit2; using SteamKit2.Discovery; diff --git a/ArchiSteamFarm/BotDatabase.cs b/ArchiSteamFarm/BotDatabase.cs index 9834fb738..3b9ef3f47 100644 --- a/ArchiSteamFarm/BotDatabase.cs +++ b/ArchiSteamFarm/BotDatabase.cs @@ -26,6 +26,7 @@ using System.Collections.Specialized; using System.IO; using System.Threading; using System.Threading.Tasks; +using ArchiSteamFarm.Collections; using Newtonsoft.Json; namespace ArchiSteamFarm { diff --git a/ArchiSteamFarm/CardsFarmer.cs b/ArchiSteamFarm/CardsFarmer.cs index c57d253fd..b78c63548 100755 --- a/ArchiSteamFarm/CardsFarmer.cs +++ b/ArchiSteamFarm/CardsFarmer.cs @@ -22,6 +22,7 @@ using System; using System.Collections.Concurrent; using System.Collections.Generic; +using System.Collections.Immutable; using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Linq; @@ -29,6 +30,7 @@ using System.Net; using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; +using ArchiSteamFarm.Collections; using ArchiSteamFarm.Localization; using HtmlAgilityPack; using Newtonsoft.Json; @@ -45,11 +47,7 @@ namespace ArchiSteamFarm { private static readonly ConcurrentDictionary IgnoredAppIDs = new ConcurrentDictionary(); // Reserved for unreleased games // Games that were confirmed to show false status on general badges page - private static readonly HashSet UntrustedAppIDs = new HashSet { - 440, // Team Fortress 2 - 570, // Dota 2 - 730 // Counter-Strike: Global Offensive - }; + private static readonly ImmutableHashSet UntrustedAppIDs = ImmutableHashSet.Create(440, 570, 730); [JsonProperty] internal readonly ConcurrentHashSet CurrentGamesFarming = new ConcurrentHashSet(); diff --git a/ArchiSteamFarm/ConcurrentHashSet.cs b/ArchiSteamFarm/Collections/ConcurrentHashSet.cs similarity index 99% rename from ArchiSteamFarm/ConcurrentHashSet.cs rename to ArchiSteamFarm/Collections/ConcurrentHashSet.cs index 295db89fe..1570805e3 100644 --- a/ArchiSteamFarm/ConcurrentHashSet.cs +++ b/ArchiSteamFarm/Collections/ConcurrentHashSet.cs @@ -25,7 +25,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; -namespace ArchiSteamFarm { +namespace ArchiSteamFarm.Collections { internal sealed class ConcurrentHashSet : IReadOnlyCollection, ISet { public int Count => BackingCollection.Count; public bool IsReadOnly => false; diff --git a/ArchiSteamFarm/ConcurrentSortedHashSet.cs b/ArchiSteamFarm/Collections/ConcurrentSortedHashSet.cs similarity index 99% rename from ArchiSteamFarm/ConcurrentSortedHashSet.cs rename to ArchiSteamFarm/Collections/ConcurrentSortedHashSet.cs index 72c606c1b..c192c0c56 100644 --- a/ArchiSteamFarm/ConcurrentSortedHashSet.cs +++ b/ArchiSteamFarm/Collections/ConcurrentSortedHashSet.cs @@ -25,7 +25,7 @@ using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Threading; -namespace ArchiSteamFarm { +namespace ArchiSteamFarm.Collections { internal sealed class ConcurrentSortedHashSet : IDisposable, IReadOnlyCollection, ISet { public int Count { get { diff --git a/ArchiSteamFarm/FixedSizeConcurrentQueue.cs b/ArchiSteamFarm/Collections/FixedSizeConcurrentQueue.cs similarity index 98% rename from ArchiSteamFarm/FixedSizeConcurrentQueue.cs rename to ArchiSteamFarm/Collections/FixedSizeConcurrentQueue.cs index d097e45b3..6f513c798 100644 --- a/ArchiSteamFarm/FixedSizeConcurrentQueue.cs +++ b/ArchiSteamFarm/Collections/FixedSizeConcurrentQueue.cs @@ -24,7 +24,7 @@ using System.Collections; using System.Collections.Concurrent; using System.Collections.Generic; -namespace ArchiSteamFarm { +namespace ArchiSteamFarm.Collections { internal sealed class FixedSizeConcurrentQueue : IEnumerable { private readonly ConcurrentQueue BackingQueue = new ConcurrentQueue(); diff --git a/ArchiSteamFarm/GlobalDatabase.cs b/ArchiSteamFarm/GlobalDatabase.cs index a5e4fed9a..4b5f8c146 100644 --- a/ArchiSteamFarm/GlobalDatabase.cs +++ b/ArchiSteamFarm/GlobalDatabase.cs @@ -26,6 +26,7 @@ using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; +using ArchiSteamFarm.SteamKit2; using Newtonsoft.Json; namespace ArchiSteamFarm { diff --git a/ArchiSteamFarm/IPC/ArchiKestrel.cs b/ArchiSteamFarm/IPC/ArchiKestrel.cs index a3682626c..c304609d8 100644 --- a/ArchiSteamFarm/IPC/ArchiKestrel.cs +++ b/ArchiSteamFarm/IPC/ArchiKestrel.cs @@ -23,6 +23,7 @@ using System; using System.IO; using System.Threading.Tasks; using ArchiSteamFarm.IPC.Controllers.Api; +using ArchiSteamFarm.NLog; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; diff --git a/ArchiSteamFarm/IPC/Controllers/Api/LogController.cs b/ArchiSteamFarm/IPC/Controllers/Api/LogController.cs index 1ad84fbe8..e229b1851 100644 --- a/ArchiSteamFarm/IPC/Controllers/Api/LogController.cs +++ b/ArchiSteamFarm/IPC/Controllers/Api/LogController.cs @@ -27,6 +27,7 @@ using System.Threading; using System.Threading.Tasks; using ArchiSteamFarm.IPC.Responses; using ArchiSteamFarm.Localization; +using ArchiSteamFarm.NLog; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; diff --git a/ArchiSteamFarm/ArchiLogger.cs b/ArchiSteamFarm/NLog/ArchiLogger.cs similarity index 99% rename from ArchiSteamFarm/ArchiLogger.cs rename to ArchiSteamFarm/NLog/ArchiLogger.cs index 1953daeb0..2465d0bc0 100644 --- a/ArchiSteamFarm/ArchiLogger.cs +++ b/ArchiSteamFarm/NLog/ArchiLogger.cs @@ -26,7 +26,7 @@ using System.Threading.Tasks; using ArchiSteamFarm.Localization; using NLog; -namespace ArchiSteamFarm { +namespace ArchiSteamFarm.NLog { internal sealed class ArchiLogger { private readonly Logger Logger; diff --git a/ArchiSteamFarm/HistoryTarget.cs b/ArchiSteamFarm/NLog/HistoryTarget.cs similarity index 97% rename from ArchiSteamFarm/HistoryTarget.cs rename to ArchiSteamFarm/NLog/HistoryTarget.cs index e3f47b697..695a13a06 100644 --- a/ArchiSteamFarm/HistoryTarget.cs +++ b/ArchiSteamFarm/NLog/HistoryTarget.cs @@ -22,10 +22,11 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; +using ArchiSteamFarm.Collections; using NLog; using NLog.Targets; -namespace ArchiSteamFarm { +namespace ArchiSteamFarm.NLog { [Target(TargetName)] internal sealed class HistoryTarget : TargetWithLayout { internal const string TargetName = "History"; diff --git a/ArchiSteamFarm/Logging.cs b/ArchiSteamFarm/NLog/Logging.cs similarity index 98% rename from ArchiSteamFarm/Logging.cs rename to ArchiSteamFarm/NLog/Logging.cs index 0933a3d7b..d14f8fed6 100644 --- a/ArchiSteamFarm/Logging.cs +++ b/ArchiSteamFarm/NLog/Logging.cs @@ -20,12 +20,13 @@ // limitations under the License. using System.Linq; +using ArchiSteamFarm.Collections; using ArchiSteamFarm.IPC; using NLog; using NLog.Config; using NLog.Targets; -namespace ArchiSteamFarm { +namespace ArchiSteamFarm.NLog { internal static class Logging { private const string GeneralLayout = @"${date:format=yyyy-MM-dd HH\:mm\:ss}|${processname}-${processid}|${level:uppercase=true}|" + LayoutMessage; private const string LayoutMessage = @"${logger}|${message}${onexception:inner= ${exception:format=toString,Data}}"; diff --git a/ArchiSteamFarm/SteamTarget.cs b/ArchiSteamFarm/NLog/SteamTarget.cs similarity index 99% rename from ArchiSteamFarm/SteamTarget.cs rename to ArchiSteamFarm/NLog/SteamTarget.cs index 19de21bb3..27822a935 100644 --- a/ArchiSteamFarm/SteamTarget.cs +++ b/ArchiSteamFarm/NLog/SteamTarget.cs @@ -26,7 +26,7 @@ using NLog; using NLog.Config; using NLog.Targets; -namespace ArchiSteamFarm { +namespace ArchiSteamFarm.NLog { [SuppressMessage("ReSharper", "ClassNeverInstantiated.Global")] [Target(TargetName)] internal sealed class SteamTarget : TargetWithLayout { diff --git a/ArchiSteamFarm/Program.cs b/ArchiSteamFarm/Program.cs index 01c1c1556..d31749008 100644 --- a/ArchiSteamFarm/Program.cs +++ b/ArchiSteamFarm/Program.cs @@ -30,6 +30,7 @@ using System.Resources; using System.Threading.Tasks; using ArchiSteamFarm.IPC; using ArchiSteamFarm.Localization; +using ArchiSteamFarm.NLog; using Newtonsoft.Json; using NLog; using NLog.Targets; diff --git a/ArchiSteamFarm/InMemoryServerListProvider.cs b/ArchiSteamFarm/SteamKit2/InMemoryServerListProvider.cs similarity index 97% rename from ArchiSteamFarm/InMemoryServerListProvider.cs rename to ArchiSteamFarm/SteamKit2/InMemoryServerListProvider.cs index 8b79677db..695d74fad 100644 --- a/ArchiSteamFarm/InMemoryServerListProvider.cs +++ b/ArchiSteamFarm/SteamKit2/InMemoryServerListProvider.cs @@ -23,10 +23,11 @@ using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using ArchiSteamFarm.Collections; using Newtonsoft.Json; using SteamKit2.Discovery; -namespace ArchiSteamFarm { +namespace ArchiSteamFarm.SteamKit2 { internal sealed class InMemoryServerListProvider : IServerListProvider { [JsonProperty(Required = Required.DisallowNull)] private readonly ConcurrentHashSet ServerRecords = new ConcurrentHashSet(); diff --git a/ArchiSteamFarm/ServerRecordEndPoint.cs b/ArchiSteamFarm/SteamKit2/ServerRecordEndPoint.cs similarity index 98% rename from ArchiSteamFarm/ServerRecordEndPoint.cs rename to ArchiSteamFarm/SteamKit2/ServerRecordEndPoint.cs index b58639c5c..8b95d195c 100644 --- a/ArchiSteamFarm/ServerRecordEndPoint.cs +++ b/ArchiSteamFarm/SteamKit2/ServerRecordEndPoint.cs @@ -23,7 +23,7 @@ using System; using Newtonsoft.Json; using SteamKit2; -namespace ArchiSteamFarm { +namespace ArchiSteamFarm.SteamKit2 { internal sealed class ServerRecordEndPoint { [JsonProperty(Required = Required.Always)] internal readonly string Host; diff --git a/ArchiSteamFarm/Trading.cs b/ArchiSteamFarm/Trading.cs index 197ca41d9..025c38b65 100644 --- a/ArchiSteamFarm/Trading.cs +++ b/ArchiSteamFarm/Trading.cs @@ -24,6 +24,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; +using ArchiSteamFarm.Collections; using ArchiSteamFarm.Json; using ArchiSteamFarm.Localization; diff --git a/ArchiSteamFarm/WebBrowser.cs b/ArchiSteamFarm/WebBrowser.cs index ef17ba91d..31b8fadd2 100644 --- a/ArchiSteamFarm/WebBrowser.cs +++ b/ArchiSteamFarm/WebBrowser.cs @@ -27,6 +27,7 @@ using System.Net.Http; using System.Threading.Tasks; using System.Xml; using ArchiSteamFarm.Localization; +using ArchiSteamFarm.NLog; using HtmlAgilityPack; using Newtonsoft.Json;