Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 19:26:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update reindex call to use disabledprogramsources

Browse Source
This commit is contained in:
Jeremy Wu
2019-10-15 20:20:55 +11:00
parent 5793b85c5b
commit bbe72f52ba
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Wox.Plugin.Program/Programs/UWP.cs
View File

@@ -162,9 +162,8 @@ namespace Wox.Plugin.Program.Programs
}).ToArray(); }).ToArray();
var updatedListWithoutDisabledApps = applications var updatedListWithoutDisabledApps = applications
.Where(t1 => !Main._settings.ProgramSources .Where(t1 => !Main._settings.DisabledProgramSources
.Any(x => !x.Enabled .Any(x => x.UniqueIdentifier == t1.UniqueIdentifier))
&& x.UniqueIdentifier == t1.UniqueIdentifier))
.Select(x => x); .Select(x => x);
return updatedListWithoutDisabledApps.ToArray(); return updatedListWithoutDisabledApps.ToArray();

8
Plugins/Wox.Plugin.Program/Programs/Win32.cs
View File

@@ -285,7 +285,7 @@ namespace Wox.Plugin.Program.Programs
private static ParallelQuery<Win32> StartMenuPrograms(string[] suffixes) private static ParallelQuery<Win32> StartMenuPrograms(string[] suffixes)
{ {
var disabledProgramsList = Main._settings.ProgramSources.Where(x => !x.Enabled).Select(x => x); var disabledProgramsList = Main._settings.DisabledProgramSources;
var directory1 = Environment.GetFolderPath(Environment.SpecialFolder.Programs); var directory1 = Environment.GetFolderPath(Environment.SpecialFolder.Programs);
var directory2 = Environment.GetFolderPath(Environment.SpecialFolder.CommonPrograms); var directory2 = Environment.GetFolderPath(Environment.SpecialFolder.CommonPrograms);
@@ -294,7 +294,7 @@ namespace Wox.Plugin.Program.Programs
var toFilter = paths1.Concat(paths2); var toFilter = paths1.Concat(paths2);
var paths = toFilter var paths = toFilter
.Where(t1 => !disabledProgramsList.Any(x => !x.Enabled && x.UniqueIdentifier == t1)) .Where(t1 => !disabledProgramsList.Any(x => x.UniqueIdentifier == t1))
.Select(t1 => t1) .Select(t1 => t1)
.ToArray(); .ToArray();
@@ -325,10 +325,10 @@ namespace Wox.Plugin.Program.Programs
} }
} }
var disabledProgramsList = Main._settings.ProgramSources.Where(x => !x.Enabled).Select(x => x); var disabledProgramsList = Main._settings.DisabledProgramSources;
var toFilter = programs.AsParallel().Where(p => suffixes.Contains(Extension(p.ExecutableName))); var toFilter = programs.AsParallel().Where(p => suffixes.Contains(Extension(p.ExecutableName)));
var filtered = toFilter.Where(t1 => !disabledProgramsList.Any(x => !x.Enabled && x.UniqueIdentifier == t1.UniqueIdentifier)).Select(t1 => t1); var filtered = toFilter.Where(t1 => !disabledProgramsList.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier)).Select(t1 => t1);
return filtered; return filtered;
} }