CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-30 01:07:21 +13:00
Code Issues Projects Releases Packages Wiki Activity

Show custom uploader response text even if response status is not success

Browse source
This commit is contained in:
Jaex 2019-01-31 03:50:01 +03:00
parent 0364a1ca84
commit a96408e45a
3 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -242,34 +242,39 @@ public NameValueCollection GetHeaders(CustomUploaderInput input)
public void ParseResponse(UploadResult result, ResponseInfo responseInfo, CustomUploaderInput input, bool isShortenedURL = false)
{
if (result != null && responseInfo != null && responseInfo.IsSuccess && !string.IsNullOrEmpty(responseInfo.ResponseText))
if (result != null && responseInfo != null)
{
CustomUploaderParser parser = new CustomUploaderParser(responseInfo, RegexList);
parser.Filename = input.Filename;
parser.URLEncode = true;
result.ResponseInfo = responseInfo;
string url;
if (responseInfo.IsSuccess && !string.IsNullOrEmpty(responseInfo.ResponseText))
{
CustomUploaderParser parser = new CustomUploaderParser(responseInfo, RegexList);
parser.Filename = input.Filename;
parser.URLEncode = true;
if (!string.IsNullOrEmpty(URL))
{
url = parser.Parse(URL);
}
else
{
url = parser.ResponseInfo.ResponseText;
}
string url;
if (isShortenedURL)
{
result.ShortenedURL = url;
}
else
{
result.URL = url;
}
if (!string.IsNullOrEmpty(URL))
{
url = parser.Parse(URL);
}
else
{
url = parser.ResponseInfo.ResponseText;
}
result.ThumbnailURL = parser.Parse(ThumbnailURL);
result.DeletionURL = parser.Parse(DeletionURL);
if (isShortenedURL)
{
result.ShortenedURL = url;
}
else
{
result.URL = url;
}
result.ThumbnailURL = parser.Parse(ThumbnailURL);
result.DeletionURL = parser.Parse(DeletionURL);
}
}
}

2
ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs
View file

@ -655,7 +655,7 @@ await Task.Run(() =>
}
rtbCustomUploaderResult.Text = sbResult.ToString();
txtCustomUploaderResponse.Text = result.Response;
txtCustomUploaderResponse.Text = result.ResponseInfo?.ResponseText;
tcCustomUploader.SelectedTab = tpCustomUploaderTest;
}

2
ShareX.UploadersLib/UploadResult.cs
View file

@ -63,6 +63,8 @@ public bool IsError
}
}
public ResponseInfo ResponseInfo { get; set; }
public UploadResult()
{
Errors = new List<string>();