Rename class

This commit is contained in:
Jaex 2022-04-13 08:12:14 +03:00
parent 09927275fb
commit 9182823188
20 changed files with 27 additions and 27 deletions

View file

@ -146,7 +146,7 @@ public string GetRequestURL(CustomUploaderInput input)
throw new Exception(Resources.CustomUploaderItem_GetRequestURL_RequestURLMustBeConfigured); throw new Exception(Resources.CustomUploaderItem_GetRequestURL_RequestURLMustBeConfigured);
} }
CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser(input); ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser(input);
parser.URLEncode = true; parser.URLEncode = true;
string url = parser.Parse(RequestURL); string url = parser.Parse(RequestURL);
@ -162,7 +162,7 @@ public string GetRequestURL(CustomUploaderInput input)
if (Parameters != null) if (Parameters != null)
{ {
CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser(input); ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser(input);
parser.UseNameParser = true; parser.UseNameParser = true;
foreach (KeyValuePair<string, string> parameter in Parameters) foreach (KeyValuePair<string, string> parameter in Parameters)
@ -239,7 +239,7 @@ public string GetFileFormName()
if (Arguments != null) if (Arguments != null)
{ {
CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser(input); ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser(input);
parser.UseNameParser = true; parser.UseNameParser = true;
foreach (KeyValuePair<string, string> arg in Arguments) foreach (KeyValuePair<string, string> arg in Arguments)
@ -257,7 +257,7 @@ public NameValueCollection GetHeaders(CustomUploaderInput input)
{ {
NameValueCollection collection = new NameValueCollection(); NameValueCollection collection = new NameValueCollection();
CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser(input); ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser(input);
parser.UseNameParser = true; parser.UseNameParser = true;
foreach (KeyValuePair<string, string> header in Headers) foreach (KeyValuePair<string, string> header in Headers)
@ -282,7 +282,7 @@ public void ParseResponse(UploadResult result, ResponseInfo responseInfo, Custom
responseInfo.ResponseText = ""; responseInfo.ResponseText = "";
} }
CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser() ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser()
{ {
FileName = input.FileName, FileName = input.FileName,
ResponseInfo = responseInfo, ResponseInfo = responseInfo,

View file

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

View file

@ -32,7 +32,7 @@ internal class CustomUploaderFunctionBase64 : CustomUploaderFunction
{ {
public override string Name { get; } = "base64"; 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]; string text = parameters[0];

View file

@ -32,7 +32,7 @@ internal class CustomUploaderFunctionFileName : CustomUploaderFunction
{ {
public override string Name { get; } = "filename"; 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) if (parser.URLEncode)
{ {

View file

@ -30,7 +30,7 @@ internal class CustomUploaderFunctionHeader : CustomUploaderFunction
{ {
public override string Name { get; } = "header"; 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]; string header = parameters[0];

View file

@ -32,7 +32,7 @@ internal class CustomUploaderFunctionInput : CustomUploaderFunction
{ {
public override string Name { get; } = "input"; 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) if (parser.URLEncode)
{ {

View file

@ -32,7 +32,7 @@ internal class CustomUploaderFunctionJson : CustomUploaderFunction
{ {
public override string Name { get; } = "json"; 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/ // https://goessner.net/articles/JsonPath/
string jsonPath = parameters[0]; string jsonPath = parameters[0];

View file

@ -35,7 +35,7 @@ internal class CustomUploaderFunctionPrompt : CustomUploaderFunction
{ {
public override string Name { get; } = "prompt"; 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 title = "ShareX - Prompt";
string defaultValue = ""; string defaultValue = "";

View file

@ -32,7 +32,7 @@ internal class CustomUploaderFunctionRandom : CustomUploaderFunction
{ {
public override string Name { get; } = "random"; 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) if (parameters.Length > 0)
{ {

View file

@ -34,7 +34,7 @@ internal class CustomUploaderFunctionRegex : CustomUploaderFunction
{ {
public override string Name { get; } = "regex"; 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) if (parameters.Length > 0)
{ {

View file

@ -30,7 +30,7 @@ internal class CustomUploaderFunctionResponse : CustomUploaderFunction
{ {
public override string Name { get; } = "response"; 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; return parser.ResponseInfo.ResponseText;
} }

View file

@ -30,7 +30,7 @@ internal class CustomUploaderFunctionResponseURL : CustomUploaderFunction
{ {
public override string Name { get; } = "responseurl"; 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; return parser.ResponseInfo.ResponseURL;
} }

View file

@ -32,7 +32,7 @@ internal class CustomUploaderFunctionSelect : CustomUploaderFunction
{ {
public override string Name { get; } = "select"; 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(); string[] values = parameters.Where(x => !string.IsNullOrEmpty(x)).ToArray();

View file

@ -33,7 +33,7 @@ internal class CustomUploaderFunctionXml : CustomUploaderFunction
{ {
public override string Name { get; } = "xml"; 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 // https://www.w3schools.com/xml/xpath_syntax.asp
string xpath = parameters[0]; string xpath = parameters[0];

View file

@ -29,7 +29,7 @@
namespace ShareX.UploadersLib namespace ShareX.UploadersLib
{ {
public class CustomUploaderSyntaxParser : ShareXSyntaxParser public class ShareXCustomUploaderSyntaxParser : ShareXSyntaxParser
{ {
private static IEnumerable<CustomUploaderFunction> Functions = Helpers.GetInstances<CustomUploaderFunction>(); private static IEnumerable<CustomUploaderFunction> Functions = Helpers.GetInstances<CustomUploaderFunction>();
@ -40,11 +40,11 @@ public class CustomUploaderSyntaxParser : ShareXSyntaxParser
public bool UseNameParser { get; set; } public bool UseNameParser { get; set; }
public NameParserType NameParserType { get; set; } = NameParserType.Text; public NameParserType NameParserType { get; set; } = NameParserType.Text;
public CustomUploaderSyntaxParser() public ShareXCustomUploaderSyntaxParser()
{ {
} }
public CustomUploaderSyntaxParser(CustomUploaderInput input) public ShareXCustomUploaderSyntaxParser(CustomUploaderInput input)
{ {
FileName = input.FileName; FileName = input.FileName;
Input = input.Input; Input = input.Input;

View file

@ -288,7 +288,7 @@ public string GenerateURL(string uploadPath)
if (Settings.UseCustomCNAME && !string.IsNullOrEmpty(Settings.CustomDomain)) if (Settings.UseCustomCNAME && !string.IsNullOrEmpty(Settings.CustomDomain))
{ {
CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser(); ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser();
string parsedDomain = parser.Parse(Settings.CustomDomain); string parsedDomain = parser.Parse(Settings.CustomDomain);
url = URLHelpers.CombineURL(parsedDomain, uploadPath); url = URLHelpers.CombineURL(parsedDomain, uploadPath);
} }

View file

@ -160,7 +160,7 @@ public string GetHttpHomePath()
{ {
string homePath = HttpHomePath.Replace("%host", Host); string homePath = HttpHomePath.Replace("%host", Host);
CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser(); ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser();
parser.UseNameParser = true; parser.UseNameParser = true;
parser.NameParserType = NameParserType.URL; parser.NameParserType = NameParserType.URL;
return parser.Parse(homePath); return parser.Parse(homePath);

View file

@ -694,7 +694,7 @@ private void CustomUploaderSyntaxHighlight(RichTextBox rtb)
rtb.SelectionLength = rtb.TextLength; rtb.SelectionLength = rtb.TextLength;
rtb.SelectionColor = rtb.ForeColor; rtb.SelectionColor = rtb.ForeColor;
CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser(); ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser();
for (int i = 0; i < text.Length; i++) for (int i = 0; i < text.Length; i++)
{ {

View file

@ -96,7 +96,7 @@ private void CustomUploaderSyntaxHighlight(RichTextBox rtb)
rtb.SelectionLength = rtb.TextLength; rtb.SelectionLength = rtb.TextLength;
rtb.SelectionColor = rtb.ForeColor; rtb.SelectionColor = rtb.ForeColor;
CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser(); ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser();
for (int i = 0; i < text.Length; i++) for (int i = 0; i < text.Length; i++)
{ {
@ -127,7 +127,7 @@ private string ParseSyntax(string responseText, string urlSyntax)
ResponseURL = "https://example.com/upload" ResponseURL = "https://example.com/upload"
}; };
CustomUploaderSyntaxParser parser = new CustomUploaderSyntaxParser() ShareXCustomUploaderSyntaxParser parser = new ShareXCustomUploaderSyntaxParser()
{ {
FileName = "example.png", FileName = "example.png",
ResponseInfo = responseInfo, ResponseInfo = responseInfo,

View file

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