mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-06 05:05:42 +13:00
Merge pull request #3697 from CookieMichal/code-factor-opti
Simplified code complexity
This commit is contained in:
commit
efb1c463e5
1 changed files with 88 additions and 124 deletions
|
@ -143,6 +143,65 @@ 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,67 +210,23 @@ 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<string>().ToArray();
|
||||
|
||||
if (files.Length > 0)
|
||||
{
|
||||
UploadFile(files, taskSettings);
|
||||
}
|
||||
ProcessFilesUpload(files, taskSettings);
|
||||
}
|
||||
}
|
||||
|
||||
public static void ClipboardUploadCached(ClipboardContentViewer ccv, TaskSettings taskSettings = null)
|
||||
private static void ClipboardUploadCached(ClipboardContentViewer ccv, TaskSettings taskSettings = null)
|
||||
{
|
||||
if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings();
|
||||
|
||||
|
@ -219,63 +234,40 @@ public static void ClipboardUploadCached(ClipboardContentViewer ccv, TaskSetting
|
|||
{
|
||||
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 +277,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 +289,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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue