CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-30 01:07:21 +13:00
Code Issues Projects Releases Packages Wiki Activity

Rename RequestFormat to Body

Browse source
This commit is contained in:
Jaex 2019-01-08 18:02:21 +03:00
parent 142c68197c
commit fa7f69988e
9 changed files with 47 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs
View file

@ -61,22 +61,24 @@ public class CustomUploaderItem
public bool ShouldSerializeHeaders() => Headers != null && Headers.Count > 0;
public CustomUploaderRequestFormat RequestFormat { get; set; } = CustomUploaderRequestFormat.MultipartFormData;
[DefaultValue("")]
public string FileFormName { get; set; }
public bool ShouldSerializeFileFormName() => !string.IsNullOrEmpty(FileFormName) && RequestFormat == CustomUploaderRequestFormat.MultipartFormData;
[DefaultValue("")]
public string Data { get; set; }
public bool ShouldSerializeData() => RequestFormat == CustomUploaderRequestFormat.JSON;
[DefaultValue(CustomUploaderBody.None)]
public CustomUploaderBody Body { get; set; } = CustomUploaderBody.MultipartFormData;
[DefaultValue(null)]
public Dictionary<string, string> Arguments { get; set; }
public bool ShouldSerializeArguments() => Arguments != null && Arguments.Count > 0;
public bool ShouldSerializeArguments() => (Body == CustomUploaderBody.MultipartFormData || Body == CustomUploaderBody.FormURLEncoded) &&
Arguments != null && Arguments.Count > 0;
[DefaultValue("")]
public string FileFormName { get; set; }
public bool ShouldSerializeFileFormName() => Body == CustomUploaderBody.MultipartFormData && !string.IsNullOrEmpty(FileFormName);
[DefaultValue("")]
public string Data { get; set; }
public bool ShouldSerializeData() => Body == CustomUploaderBody.JSON && !string.IsNullOrEmpty(Data);
[DefaultValue(ResponseType.Text)]
public ResponseType ResponseType { get; set; }
@ -160,7 +162,7 @@ public string GetData(CustomUploaderInput input)
{
CustomUploaderParser parser = new CustomUploaderParser(input);
parser.UseNameParser = true;
parser.JSONEncode = RequestFormat == CustomUploaderRequestFormat.JSON;
parser.JSONEncode = Body == CustomUploaderBody.JSON;
return parser.Parse(Data);
}
@ -254,11 +256,11 @@ public void CheckBackwardCompatibility()
{
if (RequestType == HttpMethod.POST)
{
RequestFormat = CustomUploaderRequestFormat.MultipartFormData;
Body = CustomUploaderBody.MultipartFormData;
}
else
{
RequestFormat = CustomUploaderRequestFormat.None;
Body = CustomUploaderBody.None;
if (Arguments != null)
{

2
ShareX.UploadersLib/Enums.cs
View file

@ -289,7 +289,7 @@ public enum LinkFormatEnum
LocalFilePathUri
}
public enum CustomUploaderRequestFormat
public enum CustomUploaderBody
{
[Description("None")]
None,

6
ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs
View file

@ -83,19 +83,19 @@ public override UploadResult Upload(Stream stream, string fileName)
UploadResult result = new UploadResult();
CustomUploaderInput input = new CustomUploaderInput(fileName, "");
if (uploader.RequestFormat == CustomUploaderRequestFormat.MultipartFormData)
if (uploader.Body == CustomUploaderBody.MultipartFormData)
{
result = SendRequestFile(uploader.GetRequestURL(input), stream, fileName, uploader.GetFileFormName(),
uploader.GetArguments(input), uploader.GetHeaders(input), null, uploader.ResponseType, uploader.RequestType);
}
else if (uploader.RequestFormat == CustomUploaderRequestFormat.Binary)
else if (uploader.Body == CustomUploaderBody.Binary)
{
result.Response = SendRequest(uploader.RequestType, uploader.GetRequestURL(input), stream, UploadHelpers.GetMimeType(fileName),
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else
{
throw new Exception("Unsupported request format: " + uploader.RequestFormat);
throw new Exception("Unsupported request format: " + uploader.Body);
}
try

4
ShareX.UploadersLib/Forms/UploadersConfigForm.cs
View file

@ -131,7 +131,7 @@ private void InitializeControls()
eiCustomUploaders.ObjectType = typeof(CustomUploaderItem);
CustomUploaderAddDestinationTypes();
cbCustomUploaderRequestMethod.Items.AddRange(Enum.GetNames(typeof(HttpMethod)));
cbCustomUploaderRequestFormat.Items.AddRange(Helpers.GetEnumDescriptions<CustomUploaderRequestFormat>());
cbCustomUploaderRequestFormat.Items.AddRange(Helpers.GetEnumDescriptions<CustomUploaderBody>());
cbCustomUploaderResponseType.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<ResponseType>());
// Backblaze B2
@ -3519,7 +3519,7 @@ private void rtbCustomUploaderRequestURL_TextChanged(object sender, EventArgs e)
private void cbCustomUploaderRequestFormat_SelectedIndexChanged(object sender, EventArgs e)
{
CustomUploaderItem uploader = CustomUploaderGetSelected();
if (uploader != null) uploader.RequestFormat = (CustomUploaderRequestFormat)cbCustomUploaderRequestFormat.SelectedIndex;
if (uploader != null) uploader.Body = (CustomUploaderBody)cbCustomUploaderRequestFormat.SelectedIndex;
CustomUploaderUpdateRequestFormatState();
}

10
ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs
View file

@ -966,7 +966,7 @@ private void CustomUploaderLoad(CustomUploaderItem uploader)
cbCustomUploaderRequestMethod.SelectedIndex = (int)uploader.RequestType;
rtbCustomUploaderRequestURL.Text = uploader.RequestURL ?? "";
CustomUploaderSyntaxHighlight(rtbCustomUploaderRequestURL);
cbCustomUploaderRequestFormat.SelectedIndex = (int)uploader.RequestFormat;
cbCustomUploaderRequestFormat.SelectedIndex = (int)uploader.Body;
rtbCustomUploaderData.Text = uploader.Data ?? "";
CustomUploaderSyntaxHighlight(rtbCustomUploaderData);
@ -1057,10 +1057,10 @@ private void CustomUploaderUpdateRequestFormatState()
CustomUploaderItem uploader = CustomUploaderGetSelected();
if (uploader != null)
{
pCustomUploaderBodyArguments.Visible = uploader.RequestFormat == CustomUploaderRequestFormat.MultipartFormData ||
uploader.RequestFormat == CustomUploaderRequestFormat.FormURLEncoded;
pCustomUploaderBodyData.Visible = uploader.RequestFormat == CustomUploaderRequestFormat.JSON;
lblCustomUploaderFileFormName.Visible = txtCustomUploaderFileFormName.Visible = uploader.RequestFormat == CustomUploaderRequestFormat.MultipartFormData;
pCustomUploaderBodyArguments.Visible = uploader.Body == CustomUploaderBody.MultipartFormData ||
uploader.Body == CustomUploaderBody.FormURLEncoded;
pCustomUploaderBodyData.Visible = uploader.Body == CustomUploaderBody.JSON;
lblCustomUploaderFileFormName.Visible = txtCustomUploaderFileFormName.Visible = uploader.Body == CustomUploaderBody.MultipartFormData;
}
}

6
ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs
View file

@ -80,19 +80,19 @@ public override UploadResult Upload(Stream stream, string fileName)
UploadResult result = new UploadResult();
CustomUploaderInput input = new CustomUploaderInput(fileName, "");
if (uploader.RequestFormat == CustomUploaderRequestFormat.MultipartFormData)
if (uploader.Body == CustomUploaderBody.MultipartFormData)
{
result = SendRequestFile(uploader.GetRequestURL(input), stream, fileName, uploader.GetFileFormName(),
uploader.GetArguments(input), uploader.GetHeaders(input), null, uploader.ResponseType, uploader.RequestType);
}
else if (uploader.RequestFormat == CustomUploaderRequestFormat.Binary)
else if (uploader.Body == CustomUploaderBody.Binary)
{
result.Response = SendRequest(uploader.RequestType, uploader.GetRequestURL(input), stream, UploadHelpers.GetMimeType(fileName),
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else
{
throw new Exception("Unsupported request format: " + uploader.RequestFormat);
throw new Exception("Unsupported request format: " + uploader.Body);
}
try

10
ShareX.UploadersLib/SharingServices/CustomURLSharingService.cs
View file

@ -78,29 +78,29 @@ public override UploadResult ShareURL(string url)
UploadResult result = new UploadResult { URL = url, IsURLExpected = false };
CustomUploaderInput input = new CustomUploaderInput("", url);
if (uploader.RequestFormat == CustomUploaderRequestFormat.None)
if (uploader.Body == CustomUploaderBody.None)
{
result.Response = SendRequest(uploader.RequestType, uploader.GetRequestURL(input), null,
uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.RequestFormat == CustomUploaderRequestFormat.MultipartFormData)
else if (uploader.Body == CustomUploaderBody.MultipartFormData)
{
result.Response = SendRequestMultiPart(uploader.GetRequestURL(input), uploader.GetArguments(input), uploader.GetHeaders(input), null,
uploader.ResponseType, uploader.RequestType);
}
else if (uploader.RequestFormat == CustomUploaderRequestFormat.JSON)
else if (uploader.Body == CustomUploaderBody.JSON)
{
result.Response = SendRequest(uploader.RequestType, uploader.GetRequestURL(input), uploader.GetData(input), UploadHelpers.ContentTypeJSON,
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.RequestFormat == CustomUploaderRequestFormat.FormURLEncoded)
else if (uploader.Body == CustomUploaderBody.FormURLEncoded)
{
result.Response = SendRequestURLEncoded(uploader.RequestType, uploader.GetRequestURL(input), uploader.GetArguments(input),
uploader.GetHeaders(input), null, uploader.ResponseType);
}
else
{
throw new Exception("Unsupported request format: " + uploader.RequestFormat);
throw new Exception("Unsupported request format: " + uploader.Body);
}
return result;

12
ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs
View file

@ -83,11 +83,11 @@ public override UploadResult UploadText(string text, string fileName)
UploadResult result = new UploadResult();
CustomUploaderInput input = new CustomUploaderInput(fileName, text);
if (uploader.RequestFormat == CustomUploaderRequestFormat.None)
if (uploader.Body == CustomUploaderBody.None)
{
result.Response = SendRequest(uploader.RequestType, uploader.GetRequestURL(input), null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.RequestFormat == CustomUploaderRequestFormat.MultipartFormData)
else if (uploader.Body == CustomUploaderBody.MultipartFormData)
{
if (string.IsNullOrEmpty(uploader.FileFormName))
{
@ -104,12 +104,12 @@ public override UploadResult UploadText(string text, string fileName)
}
}
}
else if (uploader.RequestFormat == CustomUploaderRequestFormat.JSON)
else if (uploader.Body == CustomUploaderBody.JSON)
{
result.Response = SendRequest(uploader.RequestType, uploader.GetRequestURL(input), uploader.GetData(input), UploadHelpers.ContentTypeJSON,
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.RequestFormat == CustomUploaderRequestFormat.Binary)
else if (uploader.Body == CustomUploaderBody.Binary)
{
byte[] bytes = Encoding.UTF8.GetBytes(text);
using (MemoryStream stream = new MemoryStream(bytes))
@ -118,14 +118,14 @@ public override UploadResult UploadText(string text, string fileName)
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
}
else if (uploader.RequestFormat == CustomUploaderRequestFormat.FormURLEncoded)
else if (uploader.Body == CustomUploaderBody.FormURLEncoded)
{
result.Response = SendRequestURLEncoded(uploader.RequestType, uploader.GetRequestURL(input), uploader.GetArguments(input),
uploader.GetHeaders(input), null, uploader.ResponseType);
}
else
{
throw new Exception("Unsupported request format: " + uploader.RequestFormat);
throw new Exception("Unsupported request format: " + uploader.Body);
}
try

10
ShareX.UploadersLib/URLShorteners/CustomURLShortener.cs
View file

@ -78,28 +78,28 @@ public override UploadResult ShortenURL(string url)
UploadResult result = new UploadResult { URL = url };
CustomUploaderInput input = new CustomUploaderInput("", url);
if (uploader.RequestFormat == CustomUploaderRequestFormat.None)
if (uploader.Body == CustomUploaderBody.None)
{
result.Response = SendRequest(uploader.RequestType, uploader.GetRequestURL(input), null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.RequestFormat == CustomUploaderRequestFormat.MultipartFormData)
else if (uploader.Body == CustomUploaderBody.MultipartFormData)
{
result.Response = SendRequestMultiPart(uploader.GetRequestURL(input), uploader.GetArguments(input), uploader.GetHeaders(input), null,
uploader.ResponseType, uploader.RequestType);
}
else if (uploader.RequestFormat == CustomUploaderRequestFormat.JSON)
else if (uploader.Body == CustomUploaderBody.JSON)
{
result.Response = SendRequest(uploader.RequestType, uploader.GetRequestURL(input), uploader.GetData(input), UploadHelpers.ContentTypeJSON,
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.RequestFormat == CustomUploaderRequestFormat.FormURLEncoded)
else if (uploader.Body == CustomUploaderBody.FormURLEncoded)
{
result.Response = SendRequestURLEncoded(uploader.RequestType, uploader.GetRequestURL(input), uploader.GetArguments(input),
uploader.GetHeaders(input), null, uploader.ResponseType);
}
else
{
throw new Exception("Unsupported request format: " + uploader.RequestFormat);
throw new Exception("Unsupported request format: " + uploader.Body);
}
try