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

Rename RequestType to RequestMethod

Browse source
This commit is contained in:
Jaex 2019-01-08 18:57:49 +03:00
parent fa7f69988e
commit b2081622aa
8 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,6 +23,7 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3)
using Newtonsoft.Json;
using ShareX.HelpersLib;
using ShareX.UploadersLib.Properties;
using System;
@ -46,7 +47,11 @@ public class CustomUploaderItem
[DefaultValue(CustomUploaderDestinationType.None)]
public CustomUploaderDestinationType DestinationType { get; set; }
public HttpMethod RequestType { get; set; } = HttpMethod.POST;
public HttpMethod RequestMethod { get; set; } = HttpMethod.POST;
// For backward compatibility
[JsonProperty]
private HttpMethod RequestType { set => RequestMethod = value; }
[DefaultValue("")]
public string RequestURL { get; set; }
@ -254,7 +259,7 @@ public void CheckBackwardCompatibility()
if (string.IsNullOrEmpty(Version) || Helpers.CompareVersion(Version, "12.3.1") <= 0)
{
if (RequestType == HttpMethod.POST)
if (RequestMethod == HttpMethod.POST)
{
Body = CustomUploaderBody.MultipartFormData;
}

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

@ -86,11 +86,11 @@ public override UploadResult Upload(Stream stream, string fileName)
if (uploader.Body == CustomUploaderBody.MultipartFormData)
{
result = SendRequestFile(uploader.GetRequestURL(input), stream, fileName, uploader.GetFileFormName(),
uploader.GetArguments(input), uploader.GetHeaders(input), null, uploader.ResponseType, uploader.RequestType);
uploader.GetArguments(input), uploader.GetHeaders(input), null, uploader.ResponseType, uploader.RequestMethod);
}
else if (uploader.Body == CustomUploaderBody.Binary)
{
result.Response = SendRequest(uploader.RequestType, uploader.GetRequestURL(input), stream, UploadHelpers.GetMimeType(fileName),
result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), stream, UploadHelpers.GetMimeType(fileName),
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else

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

@ -3504,7 +3504,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 = (HttpMethod)cbCustomUploaderRequestMethod.SelectedIndex;
if (uploader != null) uploader.RequestMethod = (HttpMethod)cbCustomUploaderRequestMethod.SelectedIndex;
}
private void rtbCustomUploaderRequestURL_TextChanged(object sender, EventArgs e)

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

@ -963,7 +963,7 @@ private void CustomUploaderLoad(CustomUploaderItem uploader)
txtCustomUploaderName.Text = uploader.Name ?? "";
CustomUploaderSetDestinationType(uploader.DestinationType);
cbCustomUploaderRequestMethod.SelectedIndex = (int)uploader.RequestType;
cbCustomUploaderRequestMethod.SelectedIndex = (int)uploader.RequestMethod;
rtbCustomUploaderRequestURL.Text = uploader.RequestURL ?? "";
CustomUploaderSyntaxHighlight(rtbCustomUploaderRequestURL);
cbCustomUploaderRequestFormat.SelectedIndex = (int)uploader.Body;

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

