CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-02 13:10:22 +12:00
Code Issues Packages Projects Releases Wiki Activity

Rename CustomUploaderRequestType to CustomUploaderRequestMethod

Browse source
This commit is contained in:
Jaex 2018-11-11 10:33:17 +03:00
parent 3021c2b522
commit 015693290a
9 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.UploadersLib/Enums.cs
View file

@ -289,7 +289,7 @@ public enum LinkFormatEnum
LocalFilePathUri LocalFilePathUri
} }
public enum CustomUploaderRequestType public enum CustomUploaderRequestMethod
{ {
POST, POST,
GET, GET,

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

@ -80,7 +80,7 @@ public CustomFileUploader(CustomUploaderItem customUploaderItem)
public override UploadResult Upload(Stream stream, string fileName) public override UploadResult Upload(Stream stream, string fileName)
{ {
if (customUploader.RequestType != CustomUploaderRequestType.POST) if (customUploader.RequestType != CustomUploaderRequestMethod.POST)
{ {
throw new Exception("'Request type' must be 'POST' when using custom file uploader."); throw new Exception("'Request type' must be 'POST' when using custom file uploader.");
} }

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

@ -120,7 +120,7 @@ private void InitializeControls()
txtCustomUploaderLog.AddContextMenu(); txtCustomUploaderLog.AddContextMenu();
eiCustomUploaders.ObjectType = typeof(CustomUploaderItem); eiCustomUploaders.ObjectType = typeof(CustomUploaderItem);
CustomUploaderAddDestinationTypes(); CustomUploaderAddDestinationTypes();
cbCustomUploaderRequestType.Items.AddRange(Enum.GetNames(typeof(CustomUploaderRequestType))); cbCustomUploaderRequestType.Items.AddRange(Enum.GetNames(typeof(CustomUploaderRequestMethod)));
cbCustomUploaderResponseType.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<ResponseType>()); cbCustomUploaderResponseType.Items.AddRange(Helpers.GetLocalizedEnumDescriptions<ResponseType>());
// Backblaze B2 // Backblaze B2
@ -3482,7 +3482,7 @@ private void txtCustomUploaderName_TextChanged(object sender, EventArgs e)
private void cbCustomUploaderRequestType_SelectedIndexChanged(object sender, EventArgs e) private void cbCustomUploaderRequestType_SelectedIndexChanged(object sender, EventArgs e)
{ {
CustomUploaderItem uploader = CustomUploaderGetSelected(); CustomUploaderItem uploader = CustomUploaderGetSelected();
if (uploader != null) uploader.RequestType = (CustomUploaderRequestType)cbCustomUploaderRequestType.SelectedIndex; if (uploader != null) uploader.RequestType = (CustomUploaderRequestMethod)cbCustomUploaderRequestType.SelectedIndex;
CustomUploaderUpdateRequestState(); CustomUploaderUpdateRequestState();
} }

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

@ -958,7 +958,7 @@ private void CustomUploaderLoad(CustomUploaderItem uploader)
cbCustomUploaderRequestType.SelectedIndex = (int)uploader.RequestType; cbCustomUploaderRequestType.SelectedIndex = (int)uploader.RequestType;
txtCustomUploaderRequestURL.Text = uploader.RequestURL ?? ""; txtCustomUploaderRequestURL.Text = uploader.RequestURL ?? "";
txtCustomUploaderFileForm.Text = uploader.FileFormName ?? ""; txtCustomUploaderFileForm.Text = uploader.FileFormName ?? "";
txtCustomUploaderFileForm.Enabled = uploader.RequestType == CustomUploaderRequestType.POST; txtCustomUploaderFileForm.Enabled = uploader.RequestType == CustomUploaderRequestMethod.POST;
txtCustomUploaderArgName.Text = ""; txtCustomUploaderArgName.Text = "";
txtCustomUploaderArgValue.Text = ""; txtCustomUploaderArgValue.Text = "";
@ -1026,7 +1026,7 @@ private void CustomUploaderUpdateStates()
private void CustomUploaderUpdateRequestState() private void CustomUploaderUpdateRequestState()
{ {
txtCustomUploaderFileForm.Enabled = (CustomUploaderRequestType)cbCustomUploaderRequestType.SelectedIndex == CustomUploaderRequestType.POST; txtCustomUploaderFileForm.Enabled = (CustomUploaderRequestMethod)cbCustomUploaderRequestType.SelectedIndex == CustomUploaderRequestMethod.POST;
} }
private void CustomUploaderUpdateArgumentsState() private void CustomUploaderUpdateArgumentsState()

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

@ -42,8 +42,8 @@ public class CustomUploaderItem
[DefaultValue(CustomUploaderDestinationType.None)] [DefaultValue(CustomUploaderDestinationType.None)]
public CustomUploaderDestinationType DestinationType { get; set; } public CustomUploaderDestinationType DestinationType { get; set; }
[DefaultValue(CustomUploaderRequestType.POST)] [DefaultValue(CustomUploaderRequestMethod.POST)]
public CustomUploaderRequestType RequestType { get; set; } public CustomUploaderRequestMethod RequestType { get; set; }
[DefaultValue("")] [DefaultValue("")]
public string RequestURL { get; set; } public string RequestURL { get; set; }
@ -109,15 +109,15 @@ public HttpMethod GetHttpMethod()
switch (RequestType) switch (RequestType)
{ {
default: default:
case CustomUploaderRequestType.POST: case CustomUploaderRequestMethod.POST:
return HttpMethod.POST; return HttpMethod.POST;
case CustomUploaderRequestType.GET: case CustomUploaderRequestMethod.GET:
return HttpMethod.GET; return HttpMethod.GET;
case CustomUploaderRequestType.PUT: case CustomUploaderRequestMethod.PUT:
return HttpMethod.PUT; return HttpMethod.PUT;
case CustomUploaderRequestType.PATCH: case CustomUploaderRequestMethod.PATCH:
return HttpMethod.PATCH; return HttpMethod.PATCH;
case CustomUploaderRequestType.DELETE: case CustomUploaderRequestMethod.DELETE:
return HttpMethod.DELETE; return HttpMethod.DELETE;
} }
} }

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

@ -77,7 +77,7 @@ public CustomImageUploader(CustomUploaderItem customUploaderItem)
public override UploadResult Upload(Stream stream, string fileName) public override UploadResult Upload(Stream stream, string fileName)
{ {
if (customUploader.RequestType != CustomUploaderRequestType.POST) if (customUploader.RequestType != CustomUploaderRequestMethod.POST)
{ {
throw new Exception("'Request type' must be 'POST' when using custom image uploader."); throw new Exception("'Request type' must be 'POST' when using custom image uploader.");
} }

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

@ -74,7 +74,7 @@ public CustomURLSharer(CustomUploaderItem customUploaderItem)
public override UploadResult ShareURL(string url) public override UploadResult ShareURL(string url)
{ {
if (customUploader.RequestType == CustomUploaderRequestType.POST && !string.IsNullOrEmpty(customUploader.FileFormName)) if (customUploader.RequestType == CustomUploaderRequestMethod.POST && !string.IsNullOrEmpty(customUploader.FileFormName))
throw new Exception("'File form name' cannot be used with custom URL sharing service."); throw new Exception("'File form name' cannot be used with custom URL sharing service.");
if ((customUploader.Arguments == null || !customUploader.Arguments.Any(x => x.Value.Contains("$input$"))) && if ((customUploader.Arguments == null || !customUploader.Arguments.Any(x => x.Value.Contains("$input$"))) &&
@ -87,7 +87,7 @@ public override UploadResult ShareURL(string url)
Dictionary<string, string> args = customUploader.GetArguments(input); Dictionary<string, string> args = customUploader.GetArguments(input);
if (customUploader.RequestType == CustomUploaderRequestType.POST) if (customUploader.RequestType == CustomUploaderRequestMethod.POST)
{ {
result.Response = SendRequestMultiPart(customUploader.GetRequestURL(), args, customUploader.GetHeaders(input), result.Response = SendRequestMultiPart(customUploader.GetRequestURL(), args, customUploader.GetHeaders(input),
responseType: customUploader.ResponseType); responseType: customUploader.ResponseType);

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

@ -84,7 +84,7 @@ public override UploadResult UploadText(string text, string fileName)
string requestURL = customUploader.GetRequestURL(); string requestURL = customUploader.GetRequestURL();
if ((customUploader.RequestType != CustomUploaderRequestType.POST || string.IsNullOrEmpty(customUploader.FileFormName)) && if ((customUploader.RequestType != CustomUploaderRequestMethod.POST || string.IsNullOrEmpty(customUploader.FileFormName)) &&
((customUploader.Arguments == null || !customUploader.Arguments.Any(x => x.Value.Contains("$input$"))) && ((customUploader.Arguments == null || !customUploader.Arguments.Any(x => x.Value.Contains("$input$"))) &&
(customUploader.Headers == null || !customUploader.Headers.Any(x => x.Value.Contains("$input$"))))) (customUploader.Headers == null || !customUploader.Headers.Any(x => x.Value.Contains("$input$")))))
throw new Exception("Atleast one '$input$' required for argument or header value."); throw new Exception("Atleast one '$input$' required for argument or header value.");
@ -93,7 +93,7 @@ public override UploadResult UploadText(string text, string fileName)
Dictionary<string, string> args = customUploader.GetArguments(input); Dictionary<string, string> args = customUploader.GetArguments(input);
if (customUploader.RequestType == CustomUploaderRequestType.POST) if (customUploader.RequestType == CustomUploaderRequestMethod.POST)
{ {
if (string.IsNullOrEmpty(customUploader.FileFormName)) if (string.IsNullOrEmpty(customUploader.FileFormName))
{ {

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

@ -75,7 +75,7 @@ public CustomURLShortener(CustomUploaderItem customUploaderItem)
public override UploadResult ShortenURL(string url) public override UploadResult ShortenURL(string url)
{ {
if (customUploader.RequestType == CustomUploaderRequestType.POST && !string.IsNullOrEmpty(customUploader.FileFormName)) if (customUploader.RequestType == CustomUploaderRequestMethod.POST && !string.IsNullOrEmpty(customUploader.FileFormName))
throw new Exception("'File form name' cannot be used with custom URL shortener."); throw new Exception("'File form name' cannot be used with custom URL shortener.");
if ((customUploader.Arguments == null || !customUploader.Arguments.Any(x => x.Value.Contains("$input$"))) && if ((customUploader.Arguments == null || !customUploader.Arguments.Any(x => x.Value.Contains("$input$"))) &&
@ -88,7 +88,7 @@ public override UploadResult ShortenURL(string url)
Dictionary<string, string> args = customUploader.GetArguments(input); Dictionary<string, string> args = customUploader.GetArguments(input);
if (customUploader.RequestType == CustomUploaderRequestType.POST) if (customUploader.RequestType == CustomUploaderRequestMethod.POST)
{ {
result.Response = SendRequestMultiPart(customUploader.GetRequestURL(), args, customUploader.GetHeaders(input), result.Response = SendRequestMultiPart(customUploader.GetRequestURL(), args, customUploader.GetHeaders(input),
responseType: customUploader.ResponseType); responseType: customUploader.ResponseType);