Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-07 03:36:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove custom exception

Browse Source
This commit is contained in:
bao-qian
2017-01-30 00:26:11 +00:00
parent 052048ad4c
commit 974efc55ac
12 changed files with 62 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Wox.Core/Plugin/JsonRPCPlugin.cs
View File

@@ -75,7 +75,7 @@ namespace Wox.Core.Plugin
}
catch (Exception e)
{
Log.Exception($"|Wox.Core.Plugin.JsonRPCPlugin.Query|Exception when query <{query}>", e);
Log.Exception($"|JsonRPCPlugin.Query|Exception when query <{query}>", e);
}
}
return null;
@@ -123,39 +123,53 @@ namespace Wox.Core.Plugin
{
try
{
using (Process process = Process.Start(startInfo))
using (var process = Process.Start(startInfo))
{
if (process != null)
{
using (StreamReader reader = process.StandardOutput)
using (var standardOutput = process.StandardOutput)
{
string result = reader.ReadToEnd();
if (result.StartsWith("DEBUG:"))
var result = standardOutput.ReadToEnd();
if (string.IsNullOrEmpty(result))
{
MessageBox.Show(new Form { TopMost = true }, result.Substring(6));
return "";
}
if (String.IsNullOrEmpty(result))
{
using (StreamReader errorReader = process.StandardError)
using (var standardError = process.StandardError)
{
string error = errorReader.ReadToEnd();
if (!String.IsNullOrEmpty(error))
var error = standardError.ReadToEnd();
if (!string.IsNullOrEmpty(error))
{
throw new WoxJsonRPCException(error);
Log.Error($"|JsonRPCPlugin.Execute|{error}");
return string.Empty;
}
else
{
Log.Error("|JsonRPCPlugin.Execute|Empty standard output and standard error.");
return string.Empty;
}
}
}
return result;
else if (result.StartsWith("DEBUG:"))
{
MessageBox.Show(new Form {TopMost = true}, result.Substring(6));
return string.Empty;
}
else
{
return result;
}
}
}
else
{
Log.Error("|JsonRPCPlugin.Execute|Can't start new process");
return string.Empty;
}
}
}
catch (Exception e)
{
throw new WoxJsonRPCException(e.Message);
Log.Exception($"|JsonRPCPlugin.Execute|Exception for filename <{startInfo.FileName}> with argument <{startInfo.Arguments}>", e);
return string.Empty;
}
return null;
}
public void Init(PluginInitContext ctx)

5
Wox.Core/Plugin/PluginManager.cs
View File

@@ -184,12 +184,13 @@ namespace Wox.Core.Plugin
});
metadata.QueryCount += 1;
metadata.AvgQueryTime = metadata.QueryCount == 1 ? milliseconds : (metadata.AvgQueryTime + milliseconds) / 2;
return results;
}
catch (Exception e)
{
throw new WoxPluginException(pair.Metadata.Name, "QueryForPlugin failed", e);
Log.Exception($"|PluginManager.QueryForPlugin|Exception for plugin <{pair.Metadata.Name}> when query <{query}>", e);
return new List<Result>();
}
return results;
}
public static void UpdatePluginMetadata(List<Result> results, PluginMetadata metadata, Query query)