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

Rename UploadData method to SendRequestFile for consistency with other methods

Browse source
This commit is contained in:
Jaex 2016-12-26 19:47:46 +03:00
parent d3a075ffec
commit 8161d1440a
53 changed files with 54 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -121,10 +121,7 @@ public virtual void StopUpload()
protected string SendRequest(HttpMethod method, string url, Dictionary<string, string> args = null, NameValueCollection headers = null,
CookieCollection cookies = null, ResponseType responseType = ResponseType.Text)
{
using (HttpWebResponse response = GetResponse(method, url, null, null, args, headers, cookies))
{
return ResponseToString(response, responseType);
}
return SendRequest(method, url, (Stream)null, null, args, headers, cookies, responseType);
}
protected string SendRequest(HttpMethod method, string url, Stream data, string contentType = null, Dictionary<string, string> args = null, NameValueCollection headers = null,
@ -204,7 +201,7 @@ protected string SendRequestMultiPart(string url, Dictionary<string, string> arg
}
}
protected UploadResult UploadData(string url, Stream data, string fileName, string fileFormName = "file", Dictionary<string, string> args = null,
protected UploadResult SendRequestFile(string url, Stream data, string fileName, string fileFormName = "file", Dictionary<string, string> args = null,
NameValueCollection headers = null, CookieCollection cookies = null, ResponseType responseType = ResponseType.Text, HttpMethod method = HttpMethod.POST,
string contentType = ContentTypeMultipartFormData, string metadata = null)
{

2
ShareX.UploadersLib/FileUploaders/Box.cs
View file

@ -220,7 +220,7 @@ public override UploadResult Upload(Stream stream, string fileName)
Dictionary<string, string> args = new Dictionary<string, string>();
args.Add("parent_id", FolderID);
UploadResult result = UploadData("https://upload.box.com/api/2.0/files/content", stream, fileName, "filename", args, GetAuthHeaders());
UploadResult result = SendRequestFile("https://upload.box.com/api/2.0/files/content", stream, fileName, "filename", args, GetAuthHeaders());
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/Copy.cs
View file

@ -144,7 +144,7 @@ public UploadResult UploadFile(Stream stream, string path, string fileName)
string query = OAuthManager.GenerateQuery(url, args, HttpMethod.POST, AuthInfo);
// There's a 1GB and 5 hour(max time for a single upload) limit to all uploads through the API.
UploadResult result = UploadData(query, stream, fileName, "file", headers: APIHeaders);
UploadResult result = SendRequestFile(query, stream, fileName, "file", headers: APIHeaders);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/CustomFileUploader.cs
View file

@ -85,7 +85,7 @@ public override UploadResult Upload(Stream stream, string fileName)
throw new Exception("'Request type' must be 'POST' when using custom file uploader.");
}
UploadResult result = UploadData(customUploader.GetRequestURL(), stream, fileName, customUploader.GetFileFormName(), customUploader.GetArguments(),
UploadResult result = SendRequestFile(customUploader.GetRequestURL(), stream, fileName, customUploader.GetFileFormName(), customUploader.GetArguments(),
customUploader.GetHeaders(), responseType: customUploader.ResponseType);
if (result.IsSuccess)

2
ShareX.UploadersLib/FileUploaders/DropIO.cs
View file

@ -70,7 +70,7 @@ public override UploadResult Upload(Stream stream, string fileName)
args.Add("token", drop.AdminToken);
args.Add("drop_name", drop.Name);
UploadResult result = UploadData("http://assets.drop.io/upload", stream, fileName, "file", args);
UploadResult result = SendRequestFile("http://assets.drop.io/upload", stream, fileName, "file", args);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/Dropfile.cs
View file

@ -44,7 +44,7 @@ public sealed class Dropfile : FileUploader
{
public override UploadResult Upload(Stream stream, string fileName)
{
UploadResult result = UploadData("https://d1.dropfile.to/upload", stream, fileName);
UploadResult result = SendRequestFile("https://d1.dropfile.to/upload", stream, fileName);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/FileBin.cs
View file

@ -35,7 +35,7 @@ public override UploadResult Upload(Stream stream, string fileName)
Dictionary<string, string> args = new Dictionary<string, string>();
args.Add("MAX_FILE_SIZE", "82428800");
UploadResult result = UploadData("http://filebin.ca/upload.php", stream, fileName, "file", args);
UploadResult result = SendRequestFile("http://filebin.ca/upload.php", stream, fileName, "file", args);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/FileSonic.cs
View file

@ -52,7 +52,7 @@ public override UploadResult Upload(Stream stream, string fileName)
if (!string.IsNullOrEmpty(url))
{
result = UploadData(url, stream, fileName);
result = SendRequestFile(url, stream, fileName);
if (!string.IsNullOrEmpty(result.Response))
{

2
ShareX.UploadersLib/FileUploaders/Ge_tt.cs
View file

@ -116,7 +116,7 @@ public override UploadResult Upload(Stream stream, string fileName)
if (file != null)
{
result = UploadData(file.Upload.PostURL, stream, fileName);
result = SendRequestFile(file.Upload.PostURL, stream, fileName);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/GfycatUploader.cs
View file

@ -68,7 +68,7 @@ public override UploadResult Upload(Stream stream, string fileName)
args.Add("signature", "mk9t/U/wRN4/uU01mXfeTe2Kcoc=");
args.Add("Content-Type", Helpers.GetMimeType(fileName));
UploadResult result = UploadData("https://gifaffe.s3.amazonaws.com/", stream, fileName, "file", args);
UploadResult result = SendRequestFile("https://gifaffe.s3.amazonaws.com/", stream, fileName, "file", args);
if (!result.IsError)
{

2
ShareX.UploadersLib/FileUploaders/GoogleDrive.cs
View file

@ -260,7 +260,7 @@ public override UploadResult Upload(Stream stream, string fileName)
string metadata = GetMetadata(fileName, FolderID);
UploadResult result = UploadData("https://www.googleapis.com/upload/drive/v2/files?uploadType=multipart", stream, fileName, headers: GetAuthHeaders(),
UploadResult result = SendRequestFile("https://www.googleapis.com/upload/drive/v2/files?uploadType=multipart", stream, fileName, headers: GetAuthHeaders(),
contentType: "multipart/related", metadata: metadata);
if (!string.IsNullOrEmpty(result.Response))

2
ShareX.UploadersLib/FileUploaders/Hostr.cs
View file

@ -73,7 +73,7 @@ public override UploadResult Upload(Stream stream, string fileName)
if (!string.IsNullOrEmpty(Email) && !string.IsNullOrEmpty(Password))
{
NameValueCollection headers = CreateAuthenticationHeader(Email, Password);
result = UploadData("https://api.hostr.co/file", stream, fileName, headers: headers);
result = SendRequestFile("https://api.hostr.co/file", stream, fileName, headers: headers);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/Jira.cs
View file

@ -233,7 +233,7 @@ public override UploadResult Upload(Stream stream, string fileName)
NameValueCollection headers = new NameValueCollection();
headers.Set("X-Atlassian-Token", "nocheck");
UploadResult res = UploadData(query, stream, fileName, headers: headers);
UploadResult res = SendRequestFile(query, stream, fileName, headers: headers);
if (res.Response.Contains("errorMessages"))
{
Errors.Add(res.Response);

2
ShareX.UploadersLib/FileUploaders/Lambda.cs
View file

@ -70,7 +70,7 @@ public override UploadResult Upload(Stream stream, string fileName)
{
Dictionary<string, string> arguments = new Dictionary<string, string>();
arguments.Add("api_key", Config.UserAPIKey);
UploadResult result = UploadData(uploadUrl, stream, fileName, "file", arguments, method: HttpMethod.PUT);
UploadResult result = SendRequestFile(uploadUrl, stream, fileName, "file", arguments, method: HttpMethod.PUT);
if (result.Response == null)
{

2
ShareX.UploadersLib/FileUploaders/Lithiio.cs
View file

@ -68,7 +68,7 @@ public override UploadResult Upload(Stream stream, string fileName)
{
Dictionary<string, string> arguments = new Dictionary<string, string>();
arguments.Add("key", Config.UserAPIKey);
UploadResult result = UploadData(uploadUrl, stream, fileName, "file", arguments);
UploadResult result = SendRequestFile(uploadUrl, stream, fileName, "file", arguments);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/MediaCrushUploader.cs
View file

@ -66,7 +66,7 @@ public override UploadResult Upload(Stream stream, string fileName)
try
{
result = UploadData(URLHelpers.CombineURL(APIURL, "api/upload/file"), stream, fileName);
result = SendRequestFile(URLHelpers.CombineURL(APIURL, "api/upload/file"), stream, fileName);
}
catch (WebException e)
{

2
ShareX.UploadersLib/FileUploaders/MediaFire.cs
View file

@ -121,7 +121,7 @@ private string SimpleUpload(Stream stream, string fileName)
args.Add("response_format", "json");
args.Add("signature", GetSignature("upload/simple.php", args));
string url = CreateQuery(_apiUrl + "upload/simple.php", args);
UploadResult res = UploadData(url, stream, fileName, "Filedata");
UploadResult res = SendRequestFile(url, stream, fileName, "Filedata");
if (!res.IsSuccess) throw new IOException(res.ErrorsToString());
SimpleUploadResponse resp = DeserializeResponse<SimpleUploadResponse>(res.Response);
EnsureSuccess(resp);

2
ShareX.UploadersLib/FileUploaders/Minus.cs
View file

@ -246,7 +246,7 @@ public override UploadResult Upload(Stream stream, string fileName)
args.Add("caption", fileName);
args.Add("filename", fileName);
UploadResult result = UploadData(url, stream, fileName, "file", args);
UploadResult result = SendRequestFile(url, stream, fileName, "file", args);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/OneDrive.cs
View file

@ -183,7 +183,7 @@ public override UploadResult Upload(Stream stream, string fileName)
string url = CreateQuery(URLHelpers.CombineURL("https://apis.live.net/v5.0", folderPath), args);
UploadResult result = UploadData(url, stream, fileName);
UploadResult result = SendRequestFile(url, stream, fileName);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/Pomf.cs
View file

@ -99,7 +99,7 @@ public Pomf(PomfUploader uploader)
public override UploadResult Upload(Stream stream, string fileName)
{
UploadResult result = UploadData(Uploader.UploadURL, stream, fileName, "files[]");
UploadResult result = SendRequestFile(Uploader.UploadURL, stream, fileName, "files[]");
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/Pushbullet.cs
View file

@ -101,7 +101,7 @@ public UploadResult PushFile(Stream stream, string fileName)
upArgs.Add("policy", fileInfo.data.policy);
upArgs.Add("content-type", fileInfo.data.content_type);
UploadResult uploadResult = UploadData(fileInfo.upload_url, stream, fileName, "file", upArgs);
UploadResult uploadResult = SendRequestFile(fileInfo.upload_url, stream, fileName, "file", upArgs);
if (uploadResult == null) return null;

2
ShareX.UploadersLib/FileUploaders/Puush.cs
View file

@ -104,7 +104,7 @@ public override UploadResult Upload(Stream stream, string fileName)
arguments.Add("k", APIKey);
arguments.Add("z", "ShareX");
UploadResult result = UploadData(PuushAPIUploadURL, stream, fileName, "f", arguments);
UploadResult result = SendRequestFile(PuushAPIUploadURL, stream, fileName, "f", arguments);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/RapidShare.cs
View file

@ -73,7 +73,7 @@ public override UploadResult Upload(Stream stream, string fileName)
args.Add("folder", FolderID);
}
UploadResult result = UploadData(url, stream, fileName, "filecontent", args);
UploadResult result = SendRequestFile(url, stream, fileName, "filecontent", args);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/Seafile.cs
View file

@ -442,7 +442,7 @@ public override UploadResult Upload(Stream stream, string fileName)
args.Add("filename", fileName);
args.Add("parent_dir", Path);
UploadResult result = UploadData(responseURL, stream, fileName, "file", args, headers);
UploadResult result = SendRequestFile(responseURL, stream, fileName, "file", args, headers);
if (!IsError)
{

2
ShareX.UploadersLib/FileUploaders/SendSpace.cs
View file

@ -507,7 +507,7 @@ public UploadResult Upload(Stream stream, string fileName, UploadInfo uploadInfo
{
Dictionary<string, string> args = PrepareArguments(uploadInfo.MaxFileSize, uploadInfo.UploadIdentifier, uploadInfo.ExtraInfo);
result = UploadData(uploadInfo.URL, stream, fileName, "userfile", args);
result = SendRequestFile(uploadInfo.URL, stream, fileName, "userfile", args);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/ShareCX.cs
View file

@ -32,7 +32,7 @@ public sealed class ShareCX : FileUploader
{
public override UploadResult Upload(Stream stream, string fileName)
{
UploadResult result = UploadData("http://file1.share.cx/cgi-bin/upload.cgi", stream, fileName, "file_0");
UploadResult result = SendRequestFile("http://file1.share.cx/cgi-bin/upload.cgi", stream, fileName, "file_0");
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/Streamable.cs
View file

@ -85,7 +85,7 @@ public override UploadResult Upload(Stream stream, string fileName)
headers = CreateAuthenticationHeader(Email, Password);
}
UploadResult result = UploadData(URLHelpers.CombineURL(Host, "upload"), stream, fileName, headers: headers);
UploadResult result = SendRequestFile(URLHelpers.CombineURL(Host, "upload"), stream, fileName, headers: headers);
TranscodeFile(result);

2
ShareX.UploadersLib/FileUploaders/Sul.cs
View file

@ -73,7 +73,7 @@ public override UploadResult Upload(Stream stream, string fileName)
string url = "https://s-ul.eu";
url = URLHelpers.CombineURL(url, "upload.php");
UploadResult result = UploadData(url, stream, fileName, "file", args);
UploadResult result = SendRequestFile(url, stream, fileName, "file", args);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/Transfersh.cs
View file

@ -43,7 +43,7 @@ public sealed class Transfersh : FileUploader
{
public override UploadResult Upload(Stream stream, string fileName)
{
UploadResult result = UploadData("https://transfer.sh", stream, fileName);
UploadResult result = SendRequestFile("https://transfer.sh", stream, fileName);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/Uguu.cs
View file

@ -58,7 +58,7 @@ public override UploadResult Upload(Stream stream, string fileName)
arguments.Add("name", CustomName);
}
UploadResult result = UploadData("https://uguu.se/api.php?d=upload-tool", stream, fileName, "file", arguments);
UploadResult result = SendRequestFile("https://uguu.se/api.php?d=upload-tool", stream, fileName, "file", arguments);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/FileUploaders/Uplea.cs
View file

@ -125,7 +125,7 @@ public override UploadResult Upload(Stream stream, string fileName)
args.Add("token", upleaBestNode.Token);
args.Add("file_id[]", Guid.NewGuid().ToString());
UploadResult result = UploadData(string.Format("http://{0}/", upleaBestNode.Name), stream, fileName, "files[]", args);
UploadResult result = SendRequestFile(string.Format("http://{0}/", upleaBestNode.Name), stream, fileName, "files[]", args);
UpleaGetUpleaUploadResponse uploadResult = JsonConvert.DeserializeObject<UpleaGetUpleaUploadResponse>(result.Response);
if (uploadResult.Files.Length > 0)

2
ShareX.UploadersLib/FileUploaders/VideoBin.cs
View file

@ -51,7 +51,7 @@ public override UploadResult Upload(Stream stream, string fileName)
Dictionary<string, string> arguments = new Dictionary<string, string>();
arguments.Add("api", "1");
UploadResult result = UploadData(URLUpload, stream, fileName, "videoFile", arguments);
UploadResult result = SendRequestFile(URLUpload, stream, fileName, "videoFile", arguments);
result.URL = result.Response;

2
ShareX.UploadersLib/ImageUploaders/Chevereto.cs
View file

@ -118,7 +118,7 @@ public override UploadResult Upload(Stream stream, string fileName)
string url = URLHelpers.FixPrefix(Uploader.UploadURL);
UploadResult result = UploadData(url, stream, fileName, "source", args);
UploadResult result = SendRequestFile(url, stream, fileName, "source", args);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/ImageUploaders/CustomImageUploader.cs
View file

@ -82,7 +82,7 @@ public override UploadResult Upload(Stream stream, string fileName)
throw new Exception("'Request type' must be 'POST' when using custom image uploader.");
}
UploadResult result = UploadData(customUploader.GetRequestURL(), stream, fileName, customUploader.GetFileFormName(), customUploader.GetArguments(),
UploadResult result = SendRequestFile(customUploader.GetRequestURL(), stream, fileName, customUploader.GetFileFormName(), customUploader.GetArguments(),
customUploader.GetHeaders(), responseType: customUploader.ResponseType);
if (result.IsSuccess)

2
ShareX.UploadersLib/ImageUploaders/FlickrUploader.cs
View file

@ -261,7 +261,7 @@ public override UploadResult Upload(Stream stream, string fileName)
args.Add("api_sig", GetAPISig(args));
UploadResult result = UploadData("https://up.flickr.com/services/upload/", stream, fileName, "photo", args);
UploadResult result = SendRequestFile("https://up.flickr.com/services/upload/", stream, fileName, "photo", args);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/ImageUploaders/ImageBin.cs
View file

@ -42,7 +42,7 @@ public override UploadResult Upload(Stream stream, string fileName)
arguments.Add("sfile", "Upload");
arguments.Add("url", "");
UploadResult result = UploadData("http://imagebin.ca/upload.php", stream, fileName, "f", arguments);
UploadResult result = SendRequestFile("http://imagebin.ca/upload.php", stream, fileName, "f", arguments);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/ImageUploaders/ImageShackUploader.cs
View file

@ -100,7 +100,7 @@ public override UploadResult Upload(Stream stream, string fileName)
arguments.Add("auth_token", Config.Auth_token);
arguments.Add("public", Config.IsPublic ? "y" : "n");
UploadResult result = UploadData(URLUpload, stream, fileName, "file", arguments);
UploadResult result = SendRequestFile(URLUpload, stream, fileName, "file", arguments);
if (!string.IsNullOrEmpty(result.Response))
{

2
ShareX.UploadersLib/ImageUploaders/Img1Uploader.cs
View file

@ -33,7 +33,7 @@ public sealed class Img1Uploader : ImageUploader
public override UploadResult Upload(Stream stream, string fileName)
{
UploadResult result = UploadData(uploadURL, stream, fileName, "fileup");
UploadResult result = SendRequestFile(uploadURL, stream, fileName, "fileup");
if (result.IsSuccess)
{

2
ShareX.UploadersLib/ImageUploaders/ImglandUploader.cs
View file

@ -51,7 +51,7 @@ public override UploadResult Upload(Stream stream, string fileName)
Dictionary<string, string> arguments = new Dictionary<string, string>();
arguments.Add("usubmit", "true");
UploadResult result = UploadData(uploadUrl, stream, fileName, "imagefile[]", arguments);
UploadResult result = SendRequestFile(uploadUrl, stream, fileName, "imagefile[]", arguments);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/ImageUploaders/Imgur.cs
View file

@ -250,7 +250,7 @@ private UploadResult InternalUpload(Stream stream, string fileName, bool refresh
}
WebExceptionReturnResponse = true;
UploadResult result = UploadData("https://api.imgur.com/3/image", stream, fileName, "image", args, headers);
UploadResult result = SendRequestFile("https://api.imgur.com/3/image", stream, fileName, "image", args, headers);
if (!string.IsNullOrEmpty(result.Response))
{

2
ShareX.UploadersLib/ImageUploaders/ImmioUploader.cs
View file

@ -32,7 +32,7 @@ public sealed class ImmioUploader : ImageUploader
{
public override UploadResult Upload(Stream stream, string fileName)
{
UploadResult result = UploadData("http://imm.io/store/", stream, fileName, "image");
UploadResult result = SendRequestFile("http://imm.io/store/", stream, fileName, "image");
if (result.IsSuccess)
{
ImmioResponse response = JsonConvert.DeserializeObject<ImmioResponse>(result.Response);

2
ShareX.UploadersLib/ImageUploaders/Photobucket.cs
View file

@ -124,7 +124,7 @@ public UploadResult UploadMedia(Stream stream, string fileName, string albumID)
string query = OAuthManager.GenerateQuery(url, args, HttpMethod.POST, AuthInfo);
query = FixURL(query);
UploadResult result = UploadData(query, stream, fileName, "uploadfile");
UploadResult result = SendRequestFile(query, stream, fileName, "uploadfile");
if (result.IsSuccess)
{

2
ShareX.UploadersLib/ImageUploaders/Slimg.cs
View file

@ -80,7 +80,7 @@ public override UploadResult Upload(Stream stream, string fileName)
arguments.Add("type", "binary");
arguments.Add("shared", "false");
UploadResult result = UploadData("https://api.sli.mg/media", stream, fileName, "data", arguments, GetAuthHeaders());
UploadResult result = SendRequestFile("https://api.sli.mg/media", stream, fileName, "data", arguments, GetAuthHeaders());
if (result.IsSuccess)
{

2
ShareX.UploadersLib/ImageUploaders/SomeImage.cs
View file

@ -79,7 +79,7 @@ public override UploadResult Upload(Stream stream, string fileName)
arguments.Add("apikey", API_KEY);
arguments.Add("familysafe", "0"); // Set to 0 as images could possibly not be family safe.
UploadResult result = UploadData(API_ENDPOINT, stream, fileName, "file", arguments);
UploadResult result = SendRequestFile(API_ENDPOINT, stream, fileName, "file", arguments);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/ImageUploaders/TinyPicUploader.cs
View file

@ -99,7 +99,7 @@ public override UploadResult Upload(Stream stream, string fileName)
arguments.Add("type", "image");
arguments.Add("tags", "");
result = UploadData(URLAPI, stream, fileName, "uploadfile", arguments);
result = SendRequestFile(URLAPI, stream, fileName, "uploadfile", arguments);
if (result.IsSuccess && CheckResponse(result.Response))
{

2
ShareX.UploadersLib/ImageUploaders/TwitPicUploader.cs
View file

@ -100,7 +100,7 @@ private UploadResult Upload(Stream stream, string fileName, string url, string m
args.Add("oauth_secret", AuthInfo.UserSecret);
args.Add("message", msg);
UploadResult result = UploadData(url, stream, fileName, "media", args);
UploadResult result = SendRequestFile(url, stream, fileName, "media", args);
TwitPicResponse response = JsonConvert.DeserializeObject<TwitPicResponse>(result.Response);

2
ShareX.UploadersLib/ImageUploaders/TwitSnapsUploader.cs
View file

@ -67,7 +67,7 @@ private UploadResult Upload(Stream stream, string fileName, string msg)
args.Add("message", msg);
}
UploadResult result = UploadData(APIURL, stream, fileName, "media", args);
UploadResult result = SendRequestFile(APIURL, stream, fileName, "media", args);
return ParseResult(result);
}

2
ShareX.UploadersLib/ImageUploaders/Twitter.cs
View file

@ -146,7 +146,7 @@ public UploadResult TweetMessageWithMedia(string message, Stream stream, string
Dictionary<string, string> args = new Dictionary<string, string>();
args.Add("status", message);
UploadResult result = UploadData(query, stream, fileName, "media[]", args);
UploadResult result = SendRequestFile(query, stream, fileName, "media[]", args);
if (!string.IsNullOrEmpty(result.Response))
{

2
ShareX.UploadersLib/ImageUploaders/UploadScreenshot.cs
View file

@ -46,7 +46,7 @@ public override UploadResult Upload(Stream stream, string fileName)
arguments.Add("xmlOutput", "1");
//arguments.Add("testMode", "1");
UploadResult result = UploadData("http://img1.uploadscreenshot.com/api-upload.php", stream, fileName, "userfile", arguments);
UploadResult result = SendRequestFile("http://img1.uploadscreenshot.com/api-upload.php", stream, fileName, "userfile", arguments);
return ParseResult(result);
}

2
ShareX.UploadersLib/ImageUploaders/VgymeUploader.cs
View file

@ -60,7 +60,7 @@ public override UploadResult Upload(Stream stream, string fileName)
Dictionary<string, string> args = new Dictionary<string, string>();
if (!string.IsNullOrEmpty(UserKey)) args.Add("userkey", UserKey);
UploadResult result = UploadData("https://vgy.me/upload", stream, fileName, "file", args);
UploadResult result = SendRequestFile("https://vgy.me/upload", stream, fileName, "file", args);
if (result.IsSuccess)
{

2
ShareX.UploadersLib/ImageUploaders/YfrogUploader.cs
View file

@ -119,7 +119,7 @@ private UploadResult Upload(Stream stream, string fileName, string msg)
arguments.Add("key", Options.DeveloperKey);
UploadResult result = UploadData(url, stream, fileName, "media", arguments);
UploadResult result = SendRequestFile(url, stream, fileName, "media", arguments);
return ParseResult(result);
}

2
ShareX.UploadersLib/OtherServices/OCRSpace.cs
View file

@ -100,7 +100,7 @@ public OCRSpaceResponse DoOCR(Stream stream, string fileName)
arguments.Add("language", Language.ToString());
arguments.Add("isOverlayRequired", Overlay.ToString());
UploadResult ur = UploadData(APIURLUSA, stream, fileName, "file", arguments);
UploadResult ur = SendRequestFile(APIURLUSA, stream, fileName, "file", arguments);
if (ur.IsSuccess)
{

2
ShareX.UploadersLib/TextUploaders/CustomTextUploader.cs
View file

@ -101,7 +101,7 @@ public override UploadResult UploadText(string text, string fileName)
byte[] byteArray = Encoding.UTF8.GetBytes(text);
using (MemoryStream stream = new MemoryStream(byteArray))
{
result = UploadData(requestURL, stream, fileName, customUploader.GetFileFormName(), args, customUploader.GetHeaders(), responseType: customUploader.ResponseType);
result = SendRequestFile(requestURL, stream, fileName, customUploader.GetFileFormName(), args, customUploader.GetHeaders(), responseType: customUploader.ResponseType);
}
}
}