mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-02 18:26:27 +13:00
Make fileFormName not optional
This commit is contained in:
parent
d29dbdc8b1
commit
d990b9ed73
10 changed files with 11 additions and 10 deletions
|
@ -194,7 +194,7 @@ protected string SendRequestMultiPart(string url, Dictionary<string, string> arg
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected UploadResult SendRequestFile(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, Dictionary<string, string> args = null,
|
||||||
NameValueCollection headers = null, CookieCollection cookies = null, ResponseType responseType = ResponseType.Text, HttpMethod method = HttpMethod.POST,
|
NameValueCollection headers = null, CookieCollection cookies = null, ResponseType responseType = ResponseType.Text, HttpMethod method = HttpMethod.POST,
|
||||||
string contentType = UploadHelpers.ContentTypeMultipartFormData, string metadata = null)
|
string contentType = UploadHelpers.ContentTypeMultipartFormData, string metadata = null)
|
||||||
{
|
{
|
||||||
|
|
|
@ -52,7 +52,7 @@ public override UploadResult Upload(Stream stream, string fileName)
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(url))
|
if (!string.IsNullOrEmpty(url))
|
||||||
{
|
{
|
||||||
result = SendRequestFile(url, stream, fileName);
|
result = SendRequestFile(url, stream, fileName, "file");
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(result.Response))
|
if (!string.IsNullOrEmpty(result.Response))
|
||||||
{
|
{
|
||||||
|
|
|
@ -120,7 +120,7 @@ public override UploadResult Upload(Stream stream, string fileName)
|
||||||
|
|
||||||
if (file != null)
|
if (file != null)
|
||||||
{
|
{
|
||||||
result = SendRequestFile(file.Upload.PostURL, stream, fileName);
|
result = SendRequestFile(file.Upload.PostURL, stream, fileName, "file");
|
||||||
|
|
||||||
if (result.IsSuccess)
|
if (result.IsSuccess)
|
||||||
{
|
{
|
||||||
|
|
|
@ -132,7 +132,7 @@ public override UploadResult Upload(Stream stream, string fileName)
|
||||||
|
|
||||||
string metadatajson = JsonConvert.SerializeObject(metadata);
|
string metadatajson = JsonConvert.SerializeObject(metadata);
|
||||||
|
|
||||||
UploadResult result = SendRequestFile($"https://www.googleapis.com/upload/storage/v1/b/{Bucket}/o?uploadType=multipart", stream, fileName,
|
UploadResult result = SendRequestFile($"https://www.googleapis.com/upload/storage/v1/b/{Bucket}/o?uploadType=multipart", stream, fileName, "file",
|
||||||
headers: googleAuth.GetAuthHeaders(), contentType: "multipart/related", metadata: metadatajson);
|
headers: googleAuth.GetAuthHeaders(), contentType: "multipart/related", metadata: metadatajson);
|
||||||
|
|
||||||
GoogleCloudStorageResponse upload = JsonConvert.DeserializeObject<GoogleCloudStorageResponse>(result.Response);
|
GoogleCloudStorageResponse upload = JsonConvert.DeserializeObject<GoogleCloudStorageResponse>(result.Response);
|
||||||
|
|
|
@ -201,7 +201,7 @@ public override UploadResult Upload(Stream stream, string fileName)
|
||||||
string metadata = GetMetadata(fileName, FolderID);
|
string metadata = GetMetadata(fileName, FolderID);
|
||||||
|
|
||||||
UploadResult result = SendRequestFile("https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart&fields=id,webViewLink,webContentLink", stream, fileName,
|
UploadResult result = SendRequestFile("https://www.googleapis.com/upload/drive/v3/files?uploadType=multipart&fields=id,webViewLink,webContentLink", stream, fileName,
|
||||||
headers: GoogleAuth.GetAuthHeaders(), contentType: "multipart/related", metadata: metadata);
|
"file", headers: GoogleAuth.GetAuthHeaders(), contentType: "multipart/related", metadata: metadata);
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(result.Response))
|
if (!string.IsNullOrEmpty(result.Response))
|
||||||
{
|
{
|
||||||
|
|
|
@ -73,7 +73,7 @@ public override UploadResult Upload(Stream stream, string fileName)
|
||||||
if (!string.IsNullOrEmpty(Email) && !string.IsNullOrEmpty(Password))
|
if (!string.IsNullOrEmpty(Email) && !string.IsNullOrEmpty(Password))
|
||||||
{
|
{
|
||||||
NameValueCollection headers = UploadHelpers.CreateAuthenticationHeader(Email, Password);
|
NameValueCollection headers = UploadHelpers.CreateAuthenticationHeader(Email, Password);
|
||||||
result = SendRequestFile("https://api.hostr.co/file", stream, fileName, headers: headers);
|
result = SendRequestFile("https://api.hostr.co/file", stream, fileName, "file", headers: headers);
|
||||||
|
|
||||||
if (result.IsSuccess)
|
if (result.IsSuccess)
|
||||||
{
|
{
|
||||||
|
|
|
@ -233,7 +233,7 @@ public override UploadResult Upload(Stream stream, string fileName)
|
||||||
NameValueCollection headers = new NameValueCollection();
|
NameValueCollection headers = new NameValueCollection();
|
||||||
headers.Set("X-Atlassian-Token", "nocheck");
|
headers.Set("X-Atlassian-Token", "nocheck");
|
||||||
|
|
||||||
UploadResult res = SendRequestFile(query, stream, fileName, headers: headers);
|
UploadResult res = SendRequestFile(query, stream, fileName, "file", headers: headers);
|
||||||
if (res.Response.Contains("errorMessages"))
|
if (res.Response.Contains("errorMessages"))
|
||||||
{
|
{
|
||||||
Errors.Add(res.Response);
|
Errors.Add(res.Response);
|
||||||
|
|
|
@ -85,7 +85,8 @@ public override UploadResult Upload(Stream stream, string fileName)
|
||||||
headers = UploadHelpers.CreateAuthenticationHeader(Email, Password);
|
headers = UploadHelpers.CreateAuthenticationHeader(Email, Password);
|
||||||
}
|
}
|
||||||
|
|
||||||
UploadResult result = SendRequestFile(URLHelpers.CombineURL(Host, "upload"), stream, fileName, headers: headers);
|
string url = URLHelpers.CombineURL(Host, "upload");
|
||||||
|
UploadResult result = SendRequestFile(url, stream, fileName, "file", headers: headers);
|
||||||
|
|
||||||
TranscodeFile(result);
|
TranscodeFile(result);
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@ public sealed class Transfersh : FileUploader
|
||||||
{
|
{
|
||||||
public override UploadResult Upload(Stream stream, string fileName)
|
public override UploadResult Upload(Stream stream, string fileName)
|
||||||
{
|
{
|
||||||
UploadResult result = SendRequestFile("https://transfer.sh", stream, fileName);
|
UploadResult result = SendRequestFile("https://transfer.sh", stream, fileName, "file");
|
||||||
|
|
||||||
if (result.IsSuccess)
|
if (result.IsSuccess)
|
||||||
{
|
{
|
||||||
|
|
|
@ -113,7 +113,7 @@ public override UploadResult Upload(Stream stream, string fileName)
|
||||||
|
|
||||||
string metadata = GetMetadata(fileName);
|
string metadata = GetMetadata(fileName);
|
||||||
|
|
||||||
UploadResult result = SendRequestFile("https://www.googleapis.com/upload/youtube/v3/videos?part=id,snippet,status", stream, fileName,
|
UploadResult result = SendRequestFile("https://www.googleapis.com/upload/youtube/v3/videos?part=id,snippet,status", stream, fileName, "file",
|
||||||
headers: googleAuth.GetAuthHeaders(), metadata: metadata);
|
headers: googleAuth.GetAuthHeaders(), metadata: metadata);
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(result.Response))
|
if (!string.IsNullOrEmpty(result.Response))
|
||||||
|
|
Loading…
Reference in a new issue