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

Removing ResponseType usages to use new system

Browse source
This commit is contained in:
Jaex 2019-01-21 15:37:31 +03:00
parent 163c2a1ecf
commit 9c4f583dca
10 changed files with 42 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ShareX.UploadersLib/BaseUploaders/Uploader.cs
View file

@ -110,14 +110,13 @@ public virtual void StopUpload()
} }
} }
protected string SendRequest(HttpMethod method, string url, Dictionary<string, string> args = null, NameValueCollection headers = null, protected string SendRequest(HttpMethod method, string url, Dictionary<string, string> args = null, NameValueCollection headers = null, CookieCollection cookies = null)
CookieCollection cookies = null, ResponseType responseType = ResponseType.Text)
{ {
return SendRequest(method, url, (Stream)null, null, args, headers, cookies, responseType); return SendRequest(method, url, (Stream)null, null, args, headers, cookies);
} }
protected string SendRequest(HttpMethod method, string url, Stream data, string contentType = null, Dictionary<string, string> args = null, NameValueCollection headers = null, protected string SendRequest(HttpMethod method, string url, Stream data, string contentType = null, Dictionary<string, string> args = null, NameValueCollection headers = null,
CookieCollection cookies = null, ResponseType responseType = ResponseType.Text) CookieCollection cookies = null)
{ {
using (HttpWebResponse webResponse = GetResponse(method, url, data, contentType, args, headers, cookies)) using (HttpWebResponse webResponse = GetResponse(method, url, data, contentType, args, headers, cookies))
{ {
@ -133,7 +132,7 @@ public virtual void StopUpload()
} }
protected string SendRequest(HttpMethod method, string url, string content, string contentType = null, Dictionary<string, string> args = null, NameValueCollection headers = null, protected string SendRequest(HttpMethod method, string url, string content, string contentType = null, Dictionary<string, string> args = null, NameValueCollection headers = null,
CookieCollection cookies = null, ResponseType responseType = ResponseType.Text) CookieCollection cookies = null)
{ {
byte[] data = Encoding.UTF8.GetBytes(content); byte[] data = Encoding.UTF8.GetBytes(content);
@ -141,16 +140,15 @@ public virtual void StopUpload()
{ {
ms.Write(data, 0, data.Length); ms.Write(data, 0, data.Length);
return SendRequest(method, url, ms, contentType, args, headers, cookies, responseType); return SendRequest(method, url, ms, contentType, args, headers, cookies);
} }
} }
internal string SendRequestURLEncoded(HttpMethod method, string url, Dictionary<string, string> args, NameValueCollection headers = null, CookieCollection cookies = null, internal string SendRequestURLEncoded(HttpMethod method, string url, Dictionary<string, string> args, NameValueCollection headers = null, CookieCollection cookies = null)
ResponseType responseType = ResponseType.Text)
{ {
string query = URLHelpers.CreateQueryString(args); string query = URLHelpers.CreateQueryString(args);
return SendRequest(method, url, query, UploadHelpers.ContentTypeURLEncoded, null, headers, cookies, responseType); return SendRequest(method, url, query, UploadHelpers.ContentTypeURLEncoded, null, headers, cookies);
} }
protected bool SendRequestDownload(HttpMethod method, string url, Stream downloadStream, Dictionary<string, string> args = null, protected bool SendRequestDownload(HttpMethod method, string url, Stream downloadStream, Dictionary<string, string> args = null,
@ -173,7 +171,7 @@ public virtual void StopUpload()
} }
protected string SendRequestMultiPart(string url, Dictionary<string, string> args, NameValueCollection headers = null, CookieCollection cookies = null, protected string SendRequestMultiPart(string url, Dictionary<string, string> args, NameValueCollection headers = null, CookieCollection cookies = null,
ResponseType responseType = ResponseType.Text, HttpMethod method = HttpMethod.POST) HttpMethod method = HttpMethod.POST)
{ {
string boundary = UploadHelpers.CreateBoundary(); string boundary = UploadHelpers.CreateBoundary();
string contentType = UploadHelpers.ContentTypeMultipartFormData + "; boundary=" + boundary; string contentType = UploadHelpers.ContentTypeMultipartFormData + "; boundary=" + boundary;
@ -198,8 +196,8 @@ public virtual void StopUpload()
} }
protected UploadResult SendRequestFile(string url, Stream data, string fileName, string fileFormName, Dictionary<string, string> args = null, protected UploadResult SendRequestFile(string url, Stream data, string fileName, string fileFormName, Dictionary<string, string> args = null,
NameValueCollection headers = null, CookieCollection cookies = null, ResponseType responseType = ResponseType.Text, HttpMethod method = HttpMethod.POST, NameValueCollection headers = null, CookieCollection cookies = null, HttpMethod method = HttpMethod.POST, string contentType = UploadHelpers.ContentTypeMultipartFormData,
string contentType = UploadHelpers.ContentTypeMultipartFormData, string metadata = null) string metadata = null)
{ {
UploadResult result = new UploadResult(); UploadResult result = new UploadResult();
@ -274,8 +272,7 @@ public virtual void StopUpload()
} }
protected UploadResult SendRequestFileRange(string url, Stream data, string fileName, long contentPosition = 0, long contentLength = -1, protected UploadResult SendRequestFileRange(string url, Stream data, string fileName, long contentPosition = 0, long contentLength = -1,
Dictionary<string, string> args = null, NameValueCollection headers = null, CookieCollection cookies = null, ResponseType responseType = ResponseType.Text, Dictionary<string, string> args = null, NameValueCollection headers = null, CookieCollection cookies = null, HttpMethod method = HttpMethod.PUT)
HttpMethod method = HttpMethod.PUT)
{ {
UploadResult result = new UploadResult(); UploadResult result = new UploadResult();

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

@ -85,6 +85,7 @@ public class CustomUploaderItem
public bool ShouldSerializeData() => (Body == CustomUploaderBody.JSON || Body == CustomUploaderBody.XML) && !string.IsNullOrEmpty(Data); public bool ShouldSerializeData() => (Body == CustomUploaderBody.JSON || Body == CustomUploaderBody.XML) && !string.IsNullOrEmpty(Data);
// For backward compatibility
[DefaultValue(ResponseType.Text)] [DefaultValue(ResponseType.Text)]
public ResponseType ResponseType { get; set; } public ResponseType ResponseType { get; set; }

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

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

3
ShareX.UploadersLib/FileUploaders/Seafile.cs
View file

@ -491,7 +491,8 @@ public string ShareFile(string path)
sslBypassHelper = new SSLBypassHelper(); sslBypassHelper = new SSLBypassHelper();
} }
return SendRequestURLEncoded(HttpMethod.PUT, url, args, headers, null, ResponseType.LocationHeader); SendRequestURLEncoded(HttpMethod.PUT, url, args, headers);
return Headers["Location"];
} }
finally finally
{ {

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

@ -82,13 +82,13 @@ public override UploadResult Upload(Stream stream, string fileName)
if (uploader.Body == CustomUploaderBody.MultipartFormData) if (uploader.Body == CustomUploaderBody.MultipartFormData)
{ {
result = SendRequestFile(uploader.GetRequestURL(input), stream, fileName, uploader.GetFileFormName(), result = SendRequestFile(uploader.GetRequestURL(input), stream, fileName, uploader.GetFileFormName(), uploader.GetArguments(input),
uploader.GetArguments(input), uploader.GetHeaders(input), null, uploader.ResponseType, uploader.RequestMethod); uploader.GetHeaders(input), null, uploader.RequestMethod);
} }
else if (uploader.Body == CustomUploaderBody.Binary) else if (uploader.Body == CustomUploaderBody.Binary)
{ {
result.Response = SendRequest(uploader.RequestMethod, 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); null, uploader.GetHeaders(input));
} }
else else
{ {

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

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

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

@ -85,34 +85,33 @@ public override UploadResult UploadText(string text, string fileName)
if (uploader.Body == CustomUploaderBody.None) if (uploader.Body == CustomUploaderBody.None)
{ {
result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), null, uploader.GetHeaders(input), null, uploader.ResponseType); result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), null, uploader.GetHeaders(input));
} }
else if (uploader.Body == CustomUploaderBody.MultipartFormData) else if (uploader.Body == CustomUploaderBody.MultipartFormData)
{ {
if (string.IsNullOrEmpty(uploader.FileFormName)) if (string.IsNullOrEmpty(uploader.FileFormName))
{ {
result.Response = SendRequestMultiPart(uploader.GetRequestURL(input), uploader.GetArguments(input), result.Response = SendRequestMultiPart(uploader.GetRequestURL(input), uploader.GetArguments(input), uploader.GetHeaders(input),
uploader.GetHeaders(input), null, uploader.ResponseType, uploader.RequestMethod); null, uploader.RequestMethod);
} }
else else
{ {
byte[] bytes = Encoding.UTF8.GetBytes(text); byte[] bytes = Encoding.UTF8.GetBytes(text);
using (MemoryStream stream = new MemoryStream(bytes)) using (MemoryStream stream = new MemoryStream(bytes))
{ {
result = SendRequestFile(uploader.GetRequestURL(input), stream, fileName, uploader.GetFileFormName(), result = SendRequestFile(uploader.GetRequestURL(input), stream, fileName, uploader.GetFileFormName(), uploader.GetArguments(input),
uploader.GetArguments(input), uploader.GetHeaders(input), null, uploader.ResponseType, uploader.RequestMethod); uploader.GetHeaders(input), null, uploader.RequestMethod);
} }
} }
} }
else if (uploader.Body == CustomUploaderBody.FormURLEncoded) else if (uploader.Body == CustomUploaderBody.FormURLEncoded)
{ {
result.Response = SendRequestURLEncoded(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetArguments(input), result.Response = SendRequestURLEncoded(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetArguments(input), uploader.GetHeaders(input));
uploader.GetHeaders(input), null, uploader.ResponseType);
} }
else if (uploader.Body == CustomUploaderBody.JSON || uploader.Body == CustomUploaderBody.XML) else if (uploader.Body == CustomUploaderBody.JSON || uploader.Body == CustomUploaderBody.XML)
{ {
result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetData(input), uploader.GetContentType(), result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetData(input), uploader.GetContentType(),
null, uploader.GetHeaders(input), null, uploader.ResponseType); null, uploader.GetHeaders(input));
} }
else if (uploader.Body == CustomUploaderBody.Binary) else if (uploader.Body == CustomUploaderBody.Binary)
{ {
@ -120,7 +119,7 @@ public override UploadResult UploadText(string text, string fileName)
using (MemoryStream stream = new MemoryStream(bytes)) using (MemoryStream stream = new MemoryStream(bytes))
{ {
result.Response = SendRequest(uploader.RequestMethod, 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); null, uploader.GetHeaders(input));
} }
} }
else else

