From 10b57f05e34255a68adfa4e808a747084f9f6702 Mon Sep 17 00:00:00 2001 From: Jaex Date: Fri, 23 Dec 2016 10:55:16 +0300 Subject: [PATCH] Removed SendRequestJSON method --- ShareX.UploadersLib/BaseUploaders/Uploader.cs | 26 +++---------------- ShareX.UploadersLib/FileUploaders/Copy.cs | 2 +- ShareX.UploadersLib/FileUploaders/Ge_tt.cs | 10 +++---- .../FileUploaders/GoogleDrive.cs | 2 +- ShareX.UploadersLib/FileUploaders/Mega.cs | 2 +- .../TextUploaders/GitHubGist.cs | 4 +-- .../URLShorteners/GoogleURLShortener.cs | 2 +- 7 files changed, 13 insertions(+), 35 deletions(-) diff --git a/ShareX.UploadersLib/BaseUploaders/Uploader.cs b/ShareX.UploadersLib/BaseUploaders/Uploader.cs index 43a3063ef..c6eec68e7 100644 --- a/ShareX.UploadersLib/BaseUploaders/Uploader.cs +++ b/ShareX.UploadersLib/BaseUploaders/Uploader.cs @@ -153,7 +153,7 @@ public virtual void StopUpload() } } - protected string SendRequest(HttpMethod method, string url, string content, Dictionary args = null, NameValueCollection headers = null, + 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) { byte[] data = Encoding.UTF8.GetBytes(content); @@ -162,7 +162,7 @@ public virtual void StopUpload() { ms.Write(data, 0, data.Length); - return SendRequest(method, url, ms, null, args, headers, cookies, responseType); + return SendRequest(method, url, ms, contentType, args, headers, cookies, responseType); } } @@ -175,7 +175,7 @@ public virtual void StopUpload() } } - protected bool SendRequest(HttpMethod method, Stream downloadStream, string url, Dictionary args = null, + protected bool SendRequestDownload(HttpMethod method, string url, Stream downloadStream, Dictionary args = null, NameValueCollection headers = null, CookieCollection cookies = null, string contentType = null) { using (HttpWebResponse response = GetResponse(method, url, null, contentType, args, headers, cookies)) @@ -190,26 +190,6 @@ public virtual void StopUpload() return false; } - protected string SendRequestJSON(string url, string json, NameValueCollection headers = null, CookieCollection cookies = null, HttpMethod method = HttpMethod.POST) - { - MemoryStream stream = null; - - try - { - if (!string.IsNullOrEmpty(json)) - { - byte[] data = Encoding.UTF8.GetBytes(json); - stream = new MemoryStream(data); - } - - return SendRequest(method, url, stream, ContentTypeJSON, null, headers, cookies); - } - finally - { - if (stream != null) stream.Dispose(); - } - } - protected string SendRequestURLEncoded(string url, Dictionary args, NameValueCollection headers = null, CookieCollection cookies = null, HttpMethod method = HttpMethod.POST, ResponseType responseType = ResponseType.Text) { diff --git a/ShareX.UploadersLib/FileUploaders/Copy.cs b/ShareX.UploadersLib/FileUploaders/Copy.cs index 01dc0c77f..304660dbe 100644 --- a/ShareX.UploadersLib/FileUploaders/Copy.cs +++ b/ShareX.UploadersLib/FileUploaders/Copy.cs @@ -120,7 +120,7 @@ public bool DownloadFile(string path, Stream downloadStream) { string url = URLHelpers.CombineURL(URLFiles, URLHelpers.URLPathEncode(path)); string query = OAuthManager.GenerateQuery(url, null, HttpMethod.GET, AuthInfo); - return SendRequest(HttpMethod.GET, downloadStream, query); + return SendRequestDownload(HttpMethod.GET, query, downloadStream); } return false; diff --git a/ShareX.UploadersLib/FileUploaders/Ge_tt.cs b/ShareX.UploadersLib/FileUploaders/Ge_tt.cs index 90697d5c6..8f1a1b07d 100644 --- a/ShareX.UploadersLib/FileUploaders/Ge_tt.cs +++ b/ShareX.UploadersLib/FileUploaders/Ge_tt.cs @@ -71,9 +71,9 @@ public Ge_ttLogin Login(string email, string password) args.Add("email", email); args.Add("password", password); - string argsJSON = JsonConvert.SerializeObject(args); + string json = JsonConvert.SerializeObject(args); - string response = SendRequestJSON("https://open.ge.tt/1/users/login", argsJSON); + string response = SendRequest(HttpMethod.POST, "https://open.ge.tt/1/users/login", json, ContentTypeJSON); return JsonConvert.DeserializeObject(response); } @@ -94,14 +94,12 @@ public Ge_ttFile CreateFile(string accessToken, string shareName, string fileNam Dictionary args = new Dictionary(); args.Add("accesstoken", accessToken); - string url = CreateQuery(string.Format("https://open.ge.tt/1/files/{0}/create", shareName), args); - Dictionary args2 = new Dictionary(); args2.Add("filename", fileName); - string argsJSON = JsonConvert.SerializeObject(args2); + string json = JsonConvert.SerializeObject(args2); - string response = SendRequestJSON(url, argsJSON); + string response = SendRequest(HttpMethod.POST, $"https://open.ge.tt/1/files/{shareName}/create", json, ContentTypeJSON, args); return JsonConvert.DeserializeObject(response); } diff --git a/ShareX.UploadersLib/FileUploaders/GoogleDrive.cs b/ShareX.UploadersLib/FileUploaders/GoogleDrive.cs index dcf89d2b6..bf4378bd3 100644 --- a/ShareX.UploadersLib/FileUploaders/GoogleDrive.cs +++ b/ShareX.UploadersLib/FileUploaders/GoogleDrive.cs @@ -217,7 +217,7 @@ private void SetPermissions(string fileID, GoogleDrivePermissionRole role, Googl withLink = withLink.ToString() }); - string response = SendRequestJSON(url, json, GetAuthHeaders()); + string response = SendRequest(HttpMethod.POST, url, json, ContentTypeJSON, null, GetAuthHeaders()); } public List GetFolders(bool trashed = false, bool writer = true) diff --git a/ShareX.UploadersLib/FileUploaders/Mega.cs b/ShareX.UploadersLib/FileUploaders/Mega.cs index 5f240f1f5..c0fc5eab8 100644 --- a/ShareX.UploadersLib/FileUploaders/Mega.cs +++ b/ShareX.UploadersLib/FileUploaders/Mega.cs @@ -152,7 +152,7 @@ public override UploadResult Upload(Stream stream, string fileName) public string PostRequestJson(Uri url, string jsonData) { - return SendRequestJSON(url.ToString(), jsonData); + return SendRequest(HttpMethod.POST, url.ToString(), jsonData, ContentTypeJSON); } public string PostRequestRaw(Uri url, Stream dataStream) diff --git a/ShareX.UploadersLib/TextUploaders/GitHubGist.cs b/ShareX.UploadersLib/TextUploaders/GitHubGist.cs index de44aa91b..f63d90678 100644 --- a/ShareX.UploadersLib/TextUploaders/GitHubGist.cs +++ b/ShareX.UploadersLib/TextUploaders/GitHubGist.cs @@ -132,7 +132,7 @@ public override UploadResult UploadText(string text, string fileName) } }; - string argsJson = JsonConvert.SerializeObject(gistUploadObject); + string json = JsonConvert.SerializeObject(gistUploadObject); string url = URLGists; @@ -141,7 +141,7 @@ public override UploadResult UploadText(string text, string fileName) url += "?access_token=" + AuthInfo.Token.access_token; } - string response = SendRequestJSON(url, argsJson); + string response = SendRequest(HttpMethod.POST, url, json, ContentTypeJSON); if (response != null) { diff --git a/ShareX.UploadersLib/URLShorteners/GoogleURLShortener.cs b/ShareX.UploadersLib/URLShorteners/GoogleURLShortener.cs index d4fd240c1..71ecf0305 100644 --- a/ShareX.UploadersLib/URLShorteners/GoogleURLShortener.cs +++ b/ShareX.UploadersLib/URLShorteners/GoogleURLShortener.cs @@ -183,7 +183,7 @@ public override UploadResult ShortenURL(string url) string json = JsonConvert.SerializeObject(new { longUrl = url }); - result.Response = SendRequestJSON(query, json); + result.Response = SendRequest(HttpMethod.POST, query, json, ContentTypeJSON); if (!string.IsNullOrEmpty(result.Response)) {