diff --git a/ShareX.UploadersLib/Enums.cs b/ShareX.UploadersLib/Enums.cs index 459e2dc56..42cd10652 100644 --- a/ShareX.UploadersLib/Enums.cs +++ b/ShareX.UploadersLib/Enums.cs @@ -289,7 +289,7 @@ public enum LinkFormatEnum LocalFilePathUri } - public enum CustomUploaderRequestType + public enum CustomUploaderRequestMethod { POST, GET, diff --git a/ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs b/ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs index 5199a8129..e28cbb9c3 100644 --- a/ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs +++ b/ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs @@ -80,7 +80,7 @@ public CustomFileUploader(CustomUploaderItem customUploaderItem) 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."); } diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index a20e0bb0b..2a93a3cf1 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -120,7 +120,7 @@ private void InitializeControls() txtCustomUploaderLog.AddContextMenu(); eiCustomUploaders.ObjectType = typeof(CustomUploaderItem); CustomUploaderAddDestinationTypes(); - cbCustomUploaderRequestType.Items.AddRange(Enum.GetNames(typeof(CustomUploaderRequestType))); + cbCustomUploaderRequestType.Items.AddRange(Enum.GetNames(typeof(CustomUploaderRequestMethod))); cbCustomUploaderResponseType.Items.AddRange(Helpers.GetLocalizedEnumDescriptions()); // Backblaze B2 @@ -3482,7 +3482,7 @@ private void txtCustomUploaderName_TextChanged(object sender, EventArgs e) private void cbCustomUploaderRequestType_SelectedIndexChanged(object sender, EventArgs e) { CustomUploaderItem uploader = CustomUploaderGetSelected(); - if (uploader != null) uploader.RequestType = (CustomUploaderRequestType)cbCustomUploaderRequestType.SelectedIndex; + if (uploader != null) uploader.RequestType = (CustomUploaderRequestMethod)cbCustomUploaderRequestType.SelectedIndex; CustomUploaderUpdateRequestState(); } diff --git a/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs b/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs index 44ea8ac33..c99ad94a5 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs @@ -958,7 +958,7 @@ private void CustomUploaderLoad(CustomUploaderItem uploader) cbCustomUploaderRequestType.SelectedIndex = (int)uploader.RequestType; txtCustomUploaderRequestURL.Text = uploader.RequestURL ?? ""; txtCustomUploaderFileForm.Text = uploader.FileFormName ?? ""; - txtCustomUploaderFileForm.Enabled = uploader.RequestType == CustomUploaderRequestType.POST; + txtCustomUploaderFileForm.Enabled = uploader.RequestType == CustomUploaderRequestMethod.POST; txtCustomUploaderArgName.Text = ""; txtCustomUploaderArgValue.Text = ""; @@ -1026,7 +1026,7 @@ private void CustomUploaderUpdateStates() private void CustomUploaderUpdateRequestState() { - txtCustomUploaderFileForm.Enabled = (CustomUploaderRequestType)cbCustomUploaderRequestType.SelectedIndex == CustomUploaderRequestType.POST; + txtCustomUploaderFileForm.Enabled = (CustomUploaderRequestMethod)cbCustomUploaderRequestType.SelectedIndex == CustomUploaderRequestMethod.POST; } private void CustomUploaderUpdateArgumentsState() diff --git a/ShareX.UploadersLib/Helpers/CustomUploaderItem.cs b/ShareX.UploadersLib/Helpers/CustomUploaderItem.cs index a4c65b3ac..2bb605dd8 100644 --- a/ShareX.UploadersLib/Helpers/CustomUploaderItem.cs +++ b/ShareX.UploadersLib/Helpers/CustomUploaderItem.cs @@ -42,8 +42,8 @@ public class CustomUploaderItem [DefaultValue(CustomUploaderDestinationType.None)] public CustomUploaderDestinationType DestinationType { get; set; } - [DefaultValue(CustomUploaderRequestType.POST)] - public CustomUploaderRequestType RequestType { get; set; } + [DefaultValue(CustomUploaderRequestMethod.POST)] + public CustomUploaderRequestMethod RequestType { get; set; } [DefaultValue("")] public string RequestURL { get; set; } @@ -109,15 +109,15 @@ public HttpMethod GetHttpMethod() switch (RequestType) { default: - case CustomUploaderRequestType.POST: + case CustomUploaderRequestMethod.POST: return HttpMethod.POST; - case CustomUploaderRequestType.GET: + case CustomUploaderRequestMethod.GET: return HttpMethod.GET; - case CustomUploaderRequestType.PUT: + case CustomUploaderRequestMethod.PUT: return HttpMethod.PUT; - case CustomUploaderRequestType.PATCH: + case CustomUploaderRequestMethod.PATCH: return HttpMethod.PATCH; - case CustomUploaderRequestType.DELETE: + case CustomUploaderRequestMethod.DELETE: return HttpMethod.DELETE; } } diff --git a/ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs b/ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs index 8a10a61eb..c07f04988 100644 --- a/ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs +++ b/ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs @@ -77,7 +77,7 @@ public CustomImageUploader(CustomUploaderItem customUploaderItem) 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."); } diff --git a/ShareX.UploadersLib/SharingServices/CustomURLSharingService.cs b/ShareX.UploadersLib/SharingServices/CustomURLSharingService.cs index b28d9fed2..6ac3c7ce0 100644 --- a/ShareX.UploadersLib/SharingServices/CustomURLSharingService.cs +++ b/ShareX.UploadersLib/SharingServices/CustomURLSharingService.cs @@ -74,7 +74,7 @@ public CustomURLSharer(CustomUploaderItem customUploaderItem) 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."); if ((customUploader.Arguments == null || !customUploader.Arguments.Any(x => x.Value.Contains("$input$"))) && @@ -87,7 +87,7 @@ public override UploadResult ShareURL(string url) Dictionary args = customUploader.GetArguments(input); - if (customUploader.RequestType == CustomUploaderRequestType.POST) + if (customUploader.RequestType == CustomUploaderRequestMethod.POST) { result.Response = SendRequestMultiPart(customUploader.GetRequestURL(), args, customUploader.GetHeaders(input), responseType: customUploader.ResponseType); diff --git a/ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs b/ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs index 8d56deb4f..eb25db7a3 100644 --- a/ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs +++ b/ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs @@ -84,7 +84,7 @@ public override UploadResult UploadText(string text, string fileName) 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.Headers == null || !customUploader.Headers.Any(x => x.Value.Contains("$input$"))))) 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 args = customUploader.GetArguments(input); - if (customUploader.RequestType == CustomUploaderRequestType.POST) + if (customUploader.RequestType == CustomUploaderRequestMethod.POST) { if (string.IsNullOrEmpty(customUploader.FileFormName)) { diff --git a/ShareX.UploadersLib/URLShorteners/CustomURLShortener.cs b/ShareX.UploadersLib/URLShorteners/CustomURLShortener.cs index 6d9d18248..55c2a1ce4 100644 --- a/ShareX.UploadersLib/URLShorteners/CustomURLShortener.cs +++ b/ShareX.UploadersLib/URLShorteners/CustomURLShortener.cs @@ -75,7 +75,7 @@ public CustomURLShortener(CustomUploaderItem customUploaderItem) 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."); if ((customUploader.Arguments == null || !customUploader.Arguments.Any(x => x.Value.Contains("$input$"))) && @@ -88,7 +88,7 @@ public override UploadResult ShortenURL(string url) Dictionary args = customUploader.GetArguments(input); - if (customUploader.RequestType == CustomUploaderRequestType.POST) + if (customUploader.RequestType == CustomUploaderRequestMethod.POST) { result.Response = SendRequestMultiPart(customUploader.GetRequestURL(), args, customUploader.GetHeaders(input), responseType: customUploader.ResponseType);