github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-16 10:03:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed #279, all ExternalCommands where duplicated due to creating them in the wrong place.

Browse source
This commit is contained in:
Robin Krom 2021-03-21 23:10:05 +01:00
parent 26fe579d31
commit 601236833b
No known key found for this signature in database
GPG key ID: BCC01364F1371490
1 changed files with 133 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

78
GreenshotExternalCommandPlugin/ExternalCommandPlugin.cs
View file

@ -29,18 +29,21 @@ using GreenshotPlugin.IniFile;
using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces;
using GreenshotPlugin.Interfaces.Plugin; using GreenshotPlugin.Interfaces.Plugin;
namespace GreenshotExternalCommandPlugin { namespace GreenshotExternalCommandPlugin
{
/// <summary> /// <summary>
/// An Plugin to run commands after an image was written /// An Plugin to run commands after an image was written
/// </summary> /// </summary>
[Plugin("ExternalCommand", true)] [Plugin("ExternalCommand", true)]
public class ExternalCommandPlugin : IGreenshotPlugin { public class ExternalCommandPlugin : IGreenshotPlugin
{
private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(ExternalCommandPlugin)); private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(ExternalCommandPlugin));
private static readonly CoreConfiguration CoreConfig = IniConfig.GetIniSection<CoreConfiguration>(); private static readonly CoreConfiguration CoreConfig = IniConfig.GetIniSection<CoreConfiguration>();
private static readonly ExternalCommandConfiguration ExternalCommandConfig = IniConfig.GetIniSection<ExternalCommandConfiguration>(); private static readonly ExternalCommandConfiguration ExternalCommandConfig = IniConfig.GetIniSection<ExternalCommandConfiguration>();
private ToolStripMenuItem _itemPlugInRoot; private ToolStripMenuItem _itemPlugInRoot;
public void Dispose() { public void Dispose()
{
Dispose(true); Dispose(true);
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
} }
@ -52,8 +55,10 @@ namespace GreenshotExternalCommandPlugin {
_itemPlugInRoot.Dispose(); _itemPlugInRoot.Dispose();
_itemPlugInRoot = null; _itemPlugInRoot = null;
} }
private IEnumerable<IDestination> Destinations() { private IEnumerable<IDestination> Destinations()
foreach(string command in ExternalCommandConfig.Commands) { {
foreach (string command in ExternalCommandConfig.Commands)
{
yield return new ExternalCommandDestination(command); yield return new ExternalCommandDestination(command);
} }
} }
@ -64,49 +69,57 @@ namespace GreenshotExternalCommandPlugin {
/// </summary> /// </summary>
/// <param name="command"></param> /// <param name="command"></param>
/// <returns>false if the command is not correctly configured</returns> /// <returns>false if the command is not correctly configured</returns>
private bool IsCommandValid(string command) { private bool IsCommandValid(string command)
if (!ExternalCommandConfig.RunInbackground.ContainsKey(command)) { {
if (!ExternalCommandConfig.RunInbackground.ContainsKey(command))
{
Log.WarnFormat("Found missing runInbackground for {0}", command); Log.WarnFormat("Found missing runInbackground for {0}", command);
// Fix it // Fix it
ExternalCommandConfig.RunInbackground.Add(command, true); ExternalCommandConfig.RunInbackground.Add(command, true);
} }
if (!ExternalCommandConfig.Argument.ContainsKey(command)) { if (!ExternalCommandConfig.Argument.ContainsKey(command))
{
Log.WarnFormat("Found missing argument for {0}", command); Log.WarnFormat("Found missing argument for {0}", command);
// Fix it // Fix it
ExternalCommandConfig.Argument.Add(command, "{0}"); ExternalCommandConfig.Argument.Add(command, "{0}");
} }
if (!ExternalCommandConfig.Commandline.ContainsKey(command)) { if (!ExternalCommandConfig.Commandline.ContainsKey(command))
{
Log.WarnFormat("Found missing commandline for {0}", command); Log.WarnFormat("Found missing commandline for {0}", command);
return false; return false;
} }
string commandline = FilenameHelper.FillVariables(ExternalCommandConfig.Commandline[command], true); string commandline = FilenameHelper.FillVariables(ExternalCommandConfig.Commandline[command], true);
commandline = FilenameHelper.FillCmdVariables(commandline, true); commandline = FilenameHelper.FillCmdVariables(commandline, true);
if (!File.Exists(commandline)) { if (!File.Exists(commandline))
{
Log.WarnFormat("Found 'invalid' commandline {0} for command {1}", ExternalCommandConfig.Commandline[command], command); Log.WarnFormat("Found 'invalid' commandline {0} for command {1}", ExternalCommandConfig.Commandline[command], command);
return false; return false;
} }
SimpleServiceProvider.Current.AddService(Destinations());
return true; return true;
} }
/// <summary> /// <summary>
/// Implementation of the IGreenshotPlugin.Initialize /// Implementation of the IGreenshotPlugin.Initialize
/// </summary> /// </summary>
public virtual bool Initialize() { public virtual bool Initialize()
{
Log.DebugFormat("Initialize called"); Log.DebugFormat("Initialize called");
List<string> commandsToDelete = new List<string>(); var commandsToDelete = new List<string>();
// Check configuration // Check configuration
foreach(string command in ExternalCommandConfig.Commands) { foreach (string command in ExternalCommandConfig.Commands)
if (!IsCommandValid(command)) { {
if (!IsCommandValid(command))
{
commandsToDelete.Add(command); commandsToDelete.Add(command);
} }
} }
// cleanup // cleanup
foreach (string command in commandsToDelete) { foreach (string command in commandsToDelete)
{
ExternalCommandConfig.Delete(command); ExternalCommandConfig.Delete(command);
} }
SimpleServiceProvider.Current.AddService(Destinations());
_itemPlugInRoot = new ToolStripMenuItem(); _itemPlugInRoot = new ToolStripMenuItem();
_itemPlugInRoot.Click += ConfigMenuClick; _itemPlugInRoot.Click += ConfigMenuClick;
@ -124,37 +137,48 @@ namespace GreenshotExternalCommandPlugin {
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
private void OnIconSizeChanged(object sender, PropertyChangedEventArgs e) { private void OnIconSizeChanged(object sender, PropertyChangedEventArgs e)
if (e.PropertyName == "IconSize") { {
try { if (e.PropertyName == "IconSize")
{
try
{
string exePath = PluginUtils.GetExePath("cmd.exe"); string exePath = PluginUtils.GetExePath("cmd.exe");
if (exePath != null && File.Exists(exePath)) { if (exePath != null && File.Exists(exePath))
{
_itemPlugInRoot.Image = PluginUtils.GetCachedExeIcon(exePath, 0); _itemPlugInRoot.Image = PluginUtils.GetCachedExeIcon(exePath, 0);
} }
} catch (Exception ex) { }
catch (Exception ex)
{
Log.Warn("Couldn't get the cmd.exe image", ex); Log.Warn("Couldn't get the cmd.exe image", ex);
} }
} }
} }
private void OnLanguageChanged(object sender, EventArgs e) { private void OnLanguageChanged(object sender, EventArgs e)
if (_itemPlugInRoot != null) { {
if (_itemPlugInRoot != null)
{
_itemPlugInRoot.Text = Language.GetString("externalcommand", "contextmenu_configure"); _itemPlugInRoot.Text = Language.GetString("externalcommand", "contextmenu_configure");
} }
} }
public virtual void Shutdown() { public virtual void Shutdown()
{
Log.Debug("Shutdown"); Log.Debug("Shutdown");
} }
private void ConfigMenuClick(object sender, EventArgs eventArgs) { private void ConfigMenuClick(object sender, EventArgs eventArgs)
{
Configure(); Configure();
} }
/// <summary> /// <summary>
/// Implementation of the IPlugin.Configure /// Implementation of the IPlugin.Configure
/// </summary> /// </summary>
public virtual void Configure() { public virtual void Configure()
{
Log.Debug("Configure called"); Log.Debug("Configure called");
new SettingsForm().ShowDialog(); new SettingsForm().ShowDialog();
} }