Added ShareXSyntaxParser

ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs

@@ -265,7 +265,7 @@ public void ParseResponse(UploadResult result, ResponseInfo responseInfo, Custom
                     responseInfo.ResponseText = "";
                 }
 
-                CustomUploaderParser2 parser = new CustomUploaderParser2()
+                CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser()
                 {
                     FileName = input.FileName,
                     ResponseInfo = responseInfo,

ShareX.UploadersLib/CustomUploader/CustomUploaderSyntaxParser.cs

@@ -0,0 +1,55 @@
+#region License Information (GPL v3)
+
+/*
+    ShareX - A program that allows you to take screenshots and share any file type
+    Copyright (c) 2007-2022 ShareX Team
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+    Optionally you can also view the license at <http://www.gnu.org/licenses/>.
+*/
+
+#endregion License Information (GPL v3)
+
+using ShareX.HelpersLib;
+using System;
+using System.Collections.Generic;
+
+namespace ShareX.UploadersLib
+{
+    public class CustomUploaderSyntaxParser : ShareXSyntaxParser
+    {
+        private static IEnumerable<CustomUploaderFunction> Functions = Helpers.GetInstances<CustomUploaderFunction>();
+
+        public string FileName { get; set; }
+        public string Input { get; set; }
+        public ResponseInfo ResponseInfo { get; set; }
+        public List<string> RegexList { get; set; }
+        public bool URLEncode { get; set; } // Only URL encodes file name and input
+
+        protected override string CallFunction(string functionName, string[] parameters)
+        {
+            foreach (CustomUploaderFunction function in Functions)
+            {
+                if (function.Name.Equals(functionName, StringComparison.OrdinalIgnoreCase))
+                {
+                    return function.Call(this, parameters);
+                }
+            }
+
+            throw new Exception("Invalid function name: " + functionName);
+        }
+    }
+}

ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunction.cs

@@ -29,6 +29,6 @@ internal abstract class CustomUploaderFunction
     {
         public abstract string Name { get; }
 
-        public abstract string Call(CustomUploaderParser2 parser, string[] parameters);
+        public abstract string Call(CustomUploaderSyntaxParser parser, string[] parameters);
     }
 }

ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionBase64.cs