@ -83,11 +83,11 @@ public override UploadResult Upload(Stream stream, string fileName)
if (uploader.Body == CustomUploaderBody.MultipartFormData)
{
result = SendRequestFile(uploader.GetRequestURL(input), stream, fileName, uploader.GetFileFormName(),
uploader.GetArguments(input), uploader.GetHeaders(input), null, uploader.ResponseType, uploader.RequestType);
uploader.GetArguments(input), uploader.GetHeaders(input), null, uploader.ResponseType, uploader.RequestMethod);
}
else if (uploader.Body == CustomUploaderBody.Binary)
{
result.Response = SendRequest(uploader.RequestType, uploader.GetRequestURL(input), stream, UploadHelpers.GetMimeType(fileName),
result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), stream, UploadHelpers.GetMimeType(fileName),
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else

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

@ -80,22 +80,22 @@ public override UploadResult ShareURL(string url)
if (uploader.Body == CustomUploaderBody.None)
{
result.Response = SendRequest(uploader.RequestType, uploader.GetRequestURL(input), null,
result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), null,
uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.Body == CustomUploaderBody.MultipartFormData)
{
result.Response = SendRequestMultiPart(uploader.GetRequestURL(input), uploader.GetArguments(input), uploader.GetHeaders(input), null,
uploader.ResponseType, uploader.RequestType);
uploader.ResponseType, uploader.RequestMethod);
}
else if (uploader.Body == CustomUploaderBody.JSON)
{
result.Response = SendRequest(uploader.RequestType, uploader.GetRequestURL(input), uploader.GetData(input), UploadHelpers.ContentTypeJSON,
result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetData(input), UploadHelpers.ContentTypeJSON,
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.Body == CustomUploaderBody.FormURLEncoded)
{
result.Response = SendRequestURLEncoded(uploader.RequestType, uploader.GetRequestURL(input), uploader.GetArguments(input),
result.Response = SendRequestURLEncoded(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetArguments(input),
uploader.GetHeaders(input), null, uploader.ResponseType);
}
else

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

@ -85,14 +85,14 @@ public override UploadResult UploadText(string text, string fileName)
if (uploader.Body == CustomUploaderBody.None)
{
result.Response = SendRequest(uploader.RequestType, uploader.GetRequestURL(input), null, uploader.GetHeaders(input), null, uploader.ResponseType);
result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.Body == CustomUploaderBody.MultipartFormData)
{
if (string.IsNullOrEmpty(uploader.FileFormName))
{
result.Response = SendRequestMultiPart(uploader.GetRequestURL(input), uploader.GetArguments(input),
uploader.GetHeaders(input), null, uploader.ResponseType, uploader.RequestType);
uploader.GetHeaders(input), null, uploader.ResponseType, uploader.RequestMethod);
}
else
{
@ -100,13 +100,13 @@ public override UploadResult UploadText(string text, string fileName)
using (MemoryStream stream = new MemoryStream(bytes))
{
result = SendRequestFile(uploader.GetRequestURL(input), stream, fileName, uploader.GetFileFormName(),
uploader.GetArguments(input), uploader.GetHeaders(input), null, uploader.ResponseType, uploader.RequestType);
uploader.GetArguments(input), uploader.GetHeaders(input), null, uploader.ResponseType, uploader.RequestMethod);
}
}
}
else if (uploader.Body == CustomUploaderBody.JSON)
{
result.Response = SendRequest(uploader.RequestType, uploader.GetRequestURL(input), uploader.GetData(input), UploadHelpers.ContentTypeJSON,
result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetData(input), UploadHelpers.ContentTypeJSON,
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.Body == CustomUploaderBody.Binary)
@ -114,13 +114,13 @@ public override UploadResult UploadText(string text, string fileName)
byte[] bytes = Encoding.UTF8.GetBytes(text);
using (MemoryStream stream = new MemoryStream(bytes))
{
result.Response = SendRequest(uploader.RequestType, uploader.GetRequestURL(input), stream, UploadHelpers.GetMimeType(fileName),
result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), stream, UploadHelpers.GetMimeType(fileName),
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
}
else if (uploader.Body == CustomUploaderBody.FormURLEncoded)
{
result.Response = SendRequestURLEncoded(uploader.RequestType, uploader.GetRequestURL(input), uploader.GetArguments(input),
result.Response = SendRequestURLEncoded(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetArguments(input),
uploader.GetHeaders(input), null, uploader.ResponseType);
}
else

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

@ -80,21 +80,21 @@ public override UploadResult ShortenURL(string url)
if (uploader.Body == CustomUploaderBody.None)
{
result.Response = SendRequest(uploader.RequestType, uploader.GetRequestURL(input), null, uploader.GetHeaders(input), null, uploader.ResponseType);
result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.Body == CustomUploaderBody.MultipartFormData)
{
result.Response = SendRequestMultiPart(uploader.GetRequestURL(input), uploader.GetArguments(input), uploader.GetHeaders(input), null,
uploader.ResponseType, uploader.RequestType);
uploader.ResponseType, uploader.RequestMethod);
}
else if (uploader.Body == CustomUploaderBody.JSON)
{
result.Response = SendRequest(uploader.RequestType, uploader.GetRequestURL(input), uploader.GetData(input), UploadHelpers.ContentTypeJSON,
result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetData(input), UploadHelpers.ContentTypeJSON,
null, uploader.GetHeaders(input), null, uploader.ResponseType);
}
else if (uploader.Body == CustomUploaderBody.FormURLEncoded)
{
result.Response = SendRequestURLEncoded(uploader.RequestType, uploader.GetRequestURL(input), uploader.GetArguments(input),
result.Response = SendRequestURLEncoded(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetArguments(input),
uploader.GetHeaders(input), null, uploader.ResponseType);
}
else