From 9b5f28e3662c0002c3a8ec86b9060df8a3e2971d Mon Sep 17 00:00:00 2001 From: Jaex Date: Tue, 2 Jan 2018 10:38:28 +0300 Subject: [PATCH] Set default filename for custom uploader export --- ShareX.HelpersLib/Controls/ExportImportControl.cs | 4 +++- ShareX.UploadersLib/Forms/UploadersConfigForm.cs | 2 ++ ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs | 2 +- ShareX.UploadersLib/Helpers/CustomUploaderItem.cs | 8 +++++++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ShareX.HelpersLib/Controls/ExportImportControl.cs b/ShareX.HelpersLib/Controls/ExportImportControl.cs index e5ececd6d..b4c2abb7a 100644 --- a/ShareX.HelpersLib/Controls/ExportImportControl.cs +++ b/ShareX.HelpersLib/Controls/ExportImportControl.cs @@ -58,6 +58,8 @@ public partial class ExportImportControl : UserControl [DefaultValue("")] public string CustomFilter { get; set; } = ""; + public string DefaultFileName { get; set; } + public ExportImportControl() { InitializeComponent(); @@ -130,7 +132,7 @@ private void tsmiExportFile_Click(object sender, EventArgs e) filter = CustomFilter + "|" + filter; } - using (SaveFileDialog sfd = new SaveFileDialog() { Filter = filter }) + using (SaveFileDialog sfd = new SaveFileDialog() { Filter = filter, FileName = DefaultFileName }) { if (sfd.ShowDialog() == DialogResult.OK) { diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index 0c62d7ae6..d2f49fe87 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -3260,6 +3260,8 @@ private object eiCustomUploaders_ExportRequested() MessageBoxButtons.OK, MessageBoxIcon.Error); return null; } + + eiCustomUploaders.DefaultFileName = uploader.GetFileName(); } return uploader; diff --git a/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs b/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs index d3ff2bcf3..a275b7766 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs @@ -1629,7 +1629,7 @@ private void CustomUploaderExportAll() foreach (CustomUploaderItem uploader in Config.CustomUploadersList) { string json = eiCustomUploaders.Serialize(uploader); - string filepath = Path.Combine(fsd.FileName, uploader.ToString() + ".sxcu"); + string filepath = Path.Combine(fsd.FileName, uploader.GetFileName()); File.WriteAllText(filepath, json, Encoding.UTF8); } } diff --git a/ShareX.UploadersLib/Helpers/CustomUploaderItem.cs b/ShareX.UploadersLib/Helpers/CustomUploaderItem.cs index e72a8c607..8c3a36834 100644 --- a/ShareX.UploadersLib/Helpers/CustomUploaderItem.cs +++ b/ShareX.UploadersLib/Helpers/CustomUploaderItem.cs @@ -111,6 +111,11 @@ public override string ToString() return "Name"; } + public string GetFileName() + { + return ToString() + ".sxcu"; + } + public HttpMethod GetHttpMethod() { switch (RequestType) @@ -271,9 +276,10 @@ public string ParseURL(string url, bool output) } } } + escape = false; } - else if(url[i] == '\\' && !escape) + else if (url[i] == '\\' && !escape) { escape = true; }