Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-10 21:41:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Files added to search results after folders

Browse Source 
I think it is time we release version 2
This commit is contained in:
Aaron Campf
2014-05-08 17:38:51 -07:00
parent 7c2e2a01c2
commit d751805254
3 changed files with 208 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -114,3 +114,5 @@ UpgradeLog*.XML
*.DotSettings *.DotSettings
/Python.Runtime.dll /Python.Runtime.dll
Wox/Images/websearch/Thumbs.db
Wox/Images/Thumbs.db

128
Wox.Plugin.SystemPlugins/FileSystem/FileSystemPlugin.cs
View File

@@ -8,20 +8,16 @@ using System.Windows.Forms;
using Wox.Infrastructure; using Wox.Infrastructure;
using Wox.Infrastructure.Storage.UserSettings; using Wox.Infrastructure.Storage.UserSettings;
namespace Wox.Plugin.SystemPlugins.FileSystem namespace Wox.Plugin.SystemPlugins.FileSystem {
{ public class FileSystemPlugin : BaseSystemPlugin, ISettingProvider {
public class FileSystemPlugin : BaseSystemPlugin, ISettingProvider
{
private PluginInitContext context; private PluginInitContext context;
private static List<string> driverNames = null; private static List<string> driverNames = null;
private static Dictionary<string, DirectoryInfo[]> parentDirectories = new Dictionary<string, DirectoryInfo[]>(); private static Dictionary<string, DirectoryInfo[]> parentDirectories = new Dictionary<string, DirectoryInfo[]>();
protected override List<Result> QueryInternal(Query query) protected override List<Result> QueryInternal(Query query) {
{
//TODO: Consider always clearing the cache //TODO: Consider always clearing the cache
List<Result> results = new List<Result>(); List<Result> results = new List<Result>();
if (string.IsNullOrEmpty(query.RawQuery)) if (string.IsNullOrEmpty(query.RawQuery)) {
{
// clear the cache // clear the cache
if (parentDirectories.Count > 0) if (parentDirectories.Count > 0)
parentDirectories.Clear(); parentDirectories.Clear();
@@ -38,18 +34,14 @@ namespace Wox.Plugin.SystemPlugins.FileSystem
x.Nickname.Equals(inputName, StringComparison.OrdinalIgnoreCase)); x.Nickname.Equals(inputName, StringComparison.OrdinalIgnoreCase));
var currentPath = link != null ? link.Path : null; var currentPath = link != null ? link.Path : null;
foreach (var item in UserSettingStorage.Instance.FolderLinks) foreach (var item in UserSettingStorage.Instance.FolderLinks) {
{
var Name = item.Nickname; var Name = item.Nickname;
if (Name.StartsWith(input, StringComparison.OrdinalIgnoreCase) && Name.Length != input.Length) if (Name.StartsWith(input, StringComparison.OrdinalIgnoreCase) && Name.Length != input.Length) {
{ Result result = new Result {
Result result = new Result
{
Title = Name, Title = Name,
IcoPath = "Images/folder.png", IcoPath = "Images/folder.png",
Action = (c) => Action = (c) => {
{
context.ChangeQuery(item.Nickname); context.ChangeQuery(item.Nickname);
return false; return false;
} }
@@ -59,8 +51,7 @@ namespace Wox.Plugin.SystemPlugins.FileSystem
} }
} }
if (currentPath == null) if (currentPath == null) {
{
if (!driverNames.Any(input.StartsWith)) if (!driverNames.Any(input.StartsWith))
return results; return results;
@@ -69,11 +60,9 @@ namespace Wox.Plugin.SystemPlugins.FileSystem
else else
currentPath += input.Remove(0, inputName.Length); currentPath += input.Remove(0, inputName.Length);
if (Directory.Exists(currentPath)) if (Directory.Exists(currentPath)) {
{
// show all child directory // show all child directory
if (input.EndsWith("\\") || input.EndsWith("/")) if (input.EndsWith("\\") || input.EndsWith("/")) {
{
var dirInfo = new DirectoryInfo(currentPath); var dirInfo = new DirectoryInfo(currentPath);
var dirs = dirInfo.GetDirectories(); var dirs = dirInfo.GetDirectories();
@@ -81,18 +70,15 @@ namespace Wox.Plugin.SystemPlugins.FileSystem
if (!parentDirectories.ContainsKey(parentDirKey)) if (!parentDirectories.ContainsKey(parentDirKey))
parentDirectories.Add(parentDirKey, dirs); parentDirectories.Add(parentDirKey, dirs);
foreach (var dir in dirs) foreach (var dir in dirs) {
{
if ((dir.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden) if ((dir.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden)
continue; continue;
var dirPath = dir.FullName; var dirPath = dir.FullName;
Result result = new Result Result result = new Result {
{
Title = dir.Name, Title = dir.Name,
IcoPath = "Images/folder.png", IcoPath = "Images/folder.png",
Action = (c) => Action = (c) => {
{
context.ChangeQuery(dirPath); context.ChangeQuery(dirPath);
return false; return false;
} }
@@ -100,60 +86,71 @@ namespace Wox.Plugin.SystemPlugins.FileSystem
results.Add(result); results.Add(result);
} }
if (results.Count == 0) if (results.Count == 0) {
{ Result result = new Result {
Result result = new Result
{
Title = "Open this directory", Title = "Open this directory",
SubTitle = "No files in this directory", SubTitle = "No files in this directory",
IcoPath = "Images/folder.png", IcoPath = "Images/folder.png",
Action = (c) => Action = (c) => {
{
Process.Start(currentPath); Process.Start(currentPath);
return true; return true;
} }
}; };
results.Add(result); results.Add(result);
} }
foreach (var dir in dirInfo.GetFiles()) {
if ((dir.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden)
continue;
var dirPath = dir.FullName;
Result result = new Result {
Title = global::System.IO.Path.GetFileNameWithoutExtension(dirPath),
IcoPath = dirPath,
Action = (c) => {
try {
Process.Start(dirPath);
} }
else catch (Exception ex) {
{ MessageBox.Show(ex.Message, "Could not start " + dir.Name);
Result result = new Result }
{
return true;
}
};
results.Add(result);
}
}
else {
Result result = new Result {
Title = "Open this directory", Title = "Open this directory",
SubTitle = string.Format("path: {0}", currentPath), SubTitle = string.Format("path: {0}", currentPath),
Score = 50, Score = 50,
IcoPath = "Images/folder.png", IcoPath = "Images/folder.png",
Action = (c) => Action = (c) => {
{
Process.Start(currentPath); Process.Start(currentPath);
return true; return true;
} }
}; };
results.Add(result); results.Add(result);
} }
} }
// change to search in current directory // change to search in current directory
string parentDir = null; string parentDir = null;
try try {
{
parentDir = Path.GetDirectoryName(input); parentDir = Path.GetDirectoryName(input);
} }
catch { } catch { }
if (!string.IsNullOrEmpty(parentDir) && results.Count == 0) if (!string.IsNullOrEmpty(parentDir) && results.Count == 0) {
{
parentDir = parentDir.TrimEnd('\\', '/'); parentDir = parentDir.TrimEnd('\\', '/');
if (parentDirectories.ContainsKey(parentDir)) if (parentDirectories.ContainsKey(parentDir)) {
{
var dirs = parentDirectories[parentDir]; var dirs = parentDirectories[parentDir];
var queryFileName = Path.GetFileName(currentPath).ToLower(); var queryFileName = Path.GetFileName(currentPath).ToLower();
var fuzzy = FuzzyMatcher.Create(queryFileName); var fuzzy = FuzzyMatcher.Create(queryFileName);
foreach (var dir in dirs) foreach (var dir in dirs) {
{
if ((dir.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden) if ((dir.Attributes & FileAttributes.Hidden) == FileAttributes.Hidden)
continue; continue;
@@ -162,13 +159,11 @@ namespace Wox.Plugin.SystemPlugins.FileSystem
continue; continue;
var dirPath = dir.FullName; var dirPath = dir.FullName;
Result result = new Result Result result = new Result {
{
Title = dir.Name, Title = dir.Name,
IcoPath = "Images/folder.png", IcoPath = "Images/folder.png",
Score = matchResult.Score, Score = matchResult.Score,
Action = (c) => Action = (c) => {
{
context.ChangeQuery(dirPath); context.ChangeQuery(dirPath);
return false; return false;
} }
@@ -182,48 +177,39 @@ namespace Wox.Plugin.SystemPlugins.FileSystem
return results; return results;
} }
private void InitialDriverList() private void InitialDriverList() {
{ if (driverNames == null) {
if (driverNames == null)
{
driverNames = new List<string>(); driverNames = new List<string>();
var allDrives = DriveInfo.GetDrives(); var allDrives = DriveInfo.GetDrives();
foreach (var driver in allDrives) foreach (var driver in allDrives) {
{
driverNames.Add(driver.Name.ToLower().TrimEnd('\\')); driverNames.Add(driver.Name.ToLower().TrimEnd('\\'));
} }
} }
} }
protected override void InitInternal(PluginInitContext context) protected override void InitInternal(PluginInitContext context) {
{
this.context = context; this.context = context;
if (UserSettingStorage.Instance.FolderLinks == null) if (UserSettingStorage.Instance.FolderLinks == null) {
{
UserSettingStorage.Instance.FolderLinks = new List<FolderLink>(); UserSettingStorage.Instance.FolderLinks = new List<FolderLink>();
UserSettingStorage.Instance.Save(); UserSettingStorage.Instance.Save();
} }
} }
public override string Name public override string Name {
{
get { return "File System"; } get { return "File System"; }
} }
public override string IcoPath public override string IcoPath {
{
get { return @"Images\folder.png"; } get { return @"Images\folder.png"; }
} }
public System.Windows.Controls.Control CreateSettingPanel() public System.Windows.Controls.Control CreateSettingPanel() {
{
return new FileSystemSettings(); return new FileSystemSettings();
} }
public override string Description public override string Description {
{
get { return base.Description; } get { return base.Description; }
} }
} }

37
Wox/MainWindow.xaml.cs
View File

@@ -361,6 +361,26 @@ namespace Wox {
private void TbQuery_OnPreviewKeyDown(object sender, KeyEventArgs e) { private void TbQuery_OnPreviewKeyDown(object sender, KeyEventArgs e) {
//when alt is pressed, the real key should be e.SystemKey //when alt is pressed, the real key should be e.SystemKey
Action Shift_GoBack = () => {
if (e.KeyboardDevice.IsKeyDown(Key.LeftShift) || e.KeyboardDevice.IsKeyDown(Key.RightShift)) {
if (tbQuery.Text.EndsWith("\\")) {
tbQuery.Text = tbQuery.Text.Remove(tbQuery.Text.Length - 1);
}
if (tbQuery.Text.Contains("\\")) {
var index = tbQuery.Text.LastIndexOf("\\");
tbQuery.Text = tbQuery.Text.Remove(index) + "\\";
}
else {
tbQuery.Text = "";
return;
}
}
tbQuery.CaretIndex = int.MaxValue;
};
Key key = (e.Key == Key.System ? e.SystemKey : e.Key); Key key = (e.Key == Key.System ? e.SystemKey : e.Key);
switch (key) { switch (key) {
case Key.Escape: case Key.Escape:
@@ -397,22 +417,17 @@ namespace Wox {
break; break;
case Key.Enter: case Key.Enter:
Shift_GoBack();
AcceptSelect(resultCtrl.AcceptSelect()); AcceptSelect(resultCtrl.AcceptSelect());
e.Handled = true; e.Handled = true;
break; break;
case Key.Tab: case Key.Tab:
var SelectedItem = resultCtrl.lbResults.SelectedItem as Wox.Plugin.Result; Shift_GoBack();
if (SelectedItem != null) { AcceptSelect(resultCtrl.AcceptSelect());
if (tbQuery.Text.Contains("\\")) { if (!tbQuery.Text.EndsWith("\\")) tbQuery.Text += "\\";
var index = tbQuery.Text.LastIndexOf("\\"); AcceptSelect(resultCtrl.AcceptSelect());
tbQuery.Text = tbQuery.Text.Remove(index) + "\\";
}
tbQuery.Text += SelectedItem.Title;
tbQuery.CaretIndex = int.MaxValue; tbQuery.CaretIndex = int.MaxValue;
}
e.Handled = true; e.Handled = true;
break; break;
} }
@@ -427,7 +442,7 @@ namespace Wox {
if (hideWindow) { if (hideWindow) {
HideWox(); HideWox();
} }
UserSelectedRecordStorage.Instance.Add(result); //UserSelectedRecordStorage.Instance.Add(result);
} }
} }
} }