CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 17:56:51 +13:00
Code Issues Projects Releases Packages Wiki Activity

#1298 run changed files through codemaid

Browse source
This commit is contained in:
Jevan Pipitone 2016-02-14 23:48:35 +11:00
parent 271ca6d660
commit 884eb04873
4 changed files with 54 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ShareX.UploadersLib/Forms/UploadersConfigForm.cs
View file

@ -23,6 +23,12 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3) #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 CG.Web.MegaApiClient;
using ShareX.HelpersLib; using ShareX.HelpersLib;
using ShareX.UploadersLib.FileUploaders; 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.ImageUploaders;
using ShareX.UploadersLib.Properties; using ShareX.UploadersLib.Properties;
using ShareX.UploadersLib.TextUploaders; 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 namespace ShareX.UploadersLib
{ {
@ -112,7 +112,7 @@ private void FormSettings()
AddIconToTab(tpSeafile, Resources.Seafile); AddIconToTab(tpSeafile, Resources.Seafile);
AddIconToTab(tpSendSpace, Resources.SendSpace); AddIconToTab(tpSendSpace, Resources.SendSpace);
AddIconToTab(tpSharedFolder, Resources.server_network); AddIconToTab(tpSharedFolder, Resources.server_network);
AddIconToTab(tpSomeImage, Resources.SomeImage); AddIconToTab(tpSomeImage, Resources.SomeImage);
AddIconToTab(tpStreamable, Resources.Streamable); AddIconToTab(tpStreamable, Resources.Streamable);
AddIconToTab(tpSul, Resources.Sul); AddIconToTab(tpSul, Resources.Sul);
AddIconToTab(tpTinyPic, Resources.TinyPic); AddIconToTab(tpTinyPic, Resources.TinyPic);
@ -243,7 +243,7 @@ public void LoadSettings()
txtCheveretoAPIKey.Text = Config.CheveretoAPIKey; txtCheveretoAPIKey.Text = Config.CheveretoAPIKey;
cbCheveretoDirectURL.Checked = Config.CheveretoDirectURL; cbCheveretoDirectURL.Checked = Config.CheveretoDirectURL;
// SomeImage // SomeImage
txtSomeImageAPIKey.Text = Config.SomeImageAPIKey; txtSomeImageAPIKey.Text = Config.SomeImageAPIKey;
cbSomeImageDirectURL.Checked = Config.SomeImageDirectURL; cbSomeImageDirectURL.Checked = Config.SomeImageDirectURL;
@ -1004,7 +1004,7 @@ private void cbCheveretoDirectURL_CheckedChanged(object sender, EventArgs e)
#endregion Chevereto #endregion Chevereto
#region SomeImage #region SomeImage
private void txtSomeImageAPIKey_TextChanged(object sender, EventArgs e) private void txtSomeImageAPIKey_TextChanged(object sender, EventArgs e)
{ {

53
ShareX.UploadersLib/ImageUploaders/SomeImage.cs
View file

@ -25,10 +25,10 @@ You should have received a copy of the GNU General Public License
// Credits: https://github.com/DanielMcAssey // Credits: https://github.com/DanielMcAssey
using Newtonsoft.Json; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System; using Newtonsoft.Json;
namespace ShareX.UploadersLib.ImageUploaders namespace ShareX.UploadersLib.ImageUploaders
{ {
@ -61,31 +61,32 @@ public override UploadResult Upload(Stream stream, string fileName)
if (jsonResponse != null) if (jsonResponse != null)
{ {
if (DirectURL) if (DirectURL)
{ {
if (jsonResponse.imagelink == null) if (jsonResponse.imagelink == null)
{ {
result.URL = null; result.URL = null;
} }
else { else {
Uri responseUri = new Uri(jsonResponse.imagelink); // http://someimage.com/asdf Uri responseUri = new Uri(jsonResponse.imagelink); // http://someimage.com/asdf
string host = responseUri.Host; // someimage.com string host = responseUri.Host; // someimage.com
string filename = Path.GetFileName(responseUri.AbsolutePath); // /asdf string filename = Path.GetFileName(responseUri.AbsolutePath); // /asdf
if (filename.StartsWith("/")) if (filename.StartsWith("/"))
{ {
filename = filename.Remove(0, 1); // asdf filename = filename.Remove(0, 1); // asdf
} }
if (host.StartsWith("www.")) if (host.StartsWith("www."))
{ {
host = host.Remove(0, 4); host = host.Remove(0, 4);
} }
result.URL = "https://i1." + host + "/" + filename + ".jpg"; result.URL = "https://i1." + host + "/" + filename + ".jpg";
} }
} else }
{ else
result.URL = jsonResponse.imagelink; {
result.URL = jsonResponse.imagelink;
}
} }
}
} }
} }

10
ShareX.UploadersLib/UploadersConfig.cs
View file

@ -23,14 +23,14 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3) #endregion License Information (GPL v3)
using System;
using System.Collections.Generic;
using CG.Web.MegaApiClient; using CG.Web.MegaApiClient;
using ShareX.HelpersLib; using ShareX.HelpersLib;
using ShareX.UploadersLib.FileUploaders; using ShareX.UploadersLib.FileUploaders;
using ShareX.UploadersLib.HelperClasses; using ShareX.UploadersLib.HelperClasses;
using ShareX.UploadersLib.ImageUploaders; using ShareX.UploadersLib.ImageUploaders;
using ShareX.UploadersLib.TextUploaders; using ShareX.UploadersLib.TextUploaders;
using System;
using System.Collections.Generic;
namespace ShareX.UploadersLib namespace ShareX.UploadersLib
{ {
@ -82,9 +82,9 @@ public class UploadersConfig : SettingsBase<UploadersConfig>
public string CheveretoAPIKey = string.Empty; public string CheveretoAPIKey = string.Empty;
public bool CheveretoDirectURL = true; public bool CheveretoDirectURL = true;
// SomeImage // SomeImage
public string SomeImageAPIKey = string.Empty; public string SomeImageAPIKey = string.Empty;
public bool SomeImageDirectURL = true; public bool SomeImageDirectURL = true;
// vgy.me // vgy.me
@ -397,7 +397,7 @@ public bool IsValid(ImageDestination destination)
return TwitterOAuthInfoList != null && TwitterOAuthInfoList.IsValidIndex(TwitterSelectedAccount) && OAuthInfo.CheckOAuth(TwitterOAuthInfoList[TwitterSelectedAccount]); return TwitterOAuthInfoList != null && TwitterOAuthInfoList.IsValidIndex(TwitterSelectedAccount) && OAuthInfo.CheckOAuth(TwitterOAuthInfoList[TwitterSelectedAccount]);
case ImageDestination.Chevereto: case ImageDestination.Chevereto:
return !string.IsNullOrEmpty(CheveretoWebsite) && !string.IsNullOrEmpty(CheveretoAPIKey); return !string.IsNullOrEmpty(CheveretoWebsite) && !string.IsNullOrEmpty(CheveretoAPIKey);
case ImageDestination.SomeImage: case ImageDestination.SomeImage:
return !string.IsNullOrEmpty(SomeImageAPIKey); return !string.IsNullOrEmpty(SomeImageAPIKey);
case ImageDestination.CustomImageUploader: case ImageDestination.CustomImageUploader:
return CustomUploadersList != null && CustomUploadersList.IsValidIndex(CustomImageUploaderSelected); return CustomUploadersList != null && CustomUploadersList.IsValidIndex(CustomImageUploaderSelected);

22
ShareX/WorkerTask.cs
View file

@ -23,6 +23,14 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3) #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.HelpersLib;
using ShareX.Properties; using ShareX.Properties;
using ShareX.UploadersLib; 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.ImageUploaders;
using ShareX.UploadersLib.TextUploaders; using ShareX.UploadersLib.TextUploaders;
using ShareX.UploadersLib.URLShorteners; 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 namespace ShareX
{ {
@ -827,15 +827,15 @@ public UploadResult UploadImage(Stream stream, string fileName)
}; };
break; break;
case ImageDestination.SomeImage: case ImageDestination.SomeImage:
String someImageAPIKey = Program.UploadersConfig.SomeImageAPIKey; String someImageAPIKey = Program.UploadersConfig.SomeImageAPIKey;
if (someImageAPIKey == "") if (someImageAPIKey == "")
{ {
someImageAPIKey = APIKeys.SomeImageKey; someImageAPIKey = APIKeys.SomeImageKey;
} }
imageUploader = new SomeImage(someImageAPIKey) imageUploader = new SomeImage(someImageAPIKey)
{ {
DirectURL = Program.UploadersConfig.SomeImageDirectURL DirectURL = Program.UploadersConfig.SomeImageDirectURL
}; };
break; break;
case ImageDestination.CustomImageUploader: case ImageDestination.CustomImageUploader:
CustomUploaderItem customUploader = GetCustomUploader(Program.UploadersConfig.CustomImageUploaderSelected); CustomUploaderItem customUploader = GetCustomUploader(Program.UploadersConfig.CustomImageUploaderSelected);