CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-30 20:20:34 +12:00
Code Issues Packages Projects Releases Wiki Activity

Removed None from request method, not need anymore

Browse source
This commit is contained in:
Jaex 2019-01-04 19:45:42 +03:00
parent f4d8ed3b1e
commit 85f98bc063
4 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,19 +47,17 @@ public class CustomUploaderItem
public CustomUploaderDestinationType DestinationType { get; set; }
[DefaultValue(HttpMethod.POST)]
public HttpMethod RequestType { get; set; }
public HttpMethod RequestType { get; set; } = HttpMethod.POST;
[DefaultValue("")]
public string RequestURL { get; set; }
[DefaultValue(CustomUploaderRequestFormat.None)]
public CustomUploaderRequestFormat RequestFormat { get; set; }
[DefaultValue("")]
public string FileFormName { get; set; }
public bool ShouldSerializeFileFormName() => (RequestFormat == CustomUploaderRequestFormat.None && RequestType == HttpMethod.POST) ||
RequestFormat == CustomUploaderRequestFormat.MultipartFormData;
public bool ShouldSerializeFileFormName() => !string.IsNullOrEmpty(FileFormName) && RequestFormat == CustomUploaderRequestFormat.MultipartFormData;
[DefaultValue("")]
public string Data { get; set; }

2
ShareX.UploadersLib/Enums.cs
View file

@ -291,8 +291,6 @@ public enum LinkFormatEnum
public enum CustomUploaderRequestFormat
{
[Description("None")]
None,
[Description("Form data (multipart/form-data)")]
MultipartFormData,
[Description("URL query string (example.com?name1=value1)")]

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

@ -130,7 +130,7 @@ private void InitializeControls()
eiCustomUploaders.ObjectType = typeof(CustomUploaderItem);
CustomUploaderAddDestinationTypes();
cbCustomUploaderRequestType.Items.AddRange(Enum.GetNames(typeof(HttpMethod)));
cbCustomUploaderRequestFormat.Items.AddRange(Helpers.GetEnumDescriptions<CustomUploaderRequestFormat>(1));
cbCustomUploaderRequestFormat.Items.AddRange(Helpers.GetEnumDescriptions<CustomUploaderRequestFormat>());
cbCustomUploaderResponseType.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<ResponseType>());
// Backblaze B2
@ -3518,7 +3518,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 + 1);
if (uploader != null) uploader.RequestFormat = (CustomUploaderRequestFormat)cbCustomUploaderRequestFormat.SelectedIndex;
CustomUploaderUpdateRequestFormatState();
}

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

@ -966,7 +966,7 @@ private void CustomUploaderLoad(CustomUploaderItem uploader)
cbCustomUploaderRequestType.SelectedIndex = (int)uploader.RequestType;
rtbCustomUploaderRequestURL.Text = uploader.RequestURL ?? "";
CustomUploaderSyntaxHighlight(rtbCustomUploaderRequestURL);
cbCustomUploaderRequestFormat.SelectedIndex = (int)uploader.RequestFormat - 1;
cbCustomUploaderRequestFormat.SelectedIndex = (int)uploader.RequestFormat;
rtbCustomUploaderData.Text = uploader.Data ?? "";
CustomUploaderSyntaxHighlight(rtbCustomUploaderData);