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

Added URLEncodeIgnoreEmoji option to application settings advanced tab, it is currently supported in S3, GCS and FTP/FTPS/SFTP

Browse source
This commit is contained in:
Jaex 2019-11-03 08:30:07 +03:00
parent f20fdd8002
commit 9aef43c6e4
7 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ShareX.HelpersLib/Helpers/URLHelpers.cs
View file

@ -82,8 +82,13 @@ public static void OpenURL(string url)
}
}
public static string URLEncode(string text, bool isPath = false)
public static string URLEncode(string text, bool isPath = false, bool ignoreEmoji = false)
{
if (ignoreEmoji)
{
return URLEncodeIgnoreEmoji(text, isPath);
}
StringBuilder sb = new StringBuilder();
if (!string.IsNullOrEmpty(text))

1
ShareX.HelpersLib/HelpersOptions.cs
View file

@ -39,5 +39,6 @@ public static class HelpersOptions
public static string BrowserPath { get; set; } = "";
public static List<Color> RecentColors { get; set; } = new List<Color>();
public static string LastSaveDirectory { get; set; } = "";
public static bool URLEncodeIgnoreEmoji { get; set; } = false;
}
}

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

@ -263,7 +263,7 @@ public string GenerateURL(string uploadPath)
{
if (!string.IsNullOrEmpty(Settings.Endpoint) && !string.IsNullOrEmpty(Settings.Bucket))
{
uploadPath = URLHelpers.URLEncodeIgnoreEmoji(uploadPath, true);
uploadPath = URLHelpers.URLEncode(uploadPath, true, HelpersOptions.URLEncodeIgnoreEmoji);
string url;

2
ShareX.UploadersLib/FileUploaders/FTPAccount.cs
View file

@ -178,7 +178,7 @@ public string GetUriPath(string filename, string subFolderPath = null)
filename = Path.GetFileNameWithoutExtension(filename);
}
filename = URLHelpers.URLEncode(filename);
filename = URLHelpers.URLEncode(filename, false, HelpersOptions.URLEncodeIgnoreEmoji);
if (subFolderPath == null)
{

2
ShareX.UploadersLib/FileUploaders/GoogleCloudStorage.cs
View file

@ -164,7 +164,7 @@ public string GenerateURL(string uploadPath)
Domain = URLHelpers.CombineURL("storage.googleapis.com", Bucket);
}
uploadPath = URLHelpers.URLEncode(uploadPath, true);
uploadPath = URLHelpers.URLEncode(uploadPath, true, HelpersOptions.URLEncodeIgnoreEmoji);
string url = URLHelpers.CombineURL(Domain, uploadPath);

3
ShareX/ApplicationConfig.cs
View file

@ -223,6 +223,9 @@ public int HotkeyRepeatLimit
[Category("Upload"), DefaultValue(false), Description("Accept invalid SSL certificates when uploading.")]
public bool AcceptInvalidSSLCertificates { get; set; }
[Category("Upload"), DefaultValue(true), Description("Ignore emojis while URL encoding upload results.")]
public bool URLEncodeIgnoreEmoji { get; set; }
[Category("Upload"), DefaultValue(true), Description("Show first time upload warning.")]
public bool ShowUploadWarning { get; set; }

1
ShareX/Forms/MainForm.cs
View file

@ -930,6 +930,7 @@ private void AfterApplicationSettingsJobs()
HelpersOptions.CurrentProxy = Program.Settings.ProxySettings;
HelpersOptions.AcceptInvalidSSLCertificates = Program.Settings.AcceptInvalidSSLCertificates;
HelpersOptions.URLEncodeIgnoreEmoji = Program.Settings.URLEncodeIgnoreEmoji;
HelpersOptions.DefaultCopyImageFillBackground = Program.Settings.DefaultClipboardCopyImageFillBackground;
HelpersOptions.RotateImageByExifOrientationData = Program.Settings.RotateImageByExifOrientationData;
HelpersOptions.BrowserPath = Program.Settings.BrowserPath;