From ffe1234d2e38a3795d46c7878dbd841c2af5c028 Mon Sep 17 00:00:00 2001 From: Jaex Date: Sun, 27 Jan 2019 21:36:16 +0300 Subject: [PATCH] Reflect S3 remove extension setting change in URL preview --- ShareX.UploadersLib/FileUploaders/AmazonS3.cs | 15 ++++++++------- ShareX.UploadersLib/Forms/UploadersConfigForm.cs | 3 +++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ShareX.UploadersLib/FileUploaders/AmazonS3.cs b/ShareX.UploadersLib/FileUploaders/AmazonS3.cs index e06930f9c..5ac18cbc5 100644 --- a/ShareX.UploadersLib/FileUploaders/AmazonS3.cs +++ b/ShareX.UploadersLib/FileUploaders/AmazonS3.cs @@ -132,13 +132,6 @@ public override UploadResult Upload(Stream stream, string fileName) 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); NameValueCollection headers = new NameValueCollection @@ -259,6 +252,14 @@ private string GetRegion() private string GetUploadPath(string fileName) { 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); } diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index f54107ddd..22db40e5b 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -2298,16 +2298,19 @@ private void cbAmazonS3SignedPayload_CheckedChanged(object sender, EventArgs e) private void cbAmazonS3StripExtensionImage_CheckedChanged(object sender, EventArgs e) { Config.AmazonS3Settings.RemoveExtensionImage = cbAmazonS3StripExtensionImage.Checked; + UpdateAmazonS3Status(); } private void cbAmazonS3StripExtensionVideo_CheckedChanged(object sender, EventArgs e) { Config.AmazonS3Settings.RemoveExtensionVideo = cbAmazonS3StripExtensionVideo.Checked; + UpdateAmazonS3Status(); } private void cbAmazonS3StripExtensionText_CheckedChanged(object sender, EventArgs e) { Config.AmazonS3Settings.RemoveExtensionText = cbAmazonS3StripExtensionText.Checked; + UpdateAmazonS3Status(); } #endregion Amazon S3