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

Parse custom uploader error message

Browse source
This commit is contained in:
Jaex 2020-09-22 10:16:39 +03:00
parent e4aea5e8f4
commit a49ee424a0
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,10 +62,7 @@ public static void UpdateServicePointManager()
protected void OnProgressChanged(ProgressManager progress)
{
if (ProgressChanged != null)
{
ProgressChanged(progress);
}
ProgressChanged?.Invoke(progress);
}
protected void OnEarlyURLCopyRequested(string url)

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

@ -260,17 +260,17 @@ public void ParseResponse(UploadResult result, ResponseInfo responseInfo, Custom
{
result.ResponseInfo = responseInfo;
if (responseInfo.ResponseText == null)
{
responseInfo.ResponseText = "";
}
CustomUploaderParser parser = new CustomUploaderParser(responseInfo, RegexList);
parser.Filename = input.Filename;
parser.URLEncode = true;
if (responseInfo.IsSuccess)
{
if (responseInfo.ResponseText == null)
{
responseInfo.ResponseText = "";
}
CustomUploaderParser parser = new CustomUploaderParser(responseInfo, RegexList);
parser.Filename = input.Filename;
parser.URLEncode = true;
string url;
if (!string.IsNullOrEmpty(URL))
@ -294,6 +294,14 @@ public void ParseResponse(UploadResult result, ResponseInfo responseInfo, Custom
result.ThumbnailURL = parser.Parse(ThumbnailURL);
result.DeletionURL = parser.Parse(DeletionURL);
}
else
{
if (!string.IsNullOrEmpty(ErrorMessage))
{
string errorMessage = "Error message:\r\n" + parser.Parse(ErrorMessage);
result.Errors.Add(errorMessage);
}
}
}
}