mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-01-18 22:43:31 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #58 from cxfksword/master

Browse Source 
Fix Calculator & Everything plugin bug
This commit is contained in:
Yeechan Lu 2014-03-19 22:31:04 +08:00
commit 4d299f5b17
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/Wox.Plugin.Everything/Main.cs
View File

@ -16,7 +16,8 @@ namespace Wox.Plugin.Everything
var results = new List<Result>(); var results = new List<Result>();
if (query.ActionParameters.Count > 0 && query.ActionParameters[0].Length > 0) if (query.ActionParameters.Count > 0 && query.ActionParameters[0].Length > 0)
{ {
IEnumerable<string> enumerable = api.Search(query.ActionParameters[0], 0, 100); var keyword = string.Join(" ", query.ActionParameters.ToArray());
IEnumerable<string> enumerable = api.Search(keyword, 0, 100);
foreach (string s in enumerable) foreach (string s in enumerable)
{ {
var path = s; var path = s;

2
Wox.Plugin.System/Calculator.cs
View File

@ -20,6 +20,7 @@ namespace Wox.Plugin.System
@"==|~=|&&|\|\||" + @"==|~=|&&|\|\||" +
@"[ei]|[0-9]|[\+\-\*\/\^\., ""]|[\(\)\|\!\[\]]" + @"[ei]|[0-9]|[\+\-\*\/\^\., ""]|[\(\)\|\!\[\]]" +
@")+$", RegexOptions.Compiled); @")+$", RegexOptions.Compiled);
private static Regex regHasNumber = new Regex(@"[0-9]", RegexOptions.Compiled);
private static Regex regBrackets = new Regex(@"[\(\)\[\]]", RegexOptions.Compiled); private static Regex regBrackets = new Regex(@"[\(\)\[\]]", RegexOptions.Compiled);
private static ParseContext yampContext = null; private static ParseContext yampContext = null;
private PluginInitContext context { get; set; } private PluginInitContext context { get; set; }
@ -35,6 +36,7 @@ namespace Wox.Plugin.System
{ {
if (string.IsNullOrEmpty(query.RawQuery) if (string.IsNullOrEmpty(query.RawQuery)
|| query.RawQuery.Length < 2 // don't affect when user only input "e" or "i" keyword || query.RawQuery.Length < 2 // don't affect when user only input "e" or "i" keyword
|| !regHasNumber.IsMatch(query.RawQuery) // must has one number
|| !regValidExpressChar.IsMatch(query.RawQuery) || !regValidExpressChar.IsMatch(query.RawQuery)
|| !IsBracketComplete(query.RawQuery)) return new List<Result>(); || !IsBracketComplete(query.RawQuery)) return new List<Result>();