From 91828231883b3526ddcfab233161b359c187e373 Mon Sep 17 00:00:00 2001 From: Jaex Date: Wed, 13 Apr 2022 08:12:14 +0300 Subject: [PATCH] Rename class --- .../CustomUploader/CustomUploaderItem.cs | 10 +++++----- .../CustomUploader/Functions/CustomUploaderFunction.cs | 2 +- .../Functions/CustomUploaderFunctionBase64.cs | 2 +- .../Functions/CustomUploaderFunctionFileName.cs | 2 +- .../Functions/CustomUploaderFunctionHeader.cs | 2 +- .../Functions/CustomUploaderFunctionInput.cs | 2 +- .../Functions/CustomUploaderFunctionJson.cs | 2 +- .../Functions/CustomUploaderFunctionPrompt.cs | 2 +- .../Functions/CustomUploaderFunctionRandom.cs | 2 +- .../Functions/CustomUploaderFunctionRegex.cs | 2 +- .../Functions/CustomUploaderFunctionResponse.cs | 2 +- .../Functions/CustomUploaderFunctionResponseURL.cs | 2 +- .../Functions/CustomUploaderFunctionSelect.cs | 2 +- .../Functions/CustomUploaderFunctionXml.cs | 2 +- ...axParser.cs => ShareXCustomUploaderSyntaxParser.cs} | 6 +++--- ShareX.UploadersLib/FileUploaders/AmazonS3.cs | 2 +- ShareX.UploadersLib/FileUploaders/FTPAccount.cs | 2 +- .../Forms/CustomUploaderSettingsForm.cs | 2 +- .../Forms/CustomUploaderSyntaxTestForm.cs | 4 ++-- ShareX.UploadersLib/ShareX.UploadersLib.csproj | 2 +- 20 files changed, 27 insertions(+), 27 deletions(-) rename ShareX.UploadersLib/CustomUploader/{CustomUploaderSyntaxParser.cs => ShareXCustomUploaderSyntaxParser.cs} (93%) diff --git a/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs b/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs index e192ec9e5..6f3ffb215 100644 --- a/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs +++ b/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs @@ -146,7 +146,7 @@ public string GetRequestURL(CustomUploaderInput input) throw new Exception(Resources.CustomUploaderItem_GetRequestURL_RequestURLMustBeConfigured); } - CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser(input); + ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser(input); parser.URLEncode = true; string url = parser.Parse(RequestURL); @@ -162,7 +162,7 @@ public string GetRequestURL(CustomUploaderInput input) if (Parameters != null) { - CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser(input); + ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser(input); parser.UseNameParser = true; foreach (KeyValuePair parameter in Parameters) @@ -239,7 +239,7 @@ public string GetFileFormName() if (Arguments != null) { - CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser(input); + ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser(input); parser.UseNameParser = true; foreach (KeyValuePair arg in Arguments) @@ -257,7 +257,7 @@ public NameValueCollection GetHeaders(CustomUploaderInput input) { NameValueCollection collection = new NameValueCollection(); - CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser(input); + ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser(input); parser.UseNameParser = true; foreach (KeyValuePair header in Headers) @@ -282,7 +282,7 @@ public void ParseResponse(UploadResult result, ResponseInfo responseInfo, Custom responseInfo.ResponseText = ""; } - CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser() + ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser() { FileName = input.FileName, ResponseInfo = responseInfo, diff --git a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunction.cs b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunction.cs index 37d3dcea9..6584f9bbf 100644 --- a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunction.cs +++ b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunction.cs @@ -29,6 +29,6 @@ internal abstract class CustomUploaderFunction { public abstract string Name { get; } - public abstract string Call(CustomUploaderSyntaxParser parser, string[] parameters); + public abstract string Call(ShareXCustomUploaderSyntaxParser parser, string[] parameters); } } \ No newline at end of file diff --git a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionBase64.cs b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionBase64.cs index f3433c962..8d6721293 100644 --- a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionBase64.cs +++ b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionBase64.cs @@ -32,7 +32,7 @@ internal class CustomUploaderFunctionBase64 : CustomUploaderFunction { public override string Name { get; } = "base64"; - public override string Call(CustomUploaderSyntaxParser parser, string[] parameters) + public override string Call(ShareXCustomUploaderSyntaxParser parser, string[] parameters) { string text = parameters[0]; diff --git a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionFileName.cs b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionFileName.cs index 18f7a1e96..cd212bd15 100644 --- a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionFileName.cs +++ b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionFileName.cs @@ -32,7 +32,7 @@ internal class CustomUploaderFunctionFileName : CustomUploaderFunction { public override string Name { get; } = "filename"; - public override string Call(CustomUploaderSyntaxParser parser, string[] parameters) + public override string Call(ShareXCustomUploaderSyntaxParser parser, string[] parameters) { if (parser.URLEncode) { diff --git a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionHeader.cs b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionHeader.cs index 6d904e4bb..5bf3cff77 100644 --- a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionHeader.cs +++ b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionHeader.cs @@ -30,7 +30,7 @@ internal class CustomUploaderFunctionHeader : CustomUploaderFunction { public override string Name { get; } = "header"; - public override string Call(CustomUploaderSyntaxParser parser, string[] parameters) + public override string Call(ShareXCustomUploaderSyntaxParser parser, string[] parameters) { string header = parameters[0]; diff --git a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionInput.cs b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionInput.cs index f32756c9f..57d9d32ab 100644 --- a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionInput.cs +++ b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionInput.cs @@ -32,7 +32,7 @@ internal class CustomUploaderFunctionInput : CustomUploaderFunction { public override string Name { get; } = "input"; - public override string Call(CustomUploaderSyntaxParser parser, string[] parameters) + public override string Call(ShareXCustomUploaderSyntaxParser parser, string[] parameters) { if (parser.URLEncode) { diff --git a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionJson.cs b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionJson.cs index 05c9fff7d..6db2e2df5 100644 --- a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionJson.cs +++ b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionJson.cs @@ -32,7 +32,7 @@ internal class CustomUploaderFunctionJson : CustomUploaderFunction { public override string Name { get; } = "json"; - public override string Call(CustomUploaderSyntaxParser parser, string[] parameters) + public override string Call(ShareXCustomUploaderSyntaxParser parser, string[] parameters) { // https://goessner.net/articles/JsonPath/ string jsonPath = parameters[0]; diff --git a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionPrompt.cs b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionPrompt.cs index 399410419..dc9faa662 100644 --- a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionPrompt.cs +++ b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionPrompt.cs @@ -35,7 +35,7 @@ internal class CustomUploaderFunctionPrompt : CustomUploaderFunction { public override string Name { get; } = "prompt"; - public override string Call(CustomUploaderSyntaxParser parser, string[] parameters) + public override string Call(ShareXCustomUploaderSyntaxParser parser, string[] parameters) { string title = "ShareX - Prompt"; string defaultValue = ""; diff --git a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionRandom.cs b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionRandom.cs index 367e36340..fbd0ecd98 100644 --- a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionRandom.cs +++ b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionRandom.cs @@ -32,7 +32,7 @@ internal class CustomUploaderFunctionRandom : CustomUploaderFunction { public override string Name { get; } = "random"; - public override string Call(CustomUploaderSyntaxParser parser, string[] parameters) + public override string Call(ShareXCustomUploaderSyntaxParser parser, string[] parameters) { if (parameters.Length > 0) { diff --git a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionRegex.cs b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionRegex.cs index dd17d6168..a283e5509 100644 --- a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionRegex.cs +++ b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionRegex.cs @@ -34,7 +34,7 @@ internal class CustomUploaderFunctionRegex : CustomUploaderFunction { public override string Name { get; } = "regex"; - public override string Call(CustomUploaderSyntaxParser parser, string[] parameters) + public override string Call(ShareXCustomUploaderSyntaxParser parser, string[] parameters) { if (parameters.Length > 0) { diff --git a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionResponse.cs b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionResponse.cs index 8c2baab07..7eeb7a704 100644 --- a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionResponse.cs +++ b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionResponse.cs @@ -30,7 +30,7 @@ internal class CustomUploaderFunctionResponse : CustomUploaderFunction { public override string Name { get; } = "response"; - public override string Call(CustomUploaderSyntaxParser parser, string[] parameters) + public override string Call(ShareXCustomUploaderSyntaxParser parser, string[] parameters) { return parser.ResponseInfo.ResponseText; } diff --git a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionResponseURL.cs b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionResponseURL.cs index 59e0fb83b..9ac97021f 100644 --- a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionResponseURL.cs +++ b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionResponseURL.cs @@ -30,7 +30,7 @@ internal class CustomUploaderFunctionResponseURL : CustomUploaderFunction { public override string Name { get; } = "responseurl"; - public override string Call(CustomUploaderSyntaxParser parser, string[] parameters) + public override string Call(ShareXCustomUploaderSyntaxParser parser, string[] parameters) { return parser.ResponseInfo.ResponseURL; } diff --git a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionSelect.cs b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionSelect.cs index 8d928ddae..db1171aa9 100644 --- a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionSelect.cs +++ b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionSelect.cs @@ -32,7 +32,7 @@ internal class CustomUploaderFunctionSelect : CustomUploaderFunction { public override string Name { get; } = "select"; - public override string Call(CustomUploaderSyntaxParser parser, string[] parameters) + public override string Call(ShareXCustomUploaderSyntaxParser parser, string[] parameters) { string[] values = parameters.Where(x => !string.IsNullOrEmpty(x)).ToArray(); diff --git a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionXml.cs b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionXml.cs index 1decef5c7..b9a4ae3f7 100644 --- a/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionXml.cs +++ b/ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionXml.cs @@ -33,7 +33,7 @@ internal class CustomUploaderFunctionXml : CustomUploaderFunction { public override string Name { get; } = "xml"; - public override string Call(CustomUploaderSyntaxParser parser, string[] parameters) + public override string Call(ShareXCustomUploaderSyntaxParser parser, string[] parameters) { // https://www.w3schools.com/xml/xpath_syntax.asp string xpath = parameters[0]; diff --git a/ShareX.UploadersLib/CustomUploader/CustomUploaderSyntaxParser.cs b/ShareX.UploadersLib/CustomUploader/ShareXCustomUploaderSyntaxParser.cs similarity index 93% rename from ShareX.UploadersLib/CustomUploader/CustomUploaderSyntaxParser.cs rename to ShareX.UploadersLib/CustomUploader/ShareXCustomUploaderSyntaxParser.cs index eb5828ab1..5655d9b8a 100644 --- a/ShareX.UploadersLib/CustomUploader/CustomUploaderSyntaxParser.cs +++ b/ShareX.UploadersLib/CustomUploader/ShareXCustomUploaderSyntaxParser.cs @@ -29,7 +29,7 @@ namespace ShareX.UploadersLib { - public class CustomUploaderSyntaxParser : ShareXSyntaxParser + public class ShareXCustomUploaderSyntaxParser : ShareXSyntaxParser { private static IEnumerable Functions = Helpers.GetInstances(); @@ -40,11 +40,11 @@ public class CustomUploaderSyntaxParser : ShareXSyntaxParser public bool UseNameParser { get; set; } public NameParserType NameParserType { get; set; } = NameParserType.Text; - public CustomUploaderSyntaxParser() + public ShareXCustomUploaderSyntaxParser() { } - public CustomUploaderSyntaxParser(CustomUploaderInput input) + public ShareXCustomUploaderSyntaxParser(CustomUploaderInput input) { FileName = input.FileName; Input = input.Input; diff --git a/ShareX.UploadersLib/FileUploaders/AmazonS3.cs b/ShareX.UploadersLib/FileUploaders/AmazonS3.cs index 6e13de6c8..ad74c3c4b 100644 --- a/ShareX.UploadersLib/FileUploaders/AmazonS3.cs +++ b/ShareX.UploadersLib/FileUploaders/AmazonS3.cs @@ -288,7 +288,7 @@ public string GenerateURL(string uploadPath) if (Settings.UseCustomCNAME && !string.IsNullOrEmpty(Settings.CustomDomain)) { - CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser(); + ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser(); string parsedDomain = parser.Parse(Settings.CustomDomain); url = URLHelpers.CombineURL(parsedDomain, uploadPath); } diff --git a/ShareX.UploadersLib/FileUploaders/FTPAccount.cs b/ShareX.UploadersLib/FileUploaders/FTPAccount.cs index d670ecb06..ecd2b1634 100644 --- a/ShareX.UploadersLib/FileUploaders/FTPAccount.cs +++ b/ShareX.UploadersLib/FileUploaders/FTPAccount.cs @@ -160,7 +160,7 @@ public string GetHttpHomePath() { string homePath = HttpHomePath.Replace("%host", Host); - CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser(); + ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser(); parser.UseNameParser = true; parser.NameParserType = NameParserType.URL; return parser.Parse(homePath); diff --git a/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs b/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs index c3f394685..70ef1a6a4 100644 --- a/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs +++ b/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs @@ -694,7 +694,7 @@ private void CustomUploaderSyntaxHighlight(RichTextBox rtb) rtb.SelectionLength = rtb.TextLength; rtb.SelectionColor = rtb.ForeColor; - CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser(); + ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser(); for (int i = 0; i < text.Length; i++) { diff --git a/ShareX.UploadersLib/Forms/CustomUploaderSyntaxTestForm.cs b/ShareX.UploadersLib/Forms/CustomUploaderSyntaxTestForm.cs index f53c2bdfe..0203d7047 100644 --- a/ShareX.UploadersLib/Forms/CustomUploaderSyntaxTestForm.cs +++ b/ShareX.UploadersLib/Forms/CustomUploaderSyntaxTestForm.cs @@ -96,7 +96,7 @@ private void CustomUploaderSyntaxHighlight(RichTextBox rtb) rtb.SelectionLength = rtb.TextLength; rtb.SelectionColor = rtb.ForeColor; - CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser(); + ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser(); for (int i = 0; i < text.Length; i++) { @@ -127,7 +127,7 @@ private string ParseSyntax(string responseText, string urlSyntax) ResponseURL = "https://example.com/upload" }; - CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser() + ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser() { FileName = "example.png", ResponseInfo = responseInfo, diff --git a/ShareX.UploadersLib/ShareX.UploadersLib.csproj b/ShareX.UploadersLib/ShareX.UploadersLib.csproj index beeb8145c..efadd52a6 100644 --- a/ShareX.UploadersLib/ShareX.UploadersLib.csproj +++ b/ShareX.UploadersLib/ShareX.UploadersLib.csproj @@ -138,7 +138,7 @@ - +