mirror of
https://github.com/ShareX/ShareX.git
synced 2024-07-04 22:21:23 +12:00
Use internal upload method
This commit is contained in:
parent
6e9c4ebcd3
commit
223d6938ba
|
@ -60,12 +60,9 @@ public sealed class Imgur : ImageUploader, IOAuth2
|
||||||
public bool DirectLink { get; set; }
|
public bool DirectLink { get; set; }
|
||||||
public bool UseGIFV { get; set; }
|
public bool UseGIFV { get; set; }
|
||||||
|
|
||||||
private bool refreshTokenOnError;
|
|
||||||
|
|
||||||
public Imgur(OAuth2Info oauth)
|
public Imgur(OAuth2Info oauth)
|
||||||
{
|
{
|
||||||
AuthInfo = oauth;
|
AuthInfo = oauth;
|
||||||
refreshTokenOnError = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public string GetAuthorizationURL()
|
public string GetAuthorizationURL()
|
||||||
|
@ -181,6 +178,11 @@ public List<ImgurAlbumData> GetAlbums()
|
||||||
}
|
}
|
||||||
|
|
||||||
public override UploadResult Upload(Stream stream, string fileName)
|
public override UploadResult Upload(Stream stream, string fileName)
|
||||||
|
{
|
||||||
|
return InternalUpload(stream, fileName, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private UploadResult InternalUpload(Stream stream, string fileName, bool refreshTokenOnError)
|
||||||
{
|
{
|
||||||
Dictionary<string, string> args = new Dictionary<string, string>();
|
Dictionary<string, string> args = new Dictionary<string, string>();
|
||||||
NameValueCollection headers;
|
NameValueCollection headers;
|
||||||
|
@ -274,8 +276,7 @@ public override UploadResult Upload(Stream stream, string fileName)
|
||||||
{
|
{
|
||||||
DebugHelper.WriteLine("Imgur access token refreshed, reuploading image.");
|
DebugHelper.WriteLine("Imgur access token refreshed, reuploading image.");
|
||||||
|
|
||||||
refreshTokenOnError = false;
|
return InternalUpload(stream, fileName, false);
|
||||||
return Upload(stream, fileName);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
string errorMessage = string.Format("Imgur upload failed: ({0}) {1}", imgurResponse.status, errorData.error);
|
string errorMessage = string.Format("Imgur upload failed: ({0}) {1}", imgurResponse.status, errorData.error);
|
||||||
|
|
|
@ -66,7 +66,6 @@ public AboutForm()
|
||||||
|
|
||||||
Mega, Gist and Jira support: https://github.com/gpailler
|
Mega, Gist and Jira support: https://github.com/gpailler
|
||||||
Web site: https://github.com/dmxt
|
Web site: https://github.com/dmxt
|
||||||
MediaCrush (Imgrush) support: https://github.com/SirCmpwn
|
|
||||||
Amazon S3 and DreamObjects support: https://github.com/alanedwardes
|
Amazon S3 and DreamObjects support: https://github.com/alanedwardes
|
||||||
Gfycat support: https://github.com/Dinnerbone
|
Gfycat support: https://github.com/Dinnerbone
|
||||||
Copy support: https://github.com/KamilKZ
|
Copy support: https://github.com/KamilKZ
|
||||||
|
|
Loading…
Reference in a new issue