diff --git a/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs b/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs index 84ac1a4e4..70d3ac715 100644 --- a/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs +++ b/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs @@ -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; } diff --git a/ShareX.UploadersLib/Enums.cs b/ShareX.UploadersLib/Enums.cs index 553900465..6b812e8d6 100644 --- a/ShareX.UploadersLib/Enums.cs +++ b/ShareX.UploadersLib/Enums.cs @@ -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)")] diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index 96e8822de..02c4a1bd7 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -130,7 +130,7 @@ private void InitializeControls() eiCustomUploaders.ObjectType = typeof(CustomUploaderItem); CustomUploaderAddDestinationTypes(); cbCustomUploaderRequestType.Items.AddRange(Enum.GetNames(typeof(HttpMethod))); - cbCustomUploaderRequestFormat.Items.AddRange(Helpers.GetEnumDescriptions(1)); + cbCustomUploaderRequestFormat.Items.AddRange(Helpers.GetEnumDescriptions()); cbCustomUploaderResponseType.Items.AddRange(Helpers.GetLocalizedEnumDescriptions()); // 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(); } diff --git a/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs b/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs index a2d06caa3..91081cfa0 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs @@ -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);