From ea6f8e3e9282204568ef87d8de80f2cb35b5377a Mon Sep 17 00:00:00 2001 From: CookieMichal Date: Tue, 30 Oct 2018 13:15:15 +0100 Subject: [PATCH 1/3] Method should be considered private --- ShareX/UploadManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShareX/UploadManager.cs b/ShareX/UploadManager.cs index dabcce7bc..dfdcb550e 100644 --- a/ShareX/UploadManager.cs +++ b/ShareX/UploadManager.cs @@ -211,7 +211,7 @@ public static void ClipboardUpload(TaskSettings taskSettings = null) } } - public static void ClipboardUploadCached(ClipboardContentViewer ccv, TaskSettings taskSettings = null) + private static void ClipboardUploadCached(ClipboardContentViewer ccv, TaskSettings taskSettings = null) { if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings(); From d92be875071dc58bdb95502883a7c52ff8ab55a1 Mon Sep 17 00:00:00 2001 From: CookieMichal Date: Tue, 30 Oct 2018 17:23:22 +0100 Subject: [PATCH 2/3] Made code less complex and removed duplicates --- ShareX/UploadManager.cs | 207 +++++++++++++++++----------------------- 1 file changed, 85 insertions(+), 122 deletions(-) diff --git a/ShareX/UploadManager.cs b/ShareX/UploadManager.cs index dfdcb550e..a1c1d0dc8 100644 --- a/ShareX/UploadManager.cs +++ b/ShareX/UploadManager.cs @@ -143,6 +143,64 @@ public static void UploadFolder(TaskSettings taskSettings = null) } } + private static void ProcessImageUpload(Image img, TaskSettings taskSettings) + { + if (img != null) + { + if (!taskSettings.AdvancedSettings.ProcessImagesDuringClipboardUpload) + { + taskSettings.AfterCaptureJob = AfterCaptureTasks.UploadImageToHost; + } + + RunImageTask(img, taskSettings); + } + } + private static void ProcessTextUpload(string text, TaskSettings taskSettings) + { + if (!string.IsNullOrEmpty(text)) + { + string url = text.Trim(); + + if (URLHelpers.IsValidURL(url)) + { + if (taskSettings.UploadSettings.ClipboardUploadURLContents) + { + DownloadAndUploadFile(url, taskSettings); + return; + } + + if (taskSettings.UploadSettings.ClipboardUploadShortenURL) + { + ShortenURL(url, taskSettings); + return; + } + + if (taskSettings.UploadSettings.ClipboardUploadShareURL) + { + ShareURL(url, taskSettings); + return; + } + } + + if (taskSettings.UploadSettings.ClipboardUploadAutoIndexFolder && text.Length <= 260 && Directory.Exists(text)) + { + IndexFolder(text, taskSettings); + } + else + { + UploadText(text, taskSettings, true); + } + } + } + + private static void ProcessFilesUpload(string[] files, TaskSettings taskSettings) + { + if (files.Length > 0) + { + UploadFile(files, taskSettings); + } + } + public static void ClipboardUpload(TaskSettings taskSettings = null) { if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings(); @@ -151,63 +209,19 @@ public static void ClipboardUpload(TaskSettings taskSettings = null) { Image img = ClipboardHelpers.GetImage(); - if (img != null) - { - if (!taskSettings.AdvancedSettings.ProcessImagesDuringClipboardUpload) - { - taskSettings.AfterCaptureJob = AfterCaptureTasks.UploadImageToHost; - } - - RunImageTask(img, taskSettings); - } + ProcessImageUpload(img, taskSettings); } else if (Clipboard.ContainsText()) { string text = Clipboard.GetText(); - if (!string.IsNullOrEmpty(text)) - { - string url = text.Trim(); - - if (URLHelpers.IsValidURL(url)) - { - if (taskSettings.UploadSettings.ClipboardUploadURLContents) - { - DownloadAndUploadFile(url, taskSettings); - return; - } - - if (taskSettings.UploadSettings.ClipboardUploadShortenURL) - { - ShortenURL(url, taskSettings); - return; - } - - if (taskSettings.UploadSettings.ClipboardUploadShareURL) - { - ShareURL(url, taskSettings); - return; - } - } - - if (taskSettings.UploadSettings.ClipboardUploadAutoIndexFolder && text.Length <= 260 && Directory.Exists(text)) - { - IndexFolder(text, taskSettings); - } - else - { - UploadText(text, taskSettings, true); - } - } + ProcessTextUpload(text, taskSettings); } else if (Clipboard.ContainsFileDropList()) { string[] files = Clipboard.GetFileDropList().OfType().ToArray(); - if (files.Length > 0) - { - UploadFile(files, taskSettings); - } + ProcessFilesUpload(files, taskSettings); } } @@ -219,63 +233,40 @@ private static void ClipboardUploadCached(ClipboardContentViewer ccv, TaskSettin { Image img = (Image)ccv.ClipboardContent; - if (img != null) - { - if (!taskSettings.AdvancedSettings.ProcessImagesDuringClipboardUpload) - { - taskSettings.AfterCaptureJob = AfterCaptureTasks.UploadImageToHost; - } - - RunImageTask(img, taskSettings); - } + ProcessImageUpload(img, taskSettings); } else if (ccv.ClipboardContentType == EClipboardContentType.Text) { string text = (string)ccv.ClipboardContent; - if (!string.IsNullOrEmpty(text)) - { - string url = text.Trim(); - - if (URLHelpers.IsValidURL(url)) - { - if (taskSettings.UploadSettings.ClipboardUploadURLContents) - { - DownloadAndUploadFile(url, taskSettings); - return; - } - - if (taskSettings.UploadSettings.ClipboardUploadShortenURL) - { - ShortenURL(url, taskSettings); - return; - } - - if (taskSettings.UploadSettings.ClipboardUploadShareURL) - { - ShareURL(url, taskSettings); - return; - } - } - - if (taskSettings.UploadSettings.ClipboardUploadAutoIndexFolder && text.Length <= 260 && Directory.Exists(text)) - { - IndexFolder(text, taskSettings); - } - else - { - UploadText(text, taskSettings, true); - } - } + ProcessTextUpload(text, taskSettings); } else if (ccv.ClipboardContentType == EClipboardContentType.Files) { string[] files = (string[])ccv.ClipboardContent; - if (files.Length > 0) + ProcessFilesUpload(files, taskSettings); + } + } + + private static void ProcessClipboardContentViewerDialog(ClipboardContentViewer ccv, TaskSettings taskSettings = null) + { + if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings(); + + if (ccv.ShowDialog() == DialogResult.OK && ccv.IsClipboardContentValid) + { + if (ccv.ClipboardContentType != EClipboardContentType.Default) { - UploadFile(files, taskSettings); + ClipboardUploadCached(ccv, taskSettings); } + else + { + ClipboardUpload(taskSettings); + } + } + else if (ccv.ClipboardContentType == EClipboardContentType.Image) + { + ((Image)ccv.ClipboardContent).Dispose(); } } @@ -285,21 +276,7 @@ public static void ClipboardUploadWithContentViewer(TaskSettings taskSettings = using (ClipboardContentViewer ccv = new ClipboardContentViewer()) { - if (ccv.ShowDialog() == DialogResult.OK && ccv.IsClipboardContentValid) - { - if (ccv.ClipboardContentType != EClipboardContentType.Default) - { - ClipboardUploadCached(ccv, taskSettings); - } - else - { - ClipboardUpload(taskSettings); - } - } - else if (ccv.ClipboardContentType == EClipboardContentType.Image) - { - ((Image)ccv.ClipboardContent).Dispose(); - } + ProcessClipboardContentViewerDialog(ccv, taskSettings); } } @@ -311,21 +288,7 @@ public static void ClipboardUploadMainWindow(TaskSettings taskSettings = null) { using (ClipboardContentViewer ccv = new ClipboardContentViewer(true)) { - if (ccv.ShowDialog() == DialogResult.OK && ccv.IsClipboardContentValid) - { - if (ccv.ClipboardContentType != EClipboardContentType.Default) - { - ClipboardUploadCached(ccv, taskSettings); - } - else - { - ClipboardUpload(taskSettings); - } - } - else if (ccv.ClipboardContentType == EClipboardContentType.Image) - { - ((Image)ccv.ClipboardContent).Dispose(); - } + ProcessClipboardContentViewerDialog(ccv, taskSettings); Program.Settings.ShowClipboardContentViewer = !ccv.DontShowThisWindow; } From 1e27c14d16b471f3fac942c37e75bbd9261d2d37 Mon Sep 17 00:00:00 2001 From: Jaex Date: Tue, 30 Oct 2018 20:14:46 +0300 Subject: [PATCH 3/3] Update UploadManager.cs --- ShareX/UploadManager.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ShareX/UploadManager.cs b/ShareX/UploadManager.cs index a1c1d0dc8..3ade85f25 100644 --- a/ShareX/UploadManager.cs +++ b/ShareX/UploadManager.cs @@ -155,6 +155,7 @@ private static void ProcessImageUpload(Image img, TaskSettings taskSettings) RunImageTask(img, taskSettings); } } + private static void ProcessTextUpload(string text, TaskSettings taskSettings) { if (!string.IsNullOrEmpty(text)) @@ -604,4 +605,4 @@ public static void IndexFolder(string folderPath, TaskSettings taskSettings = nu } } } -} \ No newline at end of file +}