8
ShareX.UploadersLib/TextUploaders/Pastie.cs
View file

@ -64,12 +64,8 @@ public override UploadResult UploadText(string text, string fileName)
arguments.Add("paste[restricted]", IsPublic ? "0" : "1"); arguments.Add("paste[restricted]", IsPublic ? "0" : "1");
arguments.Add("paste[authorization]", "burger"); arguments.Add("paste[authorization]", "burger");
ur.Response = SendRequestURLEncoded(HttpMethod.POST, "http://pastie.org/pastes", arguments, responseType: ResponseType.RedirectionURL); SendRequestURLEncoded(HttpMethod.POST, "http://pastie.org/pastes", arguments);
ur.URL = ResponseURL;
if (!string.IsNullOrEmpty(ur.Response))
{
ur.URL = ur.Response;
}
} }
return ur; return ur;

3
ShareX.UploadersLib/TextUploaders/Slexy.cs
View file

@ -80,7 +80,8 @@ public override UploadResult UploadText(string text, string fileName)
arguments.Add("tabbing", "true"); arguments.Add("tabbing", "true");
arguments.Add("tabtype", "real"); arguments.Add("tabtype", "real");
ur.URL = SendRequestMultiPart(APIURL, arguments, responseType: ResponseType.RedirectionURL); SendRequestMultiPart(APIURL, arguments);
ur.URL = ResponseURL;
} }
return ur; return ur;

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

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