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

Try catch extract

Browse source
This commit is contained in:
Jaex 2020-06-16 06:23:13 +03:00
parent d4bd293bbe
commit e01f8304b4
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ShareX.ImageEffectsLib/ImageEffectsForm.cs
View file

@ -106,7 +106,7 @@ public void EditorMode()
btnClose.Text = Resources.ImageEffectsForm_EditorMode_Cancel; btnClose.Text = Resources.ImageEffectsForm_EditorMode_Cancel;
} }
public void ImportImageEffectFromFilePath(string filePath) public void ImportImageEffectFromFile(string filePath)
{ {
eiImageEffects.ImportFile(filePath); eiImageEffects.ImportFile(filePath);
} }

4
ShareX/Forms/MainForm.cs
View file

@ -1056,14 +1056,14 @@ public void UseCommandLineArgs(List<CLICommand> commands)
{ {
if (command.Command.Equals("CustomUploader", StringComparison.InvariantCultureIgnoreCase)) if (command.Command.Equals("CustomUploader", StringComparison.InvariantCultureIgnoreCase))
{ {
TaskHelpers.AddCustomUploader(command.Parameter); TaskHelpers.ImportCustomUploader(command.Parameter);
continue; continue;
} }
if (command.Command.Equals("ImageEffect", StringComparison.InvariantCultureIgnoreCase)) if (command.Command.Equals("ImageEffect", StringComparison.InvariantCultureIgnoreCase))
{ {
TaskHelpers.AddImageEffect(command.Parameter); TaskHelpers.ImportImageEffect(command.Parameter);
continue; continue;
} }

17
ShareX/TaskHelpers.cs
View file

@ -1588,7 +1588,7 @@ public static Screenshot GetScreenshot(TaskSettings taskSettings = null)
return screenshot; return screenshot;
} }
public static void AddCustomUploader(string filePath) public static void ImportCustomUploader(string filePath)
{ {
if (Program.UploadersConfig != null) if (Program.UploadersConfig != null)
{ {
@ -1688,9 +1688,18 @@ public static void AddCustomUploader(string filePath)
} }
} }
public static void AddImageEffect(string filePath) public static void ImportImageEffect(string filePath)
{ {
string configFilePath = ImageEffectPackager.ExtractPackage(filePath, Program.ImageEffectsFolder); string configFilePath = null;
try
{
configFilePath = ImageEffectPackager.ExtractPackage(filePath, Program.ImageEffectsFolder);
}
catch (Exception ex)
{
ex.ShowError();
}
if (!string.IsNullOrEmpty(configFilePath) && File.Exists(configFilePath)) if (!string.IsNullOrEmpty(configFilePath) && File.Exists(configFilePath))
{ {
@ -1698,7 +1707,7 @@ public static void AddImageEffect(string filePath)
if (imageEffectsForm != null) if (imageEffectsForm != null)
{ {
imageEffectsForm.ImportImageEffectFromFilePath(configFilePath); imageEffectsForm.ImportImageEffectFromFile(configFilePath);
} }
} }
} }