From 9c4f583dca7cf1c00cea80157fdb69c01f80cfbf Mon Sep 17 00:00:00 2001 From: Jaex Date: Mon, 21 Jan 2019 15:37:31 +0300 Subject: [PATCH] Removing ResponseType usages to use new system --- ShareX.UploadersLib/BaseUploaders/Uploader.cs | 25 ++++++++----------- .../CustomUploader/CustomUploaderItem.cs | 1 + .../FileUploaders/CustomFileUploader.cs | 8 +++--- ShareX.UploadersLib/FileUploaders/Seafile.cs | 3 ++- .../ImageUploaders/CustomImageUploader.cs | 6 ++--- .../CustomURLSharingService.cs | 13 ++++------ .../TextUploaders/CustomTextUploader.cs | 17 ++++++------- ShareX.UploadersLib/TextUploaders/Pastie.cs | 8 ++---- ShareX.UploadersLib/TextUploaders/Slexy.cs | 3 ++- .../URLShorteners/CustomURLShortener.cs | 10 +++----- 10 files changed, 42 insertions(+), 52 deletions(-) diff --git a/ShareX.UploadersLib/BaseUploaders/Uploader.cs b/ShareX.UploadersLib/BaseUploaders/Uploader.cs index cdd90a747..ee88114bd 100644 --- a/ShareX.UploadersLib/BaseUploaders/Uploader.cs +++ b/ShareX.UploadersLib/BaseUploaders/Uploader.cs @@ -110,14 +110,13 @@ public virtual void StopUpload() } } - protected string SendRequest(HttpMethod method, string url, Dictionary args = null, NameValueCollection headers = null, - CookieCollection cookies = null, ResponseType responseType = ResponseType.Text) + protected string SendRequest(HttpMethod method, string url, Dictionary args = null, NameValueCollection headers = null, CookieCollection cookies = null) { - 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 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)) { @@ -133,7 +132,7 @@ protected string SendRequest(HttpMethod method, string url, Stream data, string } protected string SendRequest(HttpMethod method, string url, string content, string contentType = null, Dictionary args = null, NameValueCollection headers = null, - CookieCollection cookies = null, ResponseType responseType = ResponseType.Text) + CookieCollection cookies = null) { byte[] data = Encoding.UTF8.GetBytes(content); @@ -141,16 +140,15 @@ protected string SendRequest(HttpMethod method, string url, string content, stri { 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 args, NameValueCollection headers = null, CookieCollection cookies = null, - ResponseType responseType = ResponseType.Text) + internal string SendRequestURLEncoded(HttpMethod method, string url, Dictionary args, NameValueCollection headers = null, CookieCollection cookies = null) { 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 args = null, @@ -173,7 +171,7 @@ protected bool SendRequestDownload(HttpMethod method, string url, Stream downloa } protected string SendRequestMultiPart(string url, Dictionary args, NameValueCollection headers = null, CookieCollection cookies = null, - ResponseType responseType = ResponseType.Text, HttpMethod method = HttpMethod.POST) + HttpMethod method = HttpMethod.POST) { string boundary = UploadHelpers.CreateBoundary(); string contentType = UploadHelpers.ContentTypeMultipartFormData + "; boundary=" + boundary; @@ -198,8 +196,8 @@ protected string SendRequestMultiPart(string url, Dictionary arg } protected UploadResult SendRequestFile(string url, Stream data, string fileName, string fileFormName, Dictionary args = null, - NameValueCollection headers = null, CookieCollection cookies = null, ResponseType responseType = ResponseType.Text, HttpMethod method = HttpMethod.POST, - string contentType = UploadHelpers.ContentTypeMultipartFormData, string metadata = null) + NameValueCollection headers = null, CookieCollection cookies = null, HttpMethod method = HttpMethod.POST, string contentType = UploadHelpers.ContentTypeMultipartFormData, + string metadata = null) { UploadResult result = new UploadResult(); @@ -274,8 +272,7 @@ protected UploadResult SendRequestFile(string url, Stream data, string fileName, } protected UploadResult SendRequestFileRange(string url, Stream data, string fileName, long contentPosition = 0, long contentLength = -1, - Dictionary args = null, NameValueCollection headers = null, CookieCollection cookies = null, ResponseType responseType = ResponseType.Text, - HttpMethod method = HttpMethod.PUT) + Dictionary args = null, NameValueCollection headers = null, CookieCollection cookies = null, HttpMethod method = HttpMethod.PUT) { UploadResult result = new UploadResult(); diff --git a/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs b/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs index 1e17fec60..c251524f5 100644 --- a/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs +++ b/ShareX.UploadersLib/CustomUploader/CustomUploaderItem.cs @@ -85,6 +85,7 @@ public bool ShouldSerializeArguments() => (Body == CustomUploaderBody.MultipartF public bool ShouldSerializeData() => (Body == CustomUploaderBody.JSON || Body == CustomUploaderBody.XML) && !string.IsNullOrEmpty(Data); + // For backward compatibility [DefaultValue(ResponseType.Text)] public ResponseType ResponseType { get; set; } diff --git a/ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs b/ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs index f2bc43ea9..40fb3e97b 100644 --- a/ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs +++ b/ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs @@ -85,13 +85,13 @@ 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.RequestMethod); + result = SendRequestFile(uploader.GetRequestURL(input), stream, fileName, uploader.GetFileFormName(), uploader.GetArguments(input), + uploader.GetHeaders(input), null, uploader.RequestMethod); } else if (uploader.Body == CustomUploaderBody.Binary) { - result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), stream, UploadHelpers.GetMimeType(fileName), - null, uploader.GetHeaders(input), null, uploader.ResponseType); + result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), stream, UploadHelpers.GetMimeType(fileName), null, + uploader.GetHeaders(input)); } else { diff --git a/ShareX.UploadersLib/FileUploaders/Seafile.cs b/ShareX.UploadersLib/FileUploaders/Seafile.cs index 10c7d0fff..1461b30a3 100644 --- a/ShareX.UploadersLib/FileUploaders/Seafile.cs +++ b/ShareX.UploadersLib/FileUploaders/Seafile.cs @@ -491,7 +491,8 @@ public string ShareFile(string path) sslBypassHelper = new SSLBypassHelper(); } - return SendRequestURLEncoded(HttpMethod.PUT, url, args, headers, null, ResponseType.LocationHeader); + SendRequestURLEncoded(HttpMethod.PUT, url, args, headers); + return Headers["Location"]; } finally { diff --git a/ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs b/ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs index 636ed9a81..1fd80b967 100644 --- a/ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs +++ b/ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs @@ -82,13 +82,13 @@ 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.RequestMethod); + result = SendRequestFile(uploader.GetRequestURL(input), stream, fileName, uploader.GetFileFormName(), uploader.GetArguments(input), + uploader.GetHeaders(input), null, uploader.RequestMethod); } else if (uploader.Body == CustomUploaderBody.Binary) { result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), stream, UploadHelpers.GetMimeType(fileName), - null, uploader.GetHeaders(input), null, uploader.ResponseType); + null, uploader.GetHeaders(input)); } else { diff --git a/ShareX.UploadersLib/SharingServices/CustomURLSharingService.cs b/ShareX.UploadersLib/SharingServices/CustomURLSharingService.cs index 638909827..78752d954 100644 --- a/ShareX.UploadersLib/SharingServices/CustomURLSharingService.cs +++ b/ShareX.UploadersLib/SharingServices/CustomURLSharingService.cs @@ -80,23 +80,20 @@ public override UploadResult ShareURL(string url) 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) { - result.Response = SendRequestMultiPart(uploader.GetRequestURL(input), uploader.GetArguments(input), uploader.GetHeaders(input), null, - uploader.ResponseType, uploader.RequestMethod); + result.Response = SendRequestMultiPart(uploader.GetRequestURL(input), uploader.GetArguments(input), uploader.GetHeaders(input), null, uploader.RequestMethod); } else if (uploader.Body == CustomUploaderBody.FormURLEncoded) { - result.Response = SendRequestURLEncoded(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetArguments(input), - uploader.GetHeaders(input), null, uploader.ResponseType); + result.Response = SendRequestURLEncoded(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetArguments(input), uploader.GetHeaders(input)); } else if (uploader.Body == CustomUploaderBody.JSON || uploader.Body == CustomUploaderBody.XML) { - result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetData(input), uploader.GetContentType(), - null, uploader.GetHeaders(input), null, uploader.ResponseType); + result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetData(input), uploader.GetContentType(), null, + uploader.GetHeaders(input)); } else { diff --git a/ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs b/ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs index 5f01bc0cd..0fdb68b09 100644 --- a/ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs +++ b/ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs @@ -85,34 +85,33 @@ public override UploadResult UploadText(string text, string fileName) 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) { if (string.IsNullOrEmpty(uploader.FileFormName)) { - result.Response = SendRequestMultiPart(uploader.GetRequestURL(input), uploader.GetArguments(input), - uploader.GetHeaders(input), null, uploader.ResponseType, uploader.RequestMethod); + result.Response = SendRequestMultiPart(uploader.GetRequestURL(input), uploader.GetArguments(input), uploader.GetHeaders(input), + null, uploader.RequestMethod); } else { byte[] bytes = Encoding.UTF8.GetBytes(text); 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.RequestMethod); + result = SendRequestFile(uploader.GetRequestURL(input), stream, fileName, uploader.GetFileFormName(), uploader.GetArguments(input), + uploader.GetHeaders(input), null, uploader.RequestMethod); } } } else if (uploader.Body == CustomUploaderBody.FormURLEncoded) { - result.Response = SendRequestURLEncoded(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetArguments(input), - uploader.GetHeaders(input), null, uploader.ResponseType); + result.Response = SendRequestURLEncoded(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetArguments(input), uploader.GetHeaders(input)); } else if (uploader.Body == CustomUploaderBody.JSON || uploader.Body == CustomUploaderBody.XML) { 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) { @@ -120,7 +119,7 @@ public override UploadResult UploadText(string text, string fileName) using (MemoryStream stream = new MemoryStream(bytes)) { result.Response = SendRequest(uploader.RequestMethod, uploader.GetRequestURL(input), stream, UploadHelpers.GetMimeType(fileName), - null, uploader.GetHeaders(input), null, uploader.ResponseType); + null, uploader.GetHeaders(input)); } } else diff --git a/ShareX.UploadersLib/TextUploaders/Pastie.cs b/ShareX.UploadersLib/TextUploaders/Pastie.cs index 4be944782..e4ccbf3c9 100644 --- a/ShareX.UploadersLib/TextUploaders/Pastie.cs +++ b/ShareX.UploadersLib/TextUploaders/Pastie.cs @@ -64,12 +64,8 @@ public override UploadResult UploadText(string text, string fileName) arguments.Add("paste[restricted]", IsPublic ? "0" : "1"); arguments.Add("paste[authorization]", "burger"); - ur.Response = SendRequestURLEncoded(HttpMethod.POST, "http://pastie.org/pastes", arguments, responseType: ResponseType.RedirectionURL); - - if (!string.IsNullOrEmpty(ur.Response)) - { - ur.URL = ur.Response; - } + SendRequestURLEncoded(HttpMethod.POST, "http://pastie.org/pastes", arguments); + ur.URL = ResponseURL; } return ur; diff --git a/ShareX.UploadersLib/TextUploaders/Slexy.cs b/ShareX.UploadersLib/TextUploaders/Slexy.cs index dce727a2d..eaf3860f4 100644 --- a/ShareX.UploadersLib/TextUploaders/Slexy.cs +++ b/ShareX.UploadersLib/TextUploaders/Slexy.cs @@ -80,7 +80,8 @@ public override UploadResult UploadText(string text, string fileName) arguments.Add("tabbing", "true"); arguments.Add("tabtype", "real"); - ur.URL = SendRequestMultiPart(APIURL, arguments, responseType: ResponseType.RedirectionURL); + SendRequestMultiPart(APIURL, arguments); + ur.URL = ResponseURL; } return ur; diff --git a/ShareX.UploadersLib/URLShorteners/CustomURLShortener.cs b/ShareX.UploadersLib/URLShorteners/CustomURLShortener.cs index db36e9e07..d2599f0d2 100644 --- a/ShareX.UploadersLib/URLShorteners/CustomURLShortener.cs +++ b/ShareX.UploadersLib/URLShorteners/CustomURLShortener.cs @@ -80,22 +80,20 @@ public override UploadResult ShortenURL(string url) 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) { - result.Response = SendRequestMultiPart(uploader.GetRequestURL(input), uploader.GetArguments(input), uploader.GetHeaders(input), null, - uploader.ResponseType, uploader.RequestMethod); + result.Response = SendRequestMultiPart(uploader.GetRequestURL(input), uploader.GetArguments(input), uploader.GetHeaders(input), null, uploader.RequestMethod); } else if (uploader.Body == CustomUploaderBody.FormURLEncoded) { - result.Response = SendRequestURLEncoded(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetArguments(input), - uploader.GetHeaders(input), null, uploader.ResponseType); + result.Response = SendRequestURLEncoded(uploader.RequestMethod, uploader.GetRequestURL(input), uploader.GetArguments(input), uploader.GetHeaders(input)); } else if (uploader.Body == CustomUploaderBody.JSON || uploader.Body == CustomUploaderBody.XML) { 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 {