From cbabde1b380334f96307c3edf1f3b37513d8f2a3 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Sat, 8 May 2021 01:03:08 +0200 Subject: [PATCH] Reorganize Web directory --- ArchiSteamFarm.CustomPlugins.ExamplePlugin/CatAPI.cs | 1 + .../SteamTokenDumperPlugin.cs | 1 + ArchiSteamFarm/ASF.cs | 1 + ArchiSteamFarm/ArchiWebHandler.cs | 1 + ArchiSteamFarm/IPC/Responses/GitHubReleaseResponse.cs | 1 + ArchiSteamFarm/Statistics.cs | 1 + ArchiSteamFarm/{ => Web}/GitHub.cs | 4 ++-- ArchiSteamFarm/Web/{ => Responses}/BasicResponse.cs | 2 +- ArchiSteamFarm/Web/{ => Responses}/BinaryResponse.cs | 2 +- ArchiSteamFarm/Web/{ => Responses}/HtmlDocumentResponse.cs | 2 +- ArchiSteamFarm/Web/{ => Responses}/ObjectResponse.cs | 2 +- ArchiSteamFarm/Web/{ => Responses}/StreamResponse.cs | 2 +- ArchiSteamFarm/Web/{ => Responses}/StringResponse.cs | 2 +- ArchiSteamFarm/Web/{ => Responses}/XmlDocumentResponse.cs | 2 +- ArchiSteamFarm/Web/WebBrowser.cs | 1 + 15 files changed, 16 insertions(+), 9 deletions(-) rename ArchiSteamFarm/{ => Web}/GitHub.cs (99%) rename ArchiSteamFarm/Web/{ => Responses}/BasicResponse.cs (97%) rename ArchiSteamFarm/Web/{ => Responses}/BinaryResponse.cs (97%) rename ArchiSteamFarm/Web/{ => Responses}/HtmlDocumentResponse.cs (98%) rename ArchiSteamFarm/Web/{ => Responses}/ObjectResponse.cs (97%) rename ArchiSteamFarm/Web/{ => Responses}/StreamResponse.cs (98%) rename ArchiSteamFarm/Web/{ => Responses}/StringResponse.cs (97%) rename ArchiSteamFarm/Web/{ => Responses}/XmlDocumentResponse.cs (97%) diff --git a/ArchiSteamFarm.CustomPlugins.ExamplePlugin/CatAPI.cs b/ArchiSteamFarm.CustomPlugins.ExamplePlugin/CatAPI.cs index 3e8e6085a..2fd3fec1d 100644 --- a/ArchiSteamFarm.CustomPlugins.ExamplePlugin/CatAPI.cs +++ b/ArchiSteamFarm.CustomPlugins.ExamplePlugin/CatAPI.cs @@ -23,6 +23,7 @@ using System; using System.Diagnostics.CodeAnalysis; using System.Threading.Tasks; using ArchiSteamFarm.Web; +using ArchiSteamFarm.Web.Responses; using Newtonsoft.Json; namespace ArchiSteamFarm.CustomPlugins.ExamplePlugin { diff --git a/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs b/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs index 536c905e4..ee3a39c01 100644 --- a/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs +++ b/ArchiSteamFarm.OfficialPlugins.SteamTokenDumper/SteamTokenDumperPlugin.cs @@ -35,6 +35,7 @@ using System.Threading.Tasks; using ArchiSteamFarm.OfficialPlugins.SteamTokenDumper.Localization; using ArchiSteamFarm.Plugins; using ArchiSteamFarm.Web; +using ArchiSteamFarm.Web.Responses; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using SteamKit2; diff --git a/ArchiSteamFarm/ASF.cs b/ArchiSteamFarm/ASF.cs index 316d8a791..e4a6858e7 100644 --- a/ArchiSteamFarm/ASF.cs +++ b/ArchiSteamFarm/ASF.cs @@ -45,6 +45,7 @@ using ArchiSteamFarm.Localization; using ArchiSteamFarm.NLog; using ArchiSteamFarm.Plugins; using ArchiSteamFarm.Web; +using ArchiSteamFarm.Web.Responses; using JetBrains.Annotations; using SteamKit2; using SteamKit2.Discovery; diff --git a/ArchiSteamFarm/ArchiWebHandler.cs b/ArchiSteamFarm/ArchiWebHandler.cs index 1dc54991f..8eb3e3a60 100644 --- a/ArchiSteamFarm/ArchiWebHandler.cs +++ b/ArchiSteamFarm/ArchiWebHandler.cs @@ -40,6 +40,7 @@ using ArchiSteamFarm.Helpers; using ArchiSteamFarm.Json; using ArchiSteamFarm.Localization; using ArchiSteamFarm.Web; +using ArchiSteamFarm.Web.Responses; using JetBrains.Annotations; using Newtonsoft.Json; using Newtonsoft.Json.Linq; diff --git a/ArchiSteamFarm/IPC/Responses/GitHubReleaseResponse.cs b/ArchiSteamFarm/IPC/Responses/GitHubReleaseResponse.cs index c1e64b63e..8826b4823 100644 --- a/ArchiSteamFarm/IPC/Responses/GitHubReleaseResponse.cs +++ b/ArchiSteamFarm/IPC/Responses/GitHubReleaseResponse.cs @@ -21,6 +21,7 @@ using System; using System.ComponentModel.DataAnnotations; +using ArchiSteamFarm.Web; using Newtonsoft.Json; namespace ArchiSteamFarm.IPC.Responses { diff --git a/ArchiSteamFarm/Statistics.cs b/ArchiSteamFarm/Statistics.cs index 1400bee6c..8700e8a02 100644 --- a/ArchiSteamFarm/Statistics.cs +++ b/ArchiSteamFarm/Statistics.cs @@ -34,6 +34,7 @@ using System.Threading.Tasks; using ArchiSteamFarm.Json; using ArchiSteamFarm.Localization; using ArchiSteamFarm.Web; +using ArchiSteamFarm.Web.Responses; using Newtonsoft.Json; namespace ArchiSteamFarm { diff --git a/ArchiSteamFarm/GitHub.cs b/ArchiSteamFarm/Web/GitHub.cs similarity index 99% rename from ArchiSteamFarm/GitHub.cs rename to ArchiSteamFarm/Web/GitHub.cs index da16c3d81..c7d0e339b 100644 --- a/ArchiSteamFarm/GitHub.cs +++ b/ArchiSteamFarm/Web/GitHub.cs @@ -29,14 +29,14 @@ using System.Linq; using System.Net; using System.Threading.Tasks; using AngleSharp.Dom; -using ArchiSteamFarm.Web; +using ArchiSteamFarm.Web.Responses; using Markdig; using Markdig.Renderers; using Markdig.Syntax; using Markdig.Syntax.Inlines; using Newtonsoft.Json; -namespace ArchiSteamFarm { +namespace ArchiSteamFarm.Web { internal static class GitHub { internal static async Task GetLatestRelease(bool stable = true) { Uri request = new(SharedInfo.GithubReleaseURL + (stable ? "/latest" : "?per_page=1")); diff --git a/ArchiSteamFarm/Web/BasicResponse.cs b/ArchiSteamFarm/Web/Responses/BasicResponse.cs similarity index 97% rename from ArchiSteamFarm/Web/BasicResponse.cs rename to ArchiSteamFarm/Web/Responses/BasicResponse.cs index 828aa7410..c10d63ba8 100644 --- a/ArchiSteamFarm/Web/BasicResponse.cs +++ b/ArchiSteamFarm/Web/Responses/BasicResponse.cs @@ -24,7 +24,7 @@ using System.Net; using System.Net.Http; using JetBrains.Annotations; -namespace ArchiSteamFarm.Web { +namespace ArchiSteamFarm.Web.Responses { public class BasicResponse { [PublicAPI] public HttpStatusCode StatusCode { get; } diff --git a/ArchiSteamFarm/Web/BinaryResponse.cs b/ArchiSteamFarm/Web/Responses/BinaryResponse.cs similarity index 97% rename from ArchiSteamFarm/Web/BinaryResponse.cs rename to ArchiSteamFarm/Web/Responses/BinaryResponse.cs index 4674036a2..f7bea4ce0 100644 --- a/ArchiSteamFarm/Web/BinaryResponse.cs +++ b/ArchiSteamFarm/Web/Responses/BinaryResponse.cs @@ -23,7 +23,7 @@ using System; using System.Collections.Generic; using JetBrains.Annotations; -namespace ArchiSteamFarm.Web { +namespace ArchiSteamFarm.Web.Responses { public sealed class BinaryResponse : BasicResponse { [PublicAPI] public IReadOnlyCollection Content => Bytes; diff --git a/ArchiSteamFarm/Web/HtmlDocumentResponse.cs b/ArchiSteamFarm/Web/Responses/HtmlDocumentResponse.cs similarity index 98% rename from ArchiSteamFarm/Web/HtmlDocumentResponse.cs rename to ArchiSteamFarm/Web/Responses/HtmlDocumentResponse.cs index 9dece4d16..2dcbd5aa3 100644 --- a/ArchiSteamFarm/Web/HtmlDocumentResponse.cs +++ b/ArchiSteamFarm/Web/Responses/HtmlDocumentResponse.cs @@ -25,7 +25,7 @@ using AngleSharp; using AngleSharp.Dom; using JetBrains.Annotations; -namespace ArchiSteamFarm.Web { +namespace ArchiSteamFarm.Web.Responses { public sealed class HtmlDocumentResponse : BasicResponse, IDisposable { [PublicAPI] public IDocument Content { get; } diff --git a/ArchiSteamFarm/Web/ObjectResponse.cs b/ArchiSteamFarm/Web/Responses/ObjectResponse.cs similarity index 97% rename from ArchiSteamFarm/Web/ObjectResponse.cs rename to ArchiSteamFarm/Web/Responses/ObjectResponse.cs index ad0442c61..1cbbfda06 100644 --- a/ArchiSteamFarm/Web/ObjectResponse.cs +++ b/ArchiSteamFarm/Web/Responses/ObjectResponse.cs @@ -22,7 +22,7 @@ using System; using JetBrains.Annotations; -namespace ArchiSteamFarm.Web { +namespace ArchiSteamFarm.Web.Responses { public sealed class ObjectResponse : BasicResponse { [PublicAPI] public T Content { get; } diff --git a/ArchiSteamFarm/Web/StreamResponse.cs b/ArchiSteamFarm/Web/Responses/StreamResponse.cs similarity index 98% rename from ArchiSteamFarm/Web/StreamResponse.cs rename to ArchiSteamFarm/Web/Responses/StreamResponse.cs index 971cf9e13..52e004c7b 100644 --- a/ArchiSteamFarm/Web/StreamResponse.cs +++ b/ArchiSteamFarm/Web/Responses/StreamResponse.cs @@ -28,7 +28,7 @@ using System.Net.Http; using System.Threading.Tasks; using JetBrains.Annotations; -namespace ArchiSteamFarm.Web { +namespace ArchiSteamFarm.Web.Responses { public sealed class StreamResponse : BasicResponse, IAsyncDisposable { [PublicAPI] public Stream Content { get; } diff --git a/ArchiSteamFarm/Web/StringResponse.cs b/ArchiSteamFarm/Web/Responses/StringResponse.cs similarity index 97% rename from ArchiSteamFarm/Web/StringResponse.cs rename to ArchiSteamFarm/Web/Responses/StringResponse.cs index d33685898..42f8969ea 100644 --- a/ArchiSteamFarm/Web/StringResponse.cs +++ b/ArchiSteamFarm/Web/Responses/StringResponse.cs @@ -23,7 +23,7 @@ using System; using System.Net.Http; using JetBrains.Annotations; -namespace ArchiSteamFarm.Web { +namespace ArchiSteamFarm.Web.Responses { public sealed class StringResponse : BasicResponse { [PublicAPI] public string Content { get; } diff --git a/ArchiSteamFarm/Web/XmlDocumentResponse.cs b/ArchiSteamFarm/Web/Responses/XmlDocumentResponse.cs similarity index 97% rename from ArchiSteamFarm/Web/XmlDocumentResponse.cs rename to ArchiSteamFarm/Web/Responses/XmlDocumentResponse.cs index b747d062e..c1841d614 100644 --- a/ArchiSteamFarm/Web/XmlDocumentResponse.cs +++ b/ArchiSteamFarm/Web/Responses/XmlDocumentResponse.cs @@ -23,7 +23,7 @@ using System; using System.Xml; using JetBrains.Annotations; -namespace ArchiSteamFarm.Web { +namespace ArchiSteamFarm.Web.Responses { public sealed class XmlDocumentResponse : BasicResponse { [PublicAPI] public XmlDocument Content { get; } diff --git a/ArchiSteamFarm/Web/WebBrowser.cs b/ArchiSteamFarm/Web/WebBrowser.cs index 0ecfe2ec1..6de0cef73 100644 --- a/ArchiSteamFarm/Web/WebBrowser.cs +++ b/ArchiSteamFarm/Web/WebBrowser.cs @@ -32,6 +32,7 @@ using System.Xml; using ArchiSteamFarm.Localization; using ArchiSteamFarm.NLog; using ArchiSteamFarm.RuntimeCompatibility; +using ArchiSteamFarm.Web.Responses; using JetBrains.Annotations; using Newtonsoft.Json;