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

Check required settings in GenerateURL

Browse source
This commit is contained in:
Jaex 2017-03-17 03:21:45 +03:00
parent 058872b87a
commit cdb14ced8c
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ShareX.UploadersLib/FileUploaders/AmazonS3.cs
View file

@ -47,8 +47,8 @@ public class AmazonS3NewFileUploaderService : FileUploaderService
public override bool CheckConfig(UploadersConfig config) public override bool CheckConfig(UploadersConfig config)
{ {
return config.AmazonS3Settings != null && !string.IsNullOrEmpty(config.AmazonS3Settings.AccessKeyID) && return config.AmazonS3Settings != null && !string.IsNullOrEmpty(config.AmazonS3Settings.AccessKeyID) &&
!string.IsNullOrEmpty(config.AmazonS3Settings.SecretAccessKey) && !string.IsNullOrEmpty(config.AmazonS3Settings.Bucket) && !string.IsNullOrEmpty(config.AmazonS3Settings.SecretAccessKey) && !string.IsNullOrEmpty(config.AmazonS3Settings.RegionHostname) &&
!string.IsNullOrEmpty(config.AmazonS3Settings.RegionHostname) && !string.IsNullOrEmpty(config.AmazonS3Settings.RegionIdentifier); !string.IsNullOrEmpty(config.AmazonS3Settings.RegionIdentifier) && !string.IsNullOrEmpty(config.AmazonS3Settings.Bucket);
} }
public override GenericUploader CreateUploader(UploadersConfig config, TaskReferenceHelper taskInfo) public override GenericUploader CreateUploader(UploadersConfig config, TaskReferenceHelper taskInfo)
@ -177,12 +177,17 @@ private string GetUploadPath(string fileName)
} }
public string GenerateURL(string fileName) public string GenerateURL(string fileName)
{
if (!string.IsNullOrEmpty(Settings.RegionHostname) && !string.IsNullOrEmpty(Settings.Bucket))
{ {
string uploadPath = GetUploadPath(fileName); string uploadPath = GetUploadPath(fileName);
string url = URLHelpers.CombineURL(Settings.RegionHostname, Settings.Bucket, uploadPath); string url = URLHelpers.CombineURL(Settings.RegionHostname, Settings.Bucket, uploadPath);
return URLHelpers.ForcePrefix(url, "https://"); return URLHelpers.ForcePrefix(url, "https://");
} }
return "";
}
private string CreateCanonicalHeaders(NameValueCollection headers) private string CreateCanonicalHeaders(NameValueCollection headers)
{ {
string result = ""; string result = "";