From 82ac01f3feeb0d23474a5c9c9966157a1552f448 Mon Sep 17 00:00:00 2001 From: Jaex Date: Fri, 28 Aug 2015 12:34:54 +0300 Subject: [PATCH] GetFileName fix for DownloadAndUpload --- ShareX.HelpersLib/Helpers/URLHelpers.cs | 10 +++++----- ShareX/UploadTask.cs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ShareX.HelpersLib/Helpers/URLHelpers.cs b/ShareX.HelpersLib/Helpers/URLHelpers.cs index ecd4b54b4..3f158b090 100644 --- a/ShareX.HelpersLib/Helpers/URLHelpers.cs +++ b/ShareX.HelpersLib/Helpers/URLHelpers.cs @@ -251,7 +251,7 @@ public static string AddSlash(string url, SlashType slashType, int count) return url; } - public static string GetFileName(string path, bool checkExtension = false, bool urlDecode = false) + public static string GetFileName(string path, bool urlDecode = false) { if (urlDecode) { @@ -264,14 +264,14 @@ public static string GetFileName(string path, bool checkExtension = false, bool } } - if (path.Contains("/")) + if (path.Contains('/')) { - path = path.Remove(0, path.LastIndexOf('/') + 1); + path = path.Substring(path.LastIndexOf('/') + 1); } - if (checkExtension && !Path.HasExtension(path)) + if (path.Contains('?')) { - return null; + path = path.Remove(path.IndexOf('?')); } return path; diff --git a/ShareX/UploadTask.cs b/ShareX/UploadTask.cs index 52f2f1a33..3d78b269f 100644 --- a/ShareX/UploadTask.cs +++ b/ShareX/UploadTask.cs @@ -1283,7 +1283,7 @@ private bool DownloadAndUpload() { string url = Info.Result.URL.Trim(); Info.Result.URL = string.Empty; - string filename = URLHelpers.GetFileName(url, true, true); + string filename = URLHelpers.GetFileName(url, true); // TODO: Set filename in task creation if (!string.IsNullOrEmpty(filename)) {