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

242
GreenshotExternalCommandPlugin/ExternalCommandPlugin.cs
View file

@ -29,134 +29,158 @@ using GreenshotPlugin.IniFile;
using GreenshotPlugin.Interfaces; using GreenshotPlugin.Interfaces;
using GreenshotPlugin.Interfaces.Plugin; using GreenshotPlugin.Interfaces.Plugin;
namespace GreenshotExternalCommandPlugin { namespace GreenshotExternalCommandPlugin
/// <summary> {
/// An Plugin to run commands after an image was written /// <summary>
/// </summary> /// An Plugin to run commands after an image was written
/// </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 CoreConfiguration CoreConfig = IniConfig.GetIniSection<CoreConfiguration>(); private static readonly log4net.ILog Log = log4net.LogManager.GetLogger(typeof(ExternalCommandPlugin));
private static readonly ExternalCommandConfiguration ExternalCommandConfig = IniConfig.GetIniSection<ExternalCommandConfiguration>(); private static readonly CoreConfiguration CoreConfig = IniConfig.GetIniSection<CoreConfiguration>();
private ToolStripMenuItem _itemPlugInRoot; private static readonly ExternalCommandConfiguration ExternalCommandConfig = IniConfig.GetIniSection<ExternalCommandConfiguration>();
private ToolStripMenuItem _itemPlugInRoot;
public void Dispose() { public void Dispose()
Dispose(true); {
GC.SuppressFinalize(this); Dispose(true);
} GC.SuppressFinalize(this);
}
protected virtual void Dispose(bool disposing) protected virtual void Dispose(bool disposing)
{ {
if (!disposing) return; if (!disposing) return;
if (_itemPlugInRoot == null) return; if (_itemPlugInRoot == null) return;
_itemPlugInRoot.Dispose(); _itemPlugInRoot.Dispose();
_itemPlugInRoot = null; _itemPlugInRoot = null;
} }
private IEnumerable<IDestination> Destinations() { private IEnumerable<IDestination> Destinations()
foreach(string command in ExternalCommandConfig.Commands) { {
yield return new ExternalCommandDestination(command); foreach (string command in ExternalCommandConfig.Commands)
} {
} yield return new ExternalCommandDestination(command);
}
}
/// <summary> /// <summary>
/// Check and eventually fix the command settings /// Check and eventually fix the command settings
/// </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)) { {
Log.WarnFormat("Found missing runInbackground for {0}", command); if (!ExternalCommandConfig.RunInbackground.ContainsKey(command))
// Fix it {
ExternalCommandConfig.RunInbackground.Add(command, true); Log.WarnFormat("Found missing runInbackground for {0}", command);
} // Fix it
if (!ExternalCommandConfig.Argument.ContainsKey(command)) { ExternalCommandConfig.RunInbackground.Add(command, true);
Log.WarnFormat("Found missing argument for {0}", command); }
// Fix it if (!ExternalCommandConfig.Argument.ContainsKey(command))
ExternalCommandConfig.Argument.Add(command, "{0}"); {
} Log.WarnFormat("Found missing argument for {0}", command);
if (!ExternalCommandConfig.Commandline.ContainsKey(command)) { // Fix it
Log.WarnFormat("Found missing commandline for {0}", command); ExternalCommandConfig.Argument.Add(command, "{0}");
return false; }
} if (!ExternalCommandConfig.Commandline.ContainsKey(command))
string commandline = FilenameHelper.FillVariables(ExternalCommandConfig.Commandline[command], true); {
commandline = FilenameHelper.FillCmdVariables(commandline, true); Log.WarnFormat("Found missing commandline for {0}", command);
return false;
}
string commandline = FilenameHelper.FillVariables(ExternalCommandConfig.Commandline[command], 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); {
return false; Log.WarnFormat("Found 'invalid' commandline {0} for command {1}", ExternalCommandConfig.Commandline[command], command);
} return false;
}
return true;
}
/// <summary>
/// Implementation of the IGreenshotPlugin.Initialize
/// </summary>
public virtual bool Initialize()
{
Log.DebugFormat("Initialize called");
var commandsToDelete = new List<string>();
// Check configuration
foreach (string command in ExternalCommandConfig.Commands)
{
if (!IsCommandValid(command))
{
commandsToDelete.Add(command);
}
}
// cleanup
foreach (string command in commandsToDelete)
{
ExternalCommandConfig.Delete(command);
}
SimpleServiceProvider.Current.AddService(Destinations()); SimpleServiceProvider.Current.AddService(Destinations());
return true;
}
/// <summary>
/// Implementation of the IGreenshotPlugin.Initialize
/// </summary>
public virtual bool Initialize() {
Log.DebugFormat("Initialize called");
List<string> commandsToDelete = new List<string>(); _itemPlugInRoot = new ToolStripMenuItem();
// Check configuration
foreach(string command in ExternalCommandConfig.Commands) {
if (!IsCommandValid(command)) {
commandsToDelete.Add(command);
}
}
// cleanup
foreach (string command in commandsToDelete) {
ExternalCommandConfig.Delete(command);
}
_itemPlugInRoot = new ToolStripMenuItem();
_itemPlugInRoot.Click += ConfigMenuClick; _itemPlugInRoot.Click += ConfigMenuClick;
OnIconSizeChanged(this, new PropertyChangedEventArgs("IconSize")); OnIconSizeChanged(this, new PropertyChangedEventArgs("IconSize"));
OnLanguageChanged(this, null); OnLanguageChanged(this, null);
PluginUtils.AddToContextMenu(_itemPlugInRoot); PluginUtils.AddToContextMenu(_itemPlugInRoot);
Language.LanguageChanged += OnLanguageChanged; Language.LanguageChanged += OnLanguageChanged;
CoreConfig.PropertyChanged += OnIconSizeChanged; CoreConfig.PropertyChanged += OnIconSizeChanged;
return true; return true;
} }
/// <summary> /// <summary>
/// Fix icon reference /// Fix icon reference
/// </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")
string exePath = PluginUtils.GetExePath("cmd.exe"); {
if (exePath != null && File.Exists(exePath)) { try
_itemPlugInRoot.Image = PluginUtils.GetCachedExeIcon(exePath, 0); {
} string exePath = PluginUtils.GetExePath("cmd.exe");
} catch (Exception ex) { if (exePath != null && File.Exists(exePath))
Log.Warn("Couldn't get the cmd.exe image", ex); {
} _itemPlugInRoot.Image = PluginUtils.GetCachedExeIcon(exePath, 0);
} }
} }
catch (Exception 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) { {
_itemPlugInRoot.Text = Language.GetString("externalcommand", "contextmenu_configure"); if (_itemPlugInRoot != null)
} {
} _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"); {
new SettingsForm().ShowDialog(); Log.Debug("Configure called");
} new SettingsForm().ShowDialog();
} }
}
} }