@@ -31,7 +31,7 @@ internal class CustomUploaderFunctionBase64 : CustomUploaderFunction
     {
         public override string Name { get; } = "base64";
 
-        public override string Call(CustomUploaderParser2 parser, string[] parameters)
+        public override string Call(CustomUploaderSyntaxParser parser, string[] parameters)
         {
             string text = parameters[0];
 

ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionFileName.cs

@@ -31,7 +31,7 @@ internal class CustomUploaderFunctionFileName : CustomUploaderFunction
     {
         public override string Name { get; } = "filename";
 
-        public override string Call(CustomUploaderParser2 parser, string[] parameters)
+        public override string Call(CustomUploaderSyntaxParser parser, string[] parameters)
         {
             if (parser.URLEncode)
             {

ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionHeader.cs

@@ -29,7 +29,7 @@ internal class CustomUploaderFunctionHeader : CustomUploaderFunction
     {
         public override string Name { get; } = "header";
 
-        public override string Call(CustomUploaderParser2 parser, string[] parameters)
+        public override string Call(CustomUploaderSyntaxParser parser, string[] parameters)
         {
             string header = parameters[0];
 

ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionInput.cs

@@ -31,7 +31,7 @@ internal class CustomUploaderFunctionInput : CustomUploaderFunction
     {
         public override string Name { get; } = "input";
 
-        public override string Call(CustomUploaderParser2 parser, string[] parameters)
+        public override string Call(CustomUploaderSyntaxParser parser, string[] parameters)
         {
             if (parser.URLEncode)
             {

ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionJson.cs

@@ -31,7 +31,7 @@ internal class CustomUploaderFunctionJson : CustomUploaderFunction
     {
         public override string Name { get; } = "json";
 
-        public override string Call(CustomUploaderParser2 parser, string[] parameters)
+        public override string Call(CustomUploaderSyntaxParser parser, string[] parameters)
         {
             string jsonPath = parameters[0];
 

ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionPrompt.cs

@@ -32,7 +32,7 @@ internal class CustomUploaderFunctionPrompt : CustomUploaderFunction
     {
         public override string Name { get; } = "prompt";
 
-        public override string Call(CustomUploaderParser2 parser, string[] parameters)
+        public override string Call(CustomUploaderSyntaxParser parser, string[] parameters)
         {
             string title = "ShareX - Prompt";
             string defaultValue = "";

ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionRandom.cs

@@ -31,7 +31,7 @@ internal class CustomUploaderFunctionRandom : CustomUploaderFunction
     {
         public override string Name { get; } = "random";
 
-        public override string Call(CustomUploaderParser2 parser, string[] parameters)
+        public override string Call(CustomUploaderSyntaxParser parser, string[] parameters)
         {
             if (parameters.Length > 0)
             {

ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionRegex.cs

@@ -31,7 +31,7 @@ internal class CustomUploaderFunctionRegex : CustomUploaderFunction
     {
         public override string Name { get; } = "regex";
 
-        public override string Call(CustomUploaderParser2 parser, string[] parameters)
+        public override string Call(CustomUploaderSyntaxParser parser, string[] parameters)
         {
             if (parameters.Length > 0)
             {

ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionResponse.cs

@@ -29,7 +29,7 @@ internal class CustomUploaderFunctionResponse : CustomUploaderFunction
     {
         public override string Name { get; } = "response";
 
-        public override string Call(CustomUploaderParser2 parser, string[] parameters)
+        public override string Call(CustomUploaderSyntaxParser parser, string[] parameters)
         {
             return parser.ResponseInfo.ResponseText;
         }

ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionResponseURL.cs

@@ -29,7 +29,7 @@ internal class CustomUploaderFunctionResponseURL : CustomUploaderFunction
     {
         public override string Name { get; } = "responseurl";
 
-        public override string Call(CustomUploaderParser2 parser, string[] parameters)
+        public override string Call(CustomUploaderSyntaxParser parser, string[] parameters)
         {
             return parser.ResponseInfo.ResponseURL;
         }

ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionSelect.cs

@@ -31,7 +31,7 @@ internal class CustomUploaderFunctionSelect : CustomUploaderFunction
     {
         public override string Name { get; } = "select";
 
-        public override string Call(CustomUploaderParser2 parser, string[] parameters)
+        public override string Call(CustomUploaderSyntaxParser parser, string[] parameters)
         {
             string[] values = parameters.Where(x => !string.IsNullOrEmpty(x)).ToArray();
 

ShareX.UploadersLib/CustomUploader/Functions/CustomUploaderFunctionXml.cs

@@ -32,7 +32,7 @@ internal class CustomUploaderFunctionXml : CustomUploaderFunction
     {
         public override string Name { get; } = "xml";
 
-        public override string Call(CustomUploaderParser2 parser, string[] parameters)
+        public override string Call(CustomUploaderSyntaxParser parser, string[] parameters)
         {
             string xpath = parameters[0];
 

ShareX.UploadersLib/CustomUploader/ShareXSyntaxParser.cs

@@ -23,28 +23,18 @@ You should have received a copy of the GNU General Public License
 
 #endregion License Information (GPL v3)
 
-using ShareX.HelpersLib;
-using System;
 using System.Collections.Generic;
 using System.Text;
 
 namespace ShareX.UploadersLib
 {
-    public class CustomUploaderParser2
+    public abstract class ShareXSyntaxParser
     {
-        private static IEnumerable<CustomUploaderFunction> Functions = Helpers.GetInstances<CustomUploaderFunction>();
+        public virtual char SyntaxStart { get; } = '{';
-
+        public virtual char SyntaxEnd { get; } = '}';
-        public char SyntaxStart { get; private set; } = '{';
+        public virtual char SyntaxParameterStart { get; } = ':';
-        public char SyntaxEnd { get; private set; } = '}';
+        public virtual char SyntaxParameterDelimiter { get; } = '|';
-        public char SyntaxParameterStart { get; private set; } = ':';
+        public virtual char SyntaxEscape { get; } = '\\';
-        public char SyntaxParameterDelimiter { get; private set; } = '|';
-        public char SyntaxEscape { get; private set; } = '\\';
-
-        public string FileName { get; set; }
-        public string Input { get; set; }
-        public ResponseInfo ResponseInfo { get; set; }
-        public List<string> RegexList { get; set; }
-        public bool URLEncode { get; set; } // Only URL encodes file name and input
 
         public string Parse(string text)
         {
@@ -137,17 +127,6 @@ private string ParseFunction(string text, int startPosition, out int endPosition
             return CallFunction(sbFunctionName.ToString(), parameters.ToArray());
         }
 
-        private string CallFunction(string functionName, string[] parameters)
+        protected abstract string CallFunction(string functionName, string[] parameters);
-        {
-            foreach (CustomUploaderFunction function in Functions)
-            {
-                if (function.Name.Equals(functionName, StringComparison.OrdinalIgnoreCase))
-                {
-                    return function.Call(this, parameters);
-                }
-            }
-
-            throw new Exception("Invalid function name: " + functionName);
-        }
     }
 }

ShareX.UploadersLib/ShareX.UploadersLib.csproj

@@ -138,7 +138,8 @@
     <Compile Include="CustomUploader\Functions\CustomUploaderFunctionHeader.cs" />
     <Compile Include="CustomUploader\Functions\CustomUploaderFunctionRegex.cs" />
     <Compile Include="CustomUploader\Functions\CustomUploaderFunctionJson.cs" />
-    <Compile Include="CustomUploader\CustomUploaderParser2.cs" />
+    <Compile Include="CustomUploader\CustomUploaderSyntaxParser.cs" />
+    <Compile Include="CustomUploader\ShareXSyntaxParser.cs" />
     <Compile Include="FileUploaders\AmazonS3.cs" />
     <Compile Include="FileUploaders\AmazonS3Endpoint.cs" />
     <Compile Include="FileUploaders\AmazonS3Settings.cs" />