From 884eb04873c98499283a005b3a5783157b9ea4e6 Mon Sep 17 00:00:00 2001 From: Jevan Pipitone Date: Sun, 14 Feb 2016 23:48:35 +1100 Subject: [PATCH] #1298 run changed files through codemaid --- .../Forms/UploadersConfigForm.cs | 18 +++--- .../ImageUploaders/SomeImage.cs | 55 ++++++++++--------- ShareX.UploadersLib/UploadersConfig.cs | 12 ++-- ShareX/WorkerTask.cs | 22 ++++---- 4 files changed, 54 insertions(+), 53 deletions(-) diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index 4950b914e..fc876267c 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -23,6 +23,12 @@ You should have received a copy of the GNU General Public License #endregion License Information (GPL v3) +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text.RegularExpressions; +using System.Windows.Forms; using CG.Web.MegaApiClient; using ShareX.HelpersLib; using ShareX.UploadersLib.FileUploaders; @@ -30,12 +36,6 @@ You should have received a copy of the GNU General Public License using ShareX.UploadersLib.ImageUploaders; using ShareX.UploadersLib.Properties; using ShareX.UploadersLib.TextUploaders; -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Linq; -using System.Text.RegularExpressions; -using System.Windows.Forms; namespace ShareX.UploadersLib { @@ -112,7 +112,7 @@ private void FormSettings() AddIconToTab(tpSeafile, Resources.Seafile); AddIconToTab(tpSendSpace, Resources.SendSpace); AddIconToTab(tpSharedFolder, Resources.server_network); - AddIconToTab(tpSomeImage, Resources.SomeImage); + AddIconToTab(tpSomeImage, Resources.SomeImage); AddIconToTab(tpStreamable, Resources.Streamable); AddIconToTab(tpSul, Resources.Sul); AddIconToTab(tpTinyPic, Resources.TinyPic); @@ -243,7 +243,7 @@ public void LoadSettings() txtCheveretoAPIKey.Text = Config.CheveretoAPIKey; cbCheveretoDirectURL.Checked = Config.CheveretoDirectURL; - // SomeImage + // SomeImage txtSomeImageAPIKey.Text = Config.SomeImageAPIKey; cbSomeImageDirectURL.Checked = Config.SomeImageDirectURL; @@ -1004,7 +1004,7 @@ private void cbCheveretoDirectURL_CheckedChanged(object sender, EventArgs e) #endregion Chevereto - #region SomeImage + #region SomeImage private void txtSomeImageAPIKey_TextChanged(object sender, EventArgs e) { diff --git a/ShareX.UploadersLib/ImageUploaders/SomeImage.cs b/ShareX.UploadersLib/ImageUploaders/SomeImage.cs index 02024cafe..c7d8ffc11 100644 --- a/ShareX.UploadersLib/ImageUploaders/SomeImage.cs +++ b/ShareX.UploadersLib/ImageUploaders/SomeImage.cs @@ -25,10 +25,10 @@ You should have received a copy of the GNU General Public License // Credits: https://github.com/DanielMcAssey -using Newtonsoft.Json; +using System; using System.Collections.Generic; using System.IO; -using System; +using Newtonsoft.Json; namespace ShareX.UploadersLib.ImageUploaders { @@ -61,31 +61,32 @@ public override UploadResult Upload(Stream stream, string fileName) if (jsonResponse != null) { - if (DirectURL) - { - if (jsonResponse.imagelink == null) - { - result.URL = null; - } - else { - Uri responseUri = new Uri(jsonResponse.imagelink); // http://someimage.com/asdf - string host = responseUri.Host; // someimage.com - string filename = Path.GetFileName(responseUri.AbsolutePath); // /asdf - if (filename.StartsWith("/")) - { - filename = filename.Remove(0, 1); // asdf - } - if (host.StartsWith("www.")) - { - host = host.Remove(0, 4); - } - result.URL = "https://i1." + host + "/" + filename + ".jpg"; - } - } else - { - result.URL = jsonResponse.imagelink; + if (DirectURL) + { + if (jsonResponse.imagelink == null) + { + result.URL = null; + } + else { + Uri responseUri = new Uri(jsonResponse.imagelink); // http://someimage.com/asdf + string host = responseUri.Host; // someimage.com + string filename = Path.GetFileName(responseUri.AbsolutePath); // /asdf + if (filename.StartsWith("/")) + { + filename = filename.Remove(0, 1); // asdf + } + if (host.StartsWith("www.")) + { + host = host.Remove(0, 4); + } + result.URL = "https://i1." + host + "/" + filename + ".jpg"; + } + } + else + { + result.URL = jsonResponse.imagelink; + } } - } } } @@ -102,4 +103,4 @@ public class SomeImageResponse public string embedhtml { get; set; } public string embedbb { get; set; } } -} +} \ No newline at end of file diff --git a/ShareX.UploadersLib/UploadersConfig.cs b/ShareX.UploadersLib/UploadersConfig.cs index 3da67581f..fa9248258 100644 --- a/ShareX.UploadersLib/UploadersConfig.cs +++ b/ShareX.UploadersLib/UploadersConfig.cs @@ -23,14 +23,14 @@ You should have received a copy of the GNU General Public License #endregion License Information (GPL v3) +using System; +using System.Collections.Generic; using CG.Web.MegaApiClient; using ShareX.HelpersLib; using ShareX.UploadersLib.FileUploaders; using ShareX.UploadersLib.HelperClasses; using ShareX.UploadersLib.ImageUploaders; using ShareX.UploadersLib.TextUploaders; -using System; -using System.Collections.Generic; namespace ShareX.UploadersLib { @@ -82,9 +82,9 @@ public class UploadersConfig : SettingsBase public string CheveretoAPIKey = string.Empty; public bool CheveretoDirectURL = true; - // SomeImage - - public string SomeImageAPIKey = string.Empty; + // SomeImage + + public string SomeImageAPIKey = string.Empty; public bool SomeImageDirectURL = true; // vgy.me @@ -397,7 +397,7 @@ public bool IsValid(ImageDestination destination) return TwitterOAuthInfoList != null && TwitterOAuthInfoList.IsValidIndex(TwitterSelectedAccount) && OAuthInfo.CheckOAuth(TwitterOAuthInfoList[TwitterSelectedAccount]); case ImageDestination.Chevereto: return !string.IsNullOrEmpty(CheveretoWebsite) && !string.IsNullOrEmpty(CheveretoAPIKey); - case ImageDestination.SomeImage: + case ImageDestination.SomeImage: return !string.IsNullOrEmpty(SomeImageAPIKey); case ImageDestination.CustomImageUploader: return CustomUploadersList != null && CustomUploadersList.IsValidIndex(CustomImageUploaderSelected); diff --git a/ShareX/WorkerTask.cs b/ShareX/WorkerTask.cs index ff8759602..abb4d15f1 100644 --- a/ShareX/WorkerTask.cs +++ b/ShareX/WorkerTask.cs @@ -23,6 +23,14 @@ You should have received a copy of the GNU General Public License #endregion License Information (GPL v3) +using System; +using System.Drawing; +using System.IO; +using System.Linq; +using System.Net; +using System.Text; +using System.Threading; +using System.Windows.Forms; using ShareX.HelpersLib; using ShareX.Properties; using ShareX.UploadersLib; @@ -32,14 +40,6 @@ You should have received a copy of the GNU General Public License using ShareX.UploadersLib.ImageUploaders; using ShareX.UploadersLib.TextUploaders; using ShareX.UploadersLib.URLShorteners; -using System; -using System.Drawing; -using System.IO; -using System.Linq; -using System.Net; -using System.Text; -using System.Threading; -using System.Windows.Forms; namespace ShareX { @@ -827,15 +827,15 @@ public UploadResult UploadImage(Stream stream, string fileName) }; break; case ImageDestination.SomeImage: - String someImageAPIKey = Program.UploadersConfig.SomeImageAPIKey; + String someImageAPIKey = Program.UploadersConfig.SomeImageAPIKey; if (someImageAPIKey == "") { someImageAPIKey = APIKeys.SomeImageKey; } imageUploader = new SomeImage(someImageAPIKey) - { + { DirectURL = Program.UploadersConfig.SomeImageDirectURL - }; + }; break; case ImageDestination.CustomImageUploader: CustomUploaderItem customUploader = GetCustomUploader(Program.UploadersConfig.CustomImageUploaderSelected);