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

When Body value is missing it should become None instead of MultipartFormData

Browse source
This commit is contained in:
Jaex 2019-02-20 10:36:44 +03:00
parent 398708fc2d
commit a6524f0611
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,7 +68,7 @@ public class CustomUploaderItem
public bool ShouldSerializeHeaders() => Headers != null && Headers.Count > 0; public bool ShouldSerializeHeaders() => Headers != null && Headers.Count > 0;
[DefaultValue(CustomUploaderBody.None)] [DefaultValue(CustomUploaderBody.None)]
public CustomUploaderBody Body { get; set; } = CustomUploaderBody.MultipartFormData; public CustomUploaderBody Body { get; set; }
[DefaultValue(null)] [DefaultValue(null)]
public Dictionary<string, string> Arguments { get; set; } public Dictionary<string, string> Arguments { get; set; }
@ -103,10 +103,20 @@ public bool ShouldSerializeArguments() => (Body == CustomUploaderBody.MultipartF
[DefaultValue("")] [DefaultValue("")]
public string DeletionURL { get; set; } public string DeletionURL { get; set; }
public CustomUploaderItem() private CustomUploaderItem()
{ {
} }
public static CustomUploaderItem Init()
{
return new CustomUploaderItem()
{
Version = Application.ProductVersion,
RequestMethod = HttpMethod.POST,
Body = CustomUploaderBody.MultipartFormData
};
}
public override string ToString() public override string ToString()
{ {
if (!string.IsNullOrEmpty(Name)) if (!string.IsNullOrEmpty(Name))

26
ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs
View file

@ -136,12 +136,7 @@ private CustomUploaderItem CustomUploaderGetSelected()
private void CustomUploaderNew() private void CustomUploaderNew()
{ {
CustomUploaderItem uploader = new CustomUploaderItem() CustomUploaderAdd(CustomUploaderItem.Init());
{
Version = Application.ProductVersion
};
CustomUploaderAdd(uploader);
CustomUploaderUpdateList(); CustomUploaderUpdateList();
} }
@ -231,25 +226,20 @@ private void CustomUploaderLoad(CustomUploaderItem uploader)
private void CustomUploaderUpdateStates() private void CustomUploaderUpdateStates()
{ {
bool isSelected = CustomUploaderCheck(lbCustomUploaderList.SelectedIndex);
btnRemove.Enabled = btnDuplicate.Enabled = txtName.Enabled = mbDestinationType.Enabled = btnRemove.Enabled = btnDuplicate.Enabled = txtName.Enabled = mbDestinationType.Enabled =
tcCustomUploader.Enabled = isSelected; tcCustomUploader.Enabled = CustomUploaderCheck(lbCustomUploaderList.SelectedIndex);
if (isSelected)
{
CustomUploaderUpdateRequestFormatState();
CustomUploaderUpdateResponseState();
}
btnClearUploaders.Enabled = tsmiExportAll.Enabled = cbImageUploader.Enabled = btnClearUploaders.Enabled = tsmiExportAll.Enabled = cbImageUploader.Enabled =
btnImageUploaderTest.Enabled = cbTextUploader.Enabled = btnTextUploaderTest.Enabled = btnImageUploaderTest.Enabled = cbTextUploader.Enabled = btnTextUploaderTest.Enabled =
cbFileUploader.Enabled = btnFileUploaderTest.Enabled = cbURLShortener.Enabled = cbFileUploader.Enabled = btnFileUploaderTest.Enabled = cbURLShortener.Enabled =
btnURLShortenerTest.Enabled = cbURLSharingService.Enabled = btnURLSharingServiceTest.Enabled = btnURLShortenerTest.Enabled = cbURLSharingService.Enabled = btnURLSharingServiceTest.Enabled =
lbCustomUploaderList.Items.Count > 0; lbCustomUploaderList.Items.Count > 0;
CustomUploaderUpdateBodyState();
CustomUploaderUpdateResponseState();
} }
private void CustomUploaderUpdateRequestFormatState() private void CustomUploaderUpdateBodyState()
{ {
CustomUploaderItem uploader = CustomUploaderGetSelected(); CustomUploaderItem uploader = CustomUploaderGetSelected();
if (uploader != null) if (uploader != null)
@ -295,7 +285,7 @@ private void CustomUploaderClearUploaders()
private void CustomUploaderClearFields() private void CustomUploaderClearFields()
{ {
CustomUploaderLoad(new CustomUploaderItem()); CustomUploaderLoad(CustomUploaderItem.Init());
} }
private void CustomUploaderExportAll() private void CustomUploaderExportAll()
@ -990,7 +980,7 @@ private void cbCustomUploaderRequestFormat_SelectedIndexChanged(object sender, E
CustomUploaderItem uploader = CustomUploaderGetSelected(); CustomUploaderItem uploader = CustomUploaderGetSelected();
if (uploader != null) uploader.Body = (CustomUploaderBody)cbBody.SelectedIndex; if (uploader != null) uploader.Body = (CustomUploaderBody)cbBody.SelectedIndex;
CustomUploaderUpdateRequestFormatState(); CustomUploaderUpdateBodyState();
} }
private void dgv_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) private void dgv_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e)