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

Fix variable convention

Browse source
This commit is contained in:
Matthew Burnett 2018-04-21 16:11:31 -04:00
parent 942f6337c8
commit 0c14f09b64
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ShareX.UploadersLib/FileUploaders/GoogleCloudStorage.cs
View file

@ -50,9 +50,9 @@ public override GenericUploader CreateUploader(UploadersConfig config, TaskRefer
{
return new GoogleCloudStorage(config.GoogleCloudStorageOAuth2Info)
{
bucket = config.GoogleCloudStorageBucket,
domain = config.GoogleCloudStorageDomain,
prefix = config.GoogleCloudStorageObjectPrefix
Bucket = config.GoogleCloudStorageBucket,
Domain = config.GoogleCloudStorageDomain,
Prefix = config.GoogleCloudStorageObjectPrefix
};
}
@ -61,6 +61,10 @@ public override GenericUploader CreateUploader(UploadersConfig config, TaskRefer
public sealed class GoogleCloudStorage : FileUploader, IOAuth2
{
public string Bucket { get; set; }
public string Domain { get; set; }
public string Prefix { get; set; }
public OAuth2Info AuthInfo => googleAuth.AuthInfo;
private GoogleOAuth2 googleAuth;
@ -95,7 +99,7 @@ public bool GetAccessToken(string code)
private string GetUploadPath(string fileName)
{
string path = NameParser.Parse(NameParserType.FolderPath, prefix.Trim('/'));
string path = NameParser.Parse(NameParserType.FolderPath, Prefix.Trim('/'));
return URLHelpers.CombineURL(path, fileName);
}
@ -116,19 +120,15 @@ public class Acl
public string role { get; set; }
}
public string bucket { get; set; }
public string domain { get; set; }
public string prefix { get; set; }
public override UploadResult Upload(Stream stream, string fileName)
{
if (!CheckAuthorization()) return null;
string uploadpath = GetUploadPath(fileName);
if (string.IsNullOrEmpty(domain))
if (string.IsNullOrEmpty(Domain))
{
domain = $"storage.googleapis.com/{bucket}";
Domain = $"storage.googleapis.com/{Bucket}";
}
Metadata metadata = new Metadata
@ -146,7 +146,7 @@ public override UploadResult Upload(Stream stream, string fileName)
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,
headers: googleAuth.GetAuthHeaders(), contentType: "multipart/related", metadata: metadatajson);
GoogleCloudStorageResponse upload = JsonConvert.DeserializeObject<GoogleCloudStorageResponse>(result.Response);
@ -156,7 +156,7 @@ public override UploadResult Upload(Stream stream, string fileName)
return null;
}
result.URL = URLHelpers.FixPrefix($"{domain}/{uploadpath}", "https://");
result.URL = URLHelpers.FixPrefix($"{Domain}/{uploadpath}", "https://");
return result;
}