prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #91 from jjw24/fix_folderplugin_exceptions

Browse source 
Fix exceptions in Folder plugin search + other fixes
This commit is contained in:
Jeremy Wu 2019-12-09 08:34:50 +11:00 committed by GitHub
commit 1efcb2f80b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Plugins/Wox.Plugin.Folder/Main.cs
View file

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
@ -82,7 +82,7 @@ namespace Wox.Plugin.Folder
} }
string changeTo = path.EndsWith("\\") ? path : path + "\\"; string changeTo = path.EndsWith("\\") ? path : path + "\\";
_context.API.ChangeQuery(queryActionKeyword + " " + changeTo); _context.API.ChangeQuery(string.IsNullOrEmpty(queryActionKeyword)? changeTo : queryActionKeyword + " " + changeTo);
return false; return false;
} }
}; };
@ -157,18 +157,32 @@ namespace Wox.Plugin.Folder
incompleteName = incompleteName.Substring(1); incompleteName = incompleteName.Substring(1);
} }
// search folder and add results try
var fileSystemInfos = directoryInfo.GetFileSystemInfos(incompleteName, searchOption);
foreach (var fileSystemInfo in fileSystemInfos)
{ {
if ((fileSystemInfo.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden) continue; // search folder and add results
var fileSystemInfos = directoryInfo.GetFileSystemInfos(incompleteName, searchOption);
var result = foreach (var fileSystemInfo in fileSystemInfos)
fileSystemInfo is DirectoryInfo {
? CreateFolderResult(fileSystemInfo.Name, fileSystemInfo.FullName, query.ActionKeyword) if ((fileSystemInfo.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden) continue;
: CreateFileResult(fileSystemInfo.FullName);
results.Add(result); var result =
fileSystemInfo is DirectoryInfo
? CreateFolderResult(fileSystemInfo.Name, fileSystemInfo.FullName, query.ActionKeyword)
: CreateFileResult(fileSystemInfo.FullName);
results.Add(result);
}
}
catch(Exception e)
{
if (e is UnauthorizedAccessException || e is ArgumentException)
{
results.Add(new Result { Title = e.Message, Score = 501 });
return results;
}
throw;
} }
return results; return results;
@ -206,7 +220,7 @@ namespace Wox.Plugin.Folder
{ {
Title = firstResult, Title = firstResult,
IcoPath = search, IcoPath = search,
Score = 10000, Score = 500,
Action = c => Action = c =>
{ {
Process.Start(search); Process.Start(search);