From c22d0cf9419c47dd9ccde2eb4a7245b233633644 Mon Sep 17 00:00:00 2001 From: runebaas Date: Sat, 8 Aug 2020 21:09:27 +0200 Subject: [PATCH] Merge WikipediaApi into the main code base --- Geekbot.net.sln | 6 ------ Geekbot.net/Commands/Integrations/Wikipedia.cs | 4 ++-- .../Lib/WikipediaClient}/IWikipediaClient.cs | 4 ++-- .../Lib/WikipediaClient}/Page/PageApiUrls.cs | 2 +- .../Lib/WikipediaClient}/Page/PageContentUrlCollection.cs | 2 +- .../Lib/WikipediaClient}/Page/PageContentUrls.cs | 2 +- .../Lib/WikipediaClient}/Page/PageCoordinates.cs | 2 +- .../Lib/WikipediaClient}/Page/PageImage.cs | 2 +- .../Lib/WikipediaClient}/Page/PageNamespace.cs | 2 +- .../Lib/WikipediaClient}/Page/PagePreview.cs | 2 +- .../Lib/WikipediaClient}/Page/PageTitles.cs | 2 +- .../Lib/WikipediaClient}/Page/PageTypes.cs | 2 +- .../Lib/WikipediaClient}/WikipediaClient.cs | 4 ++-- Geekbot.net/Program.cs | 2 +- WikipediaApi/WikipediaApi.csproj | 8 -------- 15 files changed, 16 insertions(+), 30 deletions(-) rename {WikipediaApi => Geekbot.net/Lib/WikipediaClient}/IWikipediaClient.cs (63%) rename {WikipediaApi => Geekbot.net/Lib/WikipediaClient}/Page/PageApiUrls.cs (84%) rename {WikipediaApi => Geekbot.net/Lib/WikipediaClient}/Page/PageContentUrlCollection.cs (73%) rename {WikipediaApi => Geekbot.net/Lib/WikipediaClient}/Page/PageContentUrls.cs (79%) rename {WikipediaApi => Geekbot.net/Lib/WikipediaClient}/Page/PageCoordinates.cs (68%) rename {WikipediaApi => Geekbot.net/Lib/WikipediaClient}/Page/PageImage.cs (76%) rename {WikipediaApi => Geekbot.net/Lib/WikipediaClient}/Page/PageNamespace.cs (68%) rename {WikipediaApi => Geekbot.net/Lib/WikipediaClient}/Page/PagePreview.cs (94%) rename {WikipediaApi => Geekbot.net/Lib/WikipediaClient}/Page/PageTitles.cs (76%) rename {WikipediaApi => Geekbot.net/Lib/WikipediaClient}/Page/PageTypes.cs (84%) rename {WikipediaApi => Geekbot.net/Lib/WikipediaClient}/WikipediaClient.cs (87%) delete mode 100644 WikipediaApi/WikipediaApi.csproj diff --git a/Geekbot.net.sln b/Geekbot.net.sln index b542f25..5011ad4 100644 --- a/Geekbot.net.sln +++ b/Geekbot.net.sln @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Geekbot.net", "Geekbot.net/ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{4CAF5F02-EFFE-4FDA-BD44-EEADDBA9600E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WikipediaApi", "WikipediaApi\WikipediaApi.csproj", "{1084D499-EF94-4834-9E6A-B2AD81B60078}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -23,10 +21,6 @@ Global {4CAF5F02-EFFE-4FDA-BD44-EEADDBA9600E}.Debug|Any CPU.Build.0 = Debug|Any CPU {4CAF5F02-EFFE-4FDA-BD44-EEADDBA9600E}.Release|Any CPU.ActiveCfg = Release|Any CPU {4CAF5F02-EFFE-4FDA-BD44-EEADDBA9600E}.Release|Any CPU.Build.0 = Release|Any CPU - {1084D499-EF94-4834-9E6A-B2AD81B60078}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1084D499-EF94-4834-9E6A-B2AD81B60078}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1084D499-EF94-4834-9E6A-B2AD81B60078}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1084D499-EF94-4834-9E6A-B2AD81B60078}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Geekbot.net/Commands/Integrations/Wikipedia.cs b/Geekbot.net/Commands/Integrations/Wikipedia.cs index 9124670..93f68fd 100644 --- a/Geekbot.net/Commands/Integrations/Wikipedia.cs +++ b/Geekbot.net/Commands/Integrations/Wikipedia.cs @@ -8,9 +8,9 @@ using Discord.Commands; using Geekbot.net.Database; using Geekbot.net.Lib.ErrorHandling; using Geekbot.net.Lib.Extensions; +using Geekbot.net.Lib.WikipediaClient; +using Geekbot.net.Lib.WikipediaClient.Page; using HtmlAgilityPack; -using WikipediaApi; -using WikipediaApi.Page; namespace Geekbot.net.Commands.Integrations { diff --git a/WikipediaApi/IWikipediaClient.cs b/Geekbot.net/Lib/WikipediaClient/IWikipediaClient.cs similarity index 63% rename from WikipediaApi/IWikipediaClient.cs rename to Geekbot.net/Lib/WikipediaClient/IWikipediaClient.cs index 4d1dae9..c6cdf3d 100644 --- a/WikipediaApi/IWikipediaClient.cs +++ b/Geekbot.net/Lib/WikipediaClient/IWikipediaClient.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using WikipediaApi.Page; +using Geekbot.net.Lib.WikipediaClient.Page; -namespace WikipediaApi +namespace Geekbot.net.Lib.WikipediaClient { public interface IWikipediaClient { diff --git a/WikipediaApi/Page/PageApiUrls.cs b/Geekbot.net/Lib/WikipediaClient/Page/PageApiUrls.cs similarity index 84% rename from WikipediaApi/Page/PageApiUrls.cs rename to Geekbot.net/Lib/WikipediaClient/Page/PageApiUrls.cs index 8a121be..803f4d7 100644 --- a/WikipediaApi/Page/PageApiUrls.cs +++ b/Geekbot.net/Lib/WikipediaClient/Page/PageApiUrls.cs @@ -1,6 +1,6 @@ using System; -namespace WikipediaApi.Page +namespace Geekbot.net.Lib.WikipediaClient.Page { public class PageApiUrls { diff --git a/WikipediaApi/Page/PageContentUrlCollection.cs b/Geekbot.net/Lib/WikipediaClient/Page/PageContentUrlCollection.cs similarity index 73% rename from WikipediaApi/Page/PageContentUrlCollection.cs rename to Geekbot.net/Lib/WikipediaClient/Page/PageContentUrlCollection.cs index f6c680b..614aaa7 100644 --- a/WikipediaApi/Page/PageContentUrlCollection.cs +++ b/Geekbot.net/Lib/WikipediaClient/Page/PageContentUrlCollection.cs @@ -1,4 +1,4 @@ -namespace WikipediaApi.Page +namespace Geekbot.net.Lib.WikipediaClient.Page { public class PageContentUrlCollection { diff --git a/WikipediaApi/Page/PageContentUrls.cs b/Geekbot.net/Lib/WikipediaClient/Page/PageContentUrls.cs similarity index 79% rename from WikipediaApi/Page/PageContentUrls.cs rename to Geekbot.net/Lib/WikipediaClient/Page/PageContentUrls.cs index 64a80dc..faf7bb5 100644 --- a/WikipediaApi/Page/PageContentUrls.cs +++ b/Geekbot.net/Lib/WikipediaClient/Page/PageContentUrls.cs @@ -1,6 +1,6 @@ using System; -namespace WikipediaApi.Page +namespace Geekbot.net.Lib.WikipediaClient.Page { public class PageContentUrls { diff --git a/WikipediaApi/Page/PageCoordinates.cs b/Geekbot.net/Lib/WikipediaClient/Page/PageCoordinates.cs similarity index 68% rename from WikipediaApi/Page/PageCoordinates.cs rename to Geekbot.net/Lib/WikipediaClient/Page/PageCoordinates.cs index 7fa42ba..ce67f9b 100644 --- a/WikipediaApi/Page/PageCoordinates.cs +++ b/Geekbot.net/Lib/WikipediaClient/Page/PageCoordinates.cs @@ -1,4 +1,4 @@ -namespace WikipediaApi.Page +namespace Geekbot.net.Lib.WikipediaClient.Page { public class PageCoordinates { diff --git a/WikipediaApi/Page/PageImage.cs b/Geekbot.net/Lib/WikipediaClient/Page/PageImage.cs similarity index 76% rename from WikipediaApi/Page/PageImage.cs rename to Geekbot.net/Lib/WikipediaClient/Page/PageImage.cs index 4a8b28d..cdcc2a9 100644 --- a/WikipediaApi/Page/PageImage.cs +++ b/Geekbot.net/Lib/WikipediaClient/Page/PageImage.cs @@ -1,6 +1,6 @@ using System; -namespace WikipediaApi.Page +namespace Geekbot.net.Lib.WikipediaClient.Page { public class PageImage { diff --git a/WikipediaApi/Page/PageNamespace.cs b/Geekbot.net/Lib/WikipediaClient/Page/PageNamespace.cs similarity index 68% rename from WikipediaApi/Page/PageNamespace.cs rename to Geekbot.net/Lib/WikipediaClient/Page/PageNamespace.cs index 66600b6..798e6b9 100644 --- a/WikipediaApi/Page/PageNamespace.cs +++ b/Geekbot.net/Lib/WikipediaClient/Page/PageNamespace.cs @@ -1,4 +1,4 @@ -namespace WikipediaApi.Page +namespace Geekbot.net.Lib.WikipediaClient.Page { public class PageNamespace { diff --git a/WikipediaApi/Page/PagePreview.cs b/Geekbot.net/Lib/WikipediaClient/Page/PagePreview.cs similarity index 94% rename from WikipediaApi/Page/PagePreview.cs rename to Geekbot.net/Lib/WikipediaClient/Page/PagePreview.cs index 8db9dad..37434d3 100644 --- a/WikipediaApi/Page/PagePreview.cs +++ b/Geekbot.net/Lib/WikipediaClient/Page/PagePreview.cs @@ -2,7 +2,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; -namespace WikipediaApi.Page +namespace Geekbot.net.Lib.WikipediaClient.Page { public class PagePreview { diff --git a/WikipediaApi/Page/PageTitles.cs b/Geekbot.net/Lib/WikipediaClient/Page/PageTitles.cs similarity index 76% rename from WikipediaApi/Page/PageTitles.cs rename to Geekbot.net/Lib/WikipediaClient/Page/PageTitles.cs index 31a55b9..dcc2cea 100644 --- a/WikipediaApi/Page/PageTitles.cs +++ b/Geekbot.net/Lib/WikipediaClient/Page/PageTitles.cs @@ -1,4 +1,4 @@ -namespace WikipediaApi.Page +namespace Geekbot.net.Lib.WikipediaClient.Page { public class PageTitles { diff --git a/WikipediaApi/Page/PageTypes.cs b/Geekbot.net/Lib/WikipediaClient/Page/PageTypes.cs similarity index 84% rename from WikipediaApi/Page/PageTypes.cs rename to Geekbot.net/Lib/WikipediaClient/Page/PageTypes.cs index a415d75..63cd4d2 100644 --- a/WikipediaApi/Page/PageTypes.cs +++ b/Geekbot.net/Lib/WikipediaClient/Page/PageTypes.cs @@ -1,6 +1,6 @@ using System.Runtime.Serialization; -namespace WikipediaApi.Page +namespace Geekbot.net.Lib.WikipediaClient.Page { public enum PageTypes { diff --git a/WikipediaApi/WikipediaClient.cs b/Geekbot.net/Lib/WikipediaClient/WikipediaClient.cs similarity index 87% rename from WikipediaApi/WikipediaClient.cs rename to Geekbot.net/Lib/WikipediaClient/WikipediaClient.cs index 6576f3d..ed4902a 100644 --- a/WikipediaApi/WikipediaClient.cs +++ b/Geekbot.net/Lib/WikipediaClient/WikipediaClient.cs @@ -1,9 +1,9 @@ using System.Net.Http; using System.Threading.Tasks; +using Geekbot.net.Lib.WikipediaClient.Page; using Newtonsoft.Json; -using WikipediaApi.Page; -namespace WikipediaApi +namespace Geekbot.net.Lib.WikipediaClient { public class WikipediaClient : IWikipediaClient { diff --git a/Geekbot.net/Program.cs b/Geekbot.net/Program.cs index 689c170..5876c4a 100755 --- a/Geekbot.net/Program.cs +++ b/Geekbot.net/Program.cs @@ -24,10 +24,10 @@ using Geekbot.net.Lib.Media; using Geekbot.net.Lib.RandomNumberGenerator; using Geekbot.net.Lib.ReactionListener; using Geekbot.net.Lib.UserRepository; +using Geekbot.net.Lib.WikipediaClient; using Geekbot.net.WebApi; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; -using WikipediaApi; namespace Geekbot.net { diff --git a/WikipediaApi/WikipediaApi.csproj b/WikipediaApi/WikipediaApi.csproj deleted file mode 100644 index e53e3c2..0000000 --- a/WikipediaApi/WikipediaApi.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - net5.0 - - - - - \ No newline at end of file