mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-06 05:05:42 +13:00
Check required settings in GenerateURL
This commit is contained in:
parent
058872b87a
commit
cdb14ced8c
1 changed files with 10 additions and 5 deletions
|
@ -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)
|
||||||
|
@ -178,9 +178,14 @@ private string GetUploadPath(string fileName)
|
||||||
|
|
||||||
public string GenerateURL(string fileName)
|
public string GenerateURL(string fileName)
|
||||||
{
|
{
|
||||||
string uploadPath = GetUploadPath(fileName);
|
if (!string.IsNullOrEmpty(Settings.RegionHostname) && !string.IsNullOrEmpty(Settings.Bucket))
|
||||||
string url = URLHelpers.CombineURL(Settings.RegionHostname, Settings.Bucket, uploadPath);
|
{
|
||||||
return URLHelpers.ForcePrefix(url, "https://");
|
string uploadPath = GetUploadPath(fileName);
|
||||||
|
string url = URLHelpers.CombineURL(Settings.RegionHostname, Settings.Bucket, uploadPath);
|
||||||
|
return URLHelpers.ForcePrefix(url, "https://");
|
||||||
|
}
|
||||||
|
|
||||||
|
return "";
|
||||||
}
|
}
|
||||||
|
|
||||||
private string CreateCanonicalHeaders(NameValueCollection headers)
|
private string CreateCanonicalHeaders(NameValueCollection headers)
|
||||||
|
|
Loading…
Reference in a new issue