diff --git a/Plugins/Wox.Plugin.Doc/Main.cs b/Plugins/Wox.Plugin.Doc/Main.cs index e437bc4a9..e482d5c76 100644 --- a/Plugins/Wox.Plugin.Doc/Main.cs +++ b/Plugins/Wox.Plugin.Doc/Main.cs @@ -23,53 +23,36 @@ namespace Wox.Plugin.Doc List results = new List(); if (query.ActionParameters.Count == 0) { - results.Add(new Result() - { - Title = "Current supported docs:" - }); results.AddRange(docs.Select(o => new Result() { - Title = o.Name.Replace(".docset", ""), + Title = o.Name.Replace(".docset", "").Replace(" ",""), IcoPath = o.IconPath }).ToList()); return results; } - foreach (Doc doc in docs) + if (query.ActionParameters.Count >= 2) { - results.AddRange(QuerySqllite(doc, query.ActionParameters[0])); + Doc firstOrDefault = docs.FirstOrDefault(o => o.Name.Replace(".docset", "").Replace(" ","").ToLower() == query.ActionParameters[0]); + if (firstOrDefault != null) + { + results.AddRange(QuerySqllite(firstOrDefault, query.ActionParameters[1])); + } } + else + { + foreach (Doc doc in docs) + { + results.AddRange(QuerySqllite(doc, query.ActionParameters[0])); + } + } + return results; } public void Init(PluginInitContext context) { - - //todo:move to common place - var otherCompanyDlls = new DirectoryInfo(context.PluginMetadata.PluginDirecotry).GetFiles("*.dll"); - AppDomain.CurrentDomain.AssemblyResolve += (sender, args) => - { - var dll = otherCompanyDlls.FirstOrDefault(fi => - { - try - { - Assembly assembly = Assembly.LoadFile(fi.FullName); - return assembly.FullName == args.Name; - } - catch - { - return false; - } - }); - if (dll == null) - { - return null; - } - - return Assembly.LoadFile(dll.FullName); - }; - docsetBasePath = context.PluginMetadata.PluginDirecotry + @"Docset"; if (!Directory.Exists(docsetBasePath)) Directory.CreateDirectory(docsetBasePath); @@ -110,7 +93,6 @@ namespace Wox.Plugin.Doc } } } - } return imagePath; } diff --git a/Plugins/Wox.Plugin.Doc/README.md b/Plugins/Wox.Plugin.Doc/README.md new file mode 100644 index 000000000..fa721944c --- /dev/null +++ b/Plugins/Wox.Plugin.Doc/README.md @@ -0,0 +1,5 @@ +How to use? + +1. Docset download link:[http://kapeli.com/docset_links](http://kapeli.com/docset_links) +2. Unzip doc zip into "Plugins\Doc\Docset\{docname}" +3. Restart Wox \ No newline at end of file diff --git a/Plugins/Wox.Plugin.Doc/Wox.Plugin.Doc.csproj b/Plugins/Wox.Plugin.Doc/Wox.Plugin.Doc.csproj index f53a63ad8..937690665 100644 --- a/Plugins/Wox.Plugin.Doc/Wox.Plugin.Doc.csproj +++ b/Plugins/Wox.Plugin.Doc/Wox.Plugin.Doc.csproj @@ -83,6 +83,7 @@ Always + @@ -101,7 +102,7 @@ - xcopy /Y /E $(TargetDir)*.* $(SolutionDir)Wox\bin\Debug\Plugins\Doc\ + xcopy /Y /E $(TargetDir)*.* $(SolutionDir)Wox\bin\Debug\Plugins\$(ProjectName)\ + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.DotnetPluginTest/packages.config b/Plugins/Wox.Plugin.DotnetPluginTest/packages.config new file mode 100644 index 000000000..3a7903bb6 --- /dev/null +++ b/Plugins/Wox.Plugin.DotnetPluginTest/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Plugins/Wox.Plugin.DotnetPluginTest/plugin.ini b/Plugins/Wox.Plugin.DotnetPluginTest/plugin.ini new file mode 100644 index 000000000..a598232fe --- /dev/null +++ b/Plugins/Wox.Plugin.DotnetPluginTest/plugin.ini @@ -0,0 +1,8 @@ +[plugin] +ActionKeyword = ts +Name = dotnet test +Author = qianlifeng +Version = 0.1 +Language = csharp +Description = test +ExecuteFile = Wox.Plugin.DotnetPluginTest.dll diff --git a/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj b/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj index 1ec9d2a66..bd9b27beb 100644 --- a/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj +++ b/Plugins/Wox.Plugin.Everything/Wox.Plugin.Everything.csproj @@ -16,7 +16,7 @@ true full false - ..\..\Wox\bin\Debug\Plugins\Everything\ + bin\Debug\ DEBUG;TRACE prompt 4 @@ -81,10 +81,9 @@ - xcopy /Y $(TargetDir)$(TargetFileName) $(SolutionDir)Wox\bin\Debug\Plugins\Everything\ -xcopy /Y $(TargetDir)plugin.ini $(SolutionDir)Wox\bin\Debug\Plugins\Everything\ -xcopy /Y $(ProjectDir)x86\Everything.dll $(SolutionDir)Wox\bin\Debug\Plugins\Everything\x86\ -xcopy /Y $(ProjectDir)x64\Everything.dll $(SolutionDir)Wox\bin\Debug\Plugins\Everything\x64\ + xcopy /Y /E $(TargetDir)*.* $(SolutionDir)Wox\bin\Debug\Plugins\$(ProjectName)\ +xcopy /Y $(ProjectDir)x86\Everything.dll $(SolutionDir)Wox\bin\Debug\Plugins\$(ProjectName)\x86\ +xcopy /Y $(ProjectDir)x64\Everything.dll $(SolutionDir)Wox\bin\Debug\Plugins\$(ProjectName)\x64\