mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-01 09:47:22 +13:00
Reflect S3 remove extension setting change in URL preview
This commit is contained in:
parent
9bb8e960bd
commit
ffe1234d2e
2 changed files with 11 additions and 7 deletions
|
@ -132,13 +132,6 @@ public override UploadResult Upload(Stream stream, string fileName)
|
||||||
hashedPayload = "UNSIGNED-PAYLOAD";
|
hashedPayload = "UNSIGNED-PAYLOAD";
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((Settings.RemoveExtensionImage && Helpers.IsImageFile(fileName)) ||
|
|
||||||
(Settings.RemoveExtensionText && Helpers.IsTextFile(fileName)) ||
|
|
||||||
(Settings.RemoveExtensionVideo && Helpers.IsVideoFile(fileName)))
|
|
||||||
{
|
|
||||||
fileName = Path.GetFileNameWithoutExtension(fileName);
|
|
||||||
}
|
|
||||||
|
|
||||||
string uploadPath = GetUploadPath(fileName);
|
string uploadPath = GetUploadPath(fileName);
|
||||||
|
|
||||||
NameValueCollection headers = new NameValueCollection
|
NameValueCollection headers = new NameValueCollection
|
||||||
|
@ -259,6 +252,14 @@ private string GetRegion()
|
||||||
private string GetUploadPath(string fileName)
|
private string GetUploadPath(string fileName)
|
||||||
{
|
{
|
||||||
string path = NameParser.Parse(NameParserType.FolderPath, Settings.ObjectPrefix.Trim('/'));
|
string path = NameParser.Parse(NameParserType.FolderPath, Settings.ObjectPrefix.Trim('/'));
|
||||||
|
|
||||||
|
if ((Settings.RemoveExtensionImage && Helpers.IsImageFile(fileName)) ||
|
||||||
|
(Settings.RemoveExtensionText && Helpers.IsTextFile(fileName)) ||
|
||||||
|
(Settings.RemoveExtensionVideo && Helpers.IsVideoFile(fileName)))
|
||||||
|
{
|
||||||
|
fileName = Path.GetFileNameWithoutExtension(fileName);
|
||||||
|
}
|
||||||
|
|
||||||
return URLHelpers.CombineURL(path, fileName);
|
return URLHelpers.CombineURL(path, fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2298,16 +2298,19 @@ private void cbAmazonS3SignedPayload_CheckedChanged(object sender, EventArgs e)
|
||||||
private void cbAmazonS3StripExtensionImage_CheckedChanged(object sender, EventArgs e)
|
private void cbAmazonS3StripExtensionImage_CheckedChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
Config.AmazonS3Settings.RemoveExtensionImage = cbAmazonS3StripExtensionImage.Checked;
|
Config.AmazonS3Settings.RemoveExtensionImage = cbAmazonS3StripExtensionImage.Checked;
|
||||||
|
UpdateAmazonS3Status();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void cbAmazonS3StripExtensionVideo_CheckedChanged(object sender, EventArgs e)
|
private void cbAmazonS3StripExtensionVideo_CheckedChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
Config.AmazonS3Settings.RemoveExtensionVideo = cbAmazonS3StripExtensionVideo.Checked;
|
Config.AmazonS3Settings.RemoveExtensionVideo = cbAmazonS3StripExtensionVideo.Checked;
|
||||||
|
UpdateAmazonS3Status();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void cbAmazonS3StripExtensionText_CheckedChanged(object sender, EventArgs e)
|
private void cbAmazonS3StripExtensionText_CheckedChanged(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
Config.AmazonS3Settings.RemoveExtensionText = cbAmazonS3StripExtensionText.Checked;
|
Config.AmazonS3Settings.RemoveExtensionText = cbAmazonS3StripExtensionText.Checked;
|
||||||
|
UpdateAmazonS3Status();
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion Amazon S3
|
#endregion Amazon S3
|
||||||
|
|
Loading…
Reference in a new issue