From c2fbc6120ebe80298cbd5119e52556c30fcd3dfa Mon Sep 17 00:00:00 2001 From: Jaex Date: Mon, 14 Mar 2016 23:56:16 +0200 Subject: [PATCH] Catch custom uploader parse response so uploader result can return with response field --- .../FileUploaders/CustomFileUploader.cs | 10 +++++++++- .../ImageUploaders/CustomImageUploader.cs | 10 +++++++++- .../TextUploaders/CustomTextUploader.cs | 10 +++++++++- .../URLShorteners/CustomURLShortener.cs | 10 +++++++++- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs b/ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs index c0bb73206..d68850c41 100644 --- a/ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs +++ b/ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs @@ -49,7 +49,15 @@ public override UploadResult Upload(Stream stream, string fileName) if (result.IsSuccess) { - customUploader.ParseResponse(result); + try + { + customUploader.ParseResponse(result); + } + catch (Exception e) + { + // TODO: Translate + Errors.Add("Response parse failed." + Environment.NewLine + e); + } } return result; diff --git a/ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs b/ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs index 539711a5f..5e15e1cbe 100644 --- a/ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs +++ b/ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs @@ -49,7 +49,15 @@ public override UploadResult Upload(Stream stream, string fileName) if (result.IsSuccess) { - customUploader.ParseResponse(result); + try + { + customUploader.ParseResponse(result); + } + catch (Exception e) + { + // TODO: Translate + Errors.Add("Response parse failed." + Environment.NewLine + e); + } } return result; diff --git a/ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs b/ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs index 98edfefa4..ce162970e 100644 --- a/ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs +++ b/ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs @@ -72,7 +72,15 @@ public override UploadResult UploadText(string text, string fileName) result.Response = SendRequest(customUploader.GetHttpMethod(), requestURL, args, customUploader.GetHeaders(), responseType: customUploader.ResponseType); } - customUploader.ParseResponse(result); + try + { + customUploader.ParseResponse(result); + } + catch (Exception e) + { + // TODO: Translate + Errors.Add("Response parse failed." + Environment.NewLine + e); + } return result; } diff --git a/ShareX.UploadersLib/URLShorteners/CustomURLShortener.cs b/ShareX.UploadersLib/URLShorteners/CustomURLShortener.cs index fa3b07762..c749a7ff1 100644 --- a/ShareX.UploadersLib/URLShorteners/CustomURLShortener.cs +++ b/ShareX.UploadersLib/URLShorteners/CustomURLShortener.cs @@ -52,7 +52,15 @@ public override UploadResult ShortenURL(string url) result.Response = SendRequest(customUploader.GetHttpMethod(), customUploader.GetRequestURL(), args, customUploader.GetHeaders(), responseType: customUploader.ResponseType); - customUploader.ParseResponse(result, true); + try + { + customUploader.ParseResponse(result, true); + } + catch (Exception e) + { + // TODO: Translate + Errors.Add("Response parse failed." + Environment.NewLine + e); + } return result; }