CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-02 21:20:28 +12:00
Code Issues Packages Projects Releases Wiki Activity

Fix GetInstances method to use calling assembly

Browse source
This commit is contained in:
Jaex 2016-03-21 22:59:41 +02:00
parent d3fb5ac7bd
commit f0e0b7e463
4 changed files with 5 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ShareX.HelpersLib/Helpers/Helpers.cs
View file

@ -1059,10 +1059,11 @@ public static string ParseJSON(string text, string jsonPath)
public static T[] GetInstances<T>() where T : class
{
return (from t in Assembly.GetExecutingAssembly().GetTypes()
where t.GetInterfaces().Contains(typeof(T))
&& t.GetConstructor(Type.EmptyTypes) != null
select Activator.CreateInstance(t) as T).ToArray();
var instances = from t in Assembly.GetCallingAssembly().GetTypes()
where t.IsClass && t.IsSubclassOf(typeof(T)) && t.GetConstructor(Type.EmptyTypes) != null
select Activator.CreateInstance(t) as T;
return instances.ToArray();
}
}
}

3
ShareX.UploadersLib/ImageUploaderFactory.cs
View file

@ -24,10 +24,7 @@
#endregion License Information (GPL v3)
using ShareX.HelpersLib;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace ShareX.UploadersLib
{

2
ShareX.UploadersLib/UploadersConfig.cs
View file

@ -396,8 +396,6 @@ public bool IsValid(ImageDestination destination)
switch (destination)
{
case ImageDestination.Imgur:
return ImgurAccountType == AccountType.Anonymous || OAuth2Info.CheckOAuth(ImgurOAuth2Info);
case ImageDestination.ImageShack:
return ImageShackSettings != null && !string.IsNullOrEmpty(ImageShackSettings.Auth_token);
case ImageDestination.TinyPic:

22
ShareX/WorkerTask.cs
View file

@ -818,28 +818,6 @@ public UploadResult UploadImage(Stream stream, string fileName)
{
switch (Info.TaskSettings.ImageDestination)
{
case ImageDestination.Imgur:
if (Program.UploadersConfig.ImgurOAuth2Info == null)
{
Program.UploadersConfig.ImgurOAuth2Info = new OAuth2Info(APIKeys.ImgurClientID, APIKeys.ImgurClientSecret);
}
string albumID = null;
if (Program.UploadersConfig.ImgurUploadSelectedAlbum && Program.UploadersConfig.ImgurSelectedAlbum != null)
{
albumID = Program.UploadersConfig.ImgurSelectedAlbum.id;
}
imageUploader = new Imgur(Program.UploadersConfig.ImgurOAuth2Info)
{
UploadMethod = Program.UploadersConfig.ImgurAccountType,
DirectLink = Program.UploadersConfig.ImgurDirectLink,
ThumbnailType = Program.UploadersConfig.ImgurThumbnailType,
UseGIFV = Program.UploadersConfig.ImgurUseGIFV,
UploadAlbumID = albumID
};
break;
case ImageDestination.ImageShack:
Program.UploadersConfig.ImageShackSettings.ThumbnailWidth = Info.TaskSettings.AdvancedSettings.ThumbnailPreferredWidth;
Program.UploadersConfig.ImageShackSettings.ThumbnailHeight = Info.TaskSettings.AdvancedSettings.ThumbnailPreferredHeight;