mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-07 09:28:03 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Improving performance of Adding and Removing Packaged Apps (#4521) (#4900)

Browse Source 
* Merging in Theme changes and moving win32Tests to Microsoft.Plugin.Program.UnitTests

* Fixing message format for exception

* Changing test structure.  Need to add unit tests.

* Updating packagerepository comment based on pr feedback

* Fixing potential race condition in ListRepository.  Now internally implemented as a concurrent dictionary.

* Removing unecessary implementation of IRepository interface as this is implemented by the base class.

* Restoring checks for invalid uwp apps based on PR feedback. This was accidentally removed when moving the initialize outside the constructor.

* Fixing comments

* Adding newline to end of file for IProgramRepository
This commit is contained in:
ryanbodrug-microsoft 2020-07-09 13:14:53 -07:00 committed by GitHub
parent 12d9d59d85
commit b1d662a5b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 1137 additions and 734 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PowerToys.sln
View File

@ -255,6 +255,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerTest", "src\
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagedCommon", "src\common\ManagedCommon\ManagedCommon.csproj", "{4AED67B6-55FD-486F-B917-E543DEE2CB3C}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagedCommon", "src\common\ManagedCommon\ManagedCommon.csproj", "{4AED67B6-55FD-486F-B917-E543DEE2CB3C}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Plugin.Program.UnitTests", "src\modules\launcher\Plugins\Microsoft.Plugin.Program.UnitTests\Microsoft.Plugin.Program.UnitTests.csproj", "{42851751-CBC8-45A6-97F5-7A0753F7B4D1}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64 Debug|x64 = Debug|x64
@ -501,6 +503,10 @@ Global
{4AED67B6-55FD-486F-B917-E543DEE2CB3C}.Debug|x64.Build.0 = Debug|x64 {4AED67B6-55FD-486F-B917-E543DEE2CB3C}.Debug|x64.Build.0 = Debug|x64
{4AED67B6-55FD-486F-B917-E543DEE2CB3C}.Release|x64.ActiveCfg = Release|x64 {4AED67B6-55FD-486F-B917-E543DEE2CB3C}.Release|x64.ActiveCfg = Release|x64
{4AED67B6-55FD-486F-B917-E543DEE2CB3C}.Release|x64.Build.0 = Release|x64 {4AED67B6-55FD-486F-B917-E543DEE2CB3C}.Release|x64.Build.0 = Release|x64
{42851751-CBC8-45A6-97F5-7A0753F7B4D1}.Debug|x64.ActiveCfg = Debug|x64
{42851751-CBC8-45A6-97F5-7A0753F7B4D1}.Debug|x64.Build.0 = Debug|x64
{42851751-CBC8-45A6-97F5-7A0753F7B4D1}.Release|x64.ActiveCfg = Release|x64
{42851751-CBC8-45A6-97F5-7A0753F7B4D1}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -571,6 +577,7 @@ Global
{E6410BFC-B341-498C-8C67-312C20CDD8D5} = {1AFB6476-670D-4E80-A464-657E01DFF482} {E6410BFC-B341-498C-8C67-312C20CDD8D5} = {1AFB6476-670D-4E80-A464-657E01DFF482}
{62173D9A-6724-4C00-A1C8-FB646480A9EC} = {38BDB927-829B-4C65-9CD9-93FB05D66D65} {62173D9A-6724-4C00-A1C8-FB646480A9EC} = {38BDB927-829B-4C65-9CD9-93FB05D66D65}
{4AED67B6-55FD-486F-B917-E543DEE2CB3C} = {1AFB6476-670D-4E80-A464-657E01DFF482} {4AED67B6-55FD-486F-B917-E543DEE2CB3C} = {1AFB6476-670D-4E80-A464-657E01DFF482}
{42851751-CBC8-45A6-97F5-7A0753F7B4D1} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0} SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}

26
src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Microsoft.Plugin.Program.UnitTests.csproj Normal file
View File

@ -0,0 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
<Platforms>x64</Platforms>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Moq" Version="4.14.3" />
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.Plugin.Program\Microsoft.Plugin.Program.csproj" />
</ItemGroup>
</Project>

874
src/modules/launcher/Wox.Test/Plugins/Win32Tests.cs → src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Programs/Win32Tests.cs
View File

@ -1,439 +1,437 @@
using System; using Moq;
using System.Collections.Generic; using NUnit.Framework;
using System.Diagnostics; using System.Collections.Generic;
using System.Linq; using System.Linq;
using NUnit.Framework; using Wox.Infrastructure;
using Wox.Infrastructure; using Wox.Plugin;
using Wox.Plugin;
using Microsoft.Plugin.Program.Programs; using Microsoft.Plugin.Program;
using Moq; using System.IO.Packaging;
using System.IO; using Windows.ApplicationModel;
using Microsoft.Plugin.Program; namespace Microsoft.Plugin.Program.UnitTests.Programs
using System.IO.Packaging; {
using Windows.ApplicationModel; using Win32 = Microsoft.Plugin.Program.Programs.Win32;
namespace Wox.Test.Plugins [TestFixture]
{
[TestFixture]
public class Win32Tests public class Win32Tests
{ {
static Win32 notepad_appdata = new Win32 static Win32 notepad_appdata = new Win32
{ {
Name = "Notepad", Name = "Notepad",
ExecutableName = "notepad.exe", ExecutableName = "notepad.exe",
FullPath = "c:\\windows\\system32\\notepad.exe", FullPath = "c:\\windows\\system32\\notepad.exe",
LnkResolvedPath = "c:\\users\\powertoys\\appdata\\roaming\\microsoft\\windows\\start menu\\programs\\accessories\\notepad.lnk", LnkResolvedPath = "c:\\users\\powertoys\\appdata\\roaming\\microsoft\\windows\\start menu\\programs\\accessories\\notepad.lnk",
AppType = 2 AppType = 2
}; };
static Win32 notepad_users = new Win32 static Win32 notepad_users = new Win32
{ {
Name = "Notepad", Name = "Notepad",
ExecutableName = "notepad.exe", ExecutableName = "notepad.exe",
FullPath = "c:\\windows\\system32\\notepad.exe", FullPath = "c:\\windows\\system32\\notepad.exe",
LnkResolvedPath = "c:\\programdata\\microsoft\\windows\\start menu\\programs\\accessories\\notepad.lnk", LnkResolvedPath = "c:\\programdata\\microsoft\\windows\\start menu\\programs\\accessories\\notepad.lnk",
AppType = 2 AppType = 2
}; };
static Win32 azure_command_prompt = new Win32 static Win32 azure_command_prompt = new Win32
{ {
Name = "Microsoft Azure Command Prompt - v2.9", Name = "Microsoft Azure Command Prompt - v2.9",
ExecutableName = "cmd.exe", ExecutableName = "cmd.exe",
FullPath = "c:\\windows\\system32\\cmd.exe", FullPath = "c:\\windows\\system32\\cmd.exe",
LnkResolvedPath = "c:\\programdata\\microsoft\\windows\\start menu\\programs\\microsoft azure\\microsoft azure sdk for .net\\v2.9\\microsoft azure command prompt - v2.9.lnk", LnkResolvedPath = "c:\\programdata\\microsoft\\windows\\start menu\\programs\\microsoft azure\\microsoft azure sdk for .net\\v2.9\\microsoft azure command prompt - v2.9.lnk",
AppType = 2 AppType = 2
}; };
static Win32 visual_studio_command_prompt = new Win32 static Win32 visual_studio_command_prompt = new Win32
{ {
Name = "x64 Native Tools Command Prompt for VS 2019", Name = "x64 Native Tools Command Prompt for VS 2019",
ExecutableName = "cmd.exe", ExecutableName = "cmd.exe",
FullPath = "c:\\windows\\system32\\cmd.exe", FullPath = "c:\\windows\\system32\\cmd.exe",
LnkResolvedPath = "c:\\programdata\\microsoft\\windows\\start menu\\programs\\visual studio 2019\\visual studio tools\\vc\\x64 native tools command prompt for vs 2019.lnk", LnkResolvedPath = "c:\\programdata\\microsoft\\windows\\start menu\\programs\\visual studio 2019\\visual studio tools\\vc\\x64 native tools command prompt for vs 2019.lnk",
AppType = 2 AppType = 2
}; };
static Win32 command_prompt = new Win32 static Win32 command_prompt = new Win32
{ {
Name = "Command Prompt", Name = "Command Prompt",
ExecutableName = "cmd.exe", ExecutableName = "cmd.exe",
FullPath = "c:\\windows\\system32\\cmd.exe", FullPath = "c:\\windows\\system32\\cmd.exe",
LnkResolvedPath ="c:\\users\\powertoys\\appdata\\roaming\\microsoft\\windows\\start menu\\programs\\system tools\\command prompt.lnk", LnkResolvedPath ="c:\\users\\powertoys\\appdata\\roaming\\microsoft\\windows\\start menu\\programs\\system tools\\command prompt.lnk",
AppType = 2 AppType = 2
}; };
static Win32 file_explorer = new Win32 static Win32 file_explorer = new Win32
{ {
Name = "File Explorer", Name = "File Explorer",
ExecutableName = "File Explorer.lnk", ExecutableName = "File Explorer.lnk",
FullPath = "c:\\users\\powertoys\\appdata\\roaming\\microsoft\\windows\\start menu\\programs\\system tools\\file explorer.lnk", FullPath = "c:\\users\\powertoys\\appdata\\roaming\\microsoft\\windows\\start menu\\programs\\system tools\\file explorer.lnk",
LnkResolvedPath = null, LnkResolvedPath = null,
AppType = 2 AppType = 2
}; };
static Win32 wordpad = new Win32 static Win32 wordpad = new Win32
{ {
Name = "Wordpad", Name = "Wordpad",
ExecutableName = "wordpad.exe", ExecutableName = "wordpad.exe",
FullPath = "c:\\program files\\windows nt\\accessories\\wordpad.exe", FullPath = "c:\\program files\\windows nt\\accessories\\wordpad.exe",
LnkResolvedPath = "c:\\programdata\\microsoft\\windows\\start menu\\programs\\accessories\\wordpad.lnk", LnkResolvedPath = "c:\\programdata\\microsoft\\windows\\start menu\\programs\\accessories\\wordpad.lnk",
AppType = 2 AppType = 2
}; };
static Win32 wordpad_duplicate = new Win32 static Win32 wordpad_duplicate = new Win32
{ {
Name = "WORDPAD", Name = "WORDPAD",
ExecutableName = "WORDPAD.EXE", ExecutableName = "WORDPAD.EXE",
FullPath = "c:\\program files\\windows nt\\accessories\\wordpad.exe", FullPath = "c:\\program files\\windows nt\\accessories\\wordpad.exe",
LnkResolvedPath = null, LnkResolvedPath = null,
AppType = 2 AppType = 2
}; };
static Win32 twitter_pwa = new Win32 static Win32 twitter_pwa = new Win32
{ {
Name = "Twitter", Name = "Twitter",
FullPath = "c:\\program files (x86)\\google\\chrome\\application\\chrome_proxy.exe", FullPath = "c:\\program files (x86)\\google\\chrome\\application\\chrome_proxy.exe",
LnkResolvedPath = "c:\\users\\powertoys\\appdata\\roaming\\microsoft\\windows\\start menu\\programs\\chrome apps\\twitter.lnk", LnkResolvedPath = "c:\\users\\powertoys\\appdata\\roaming\\microsoft\\windows\\start menu\\programs\\chrome apps\\twitter.lnk",
Arguments = " --profile-directory=Default --app-id=jgeosdfsdsgmkedfgdfgdfgbkmhcgcflmi", Arguments = " --profile-directory=Default --app-id=jgeosdfsdsgmkedfgdfgdfgbkmhcgcflmi",
AppType = 0 AppType = 0
}; };
static Win32 pinned_webpage = new Win32 static Win32 pinned_webpage = new Win32
{ {
Name = "Web page", Name = "Web page",
FullPath = "c:\\program files (x86)\\microsoft\\edge\\application\\msedge_proxy.exe", FullPath = "c:\\program files (x86)\\microsoft\\edge\\application\\msedge_proxy.exe",
LnkResolvedPath = "c:\\users\\powertoys\\appdata\\roaming\\microsoft\\windows\\start menu\\programs\\web page.lnk", LnkResolvedPath = "c:\\users\\powertoys\\appdata\\roaming\\microsoft\\windows\\start menu\\programs\\web page.lnk",
Arguments = "--profile-directory=Default --app-id=homljgmgpmcbpjbnjpfijnhipfkiclkd", Arguments = "--profile-directory=Default --app-id=homljgmgpmcbpjbnjpfijnhipfkiclkd",
AppType = 0 AppType = 0
}; };
static Win32 edge_named_pinned_webpage = new Win32 static Win32 edge_named_pinned_webpage = new Win32
{ {
Name = "edge - Bing", Name = "edge - Bing",
FullPath = "c:\\program files (x86)\\microsoft\\edge\\application\\msedge_proxy.exe", FullPath = "c:\\program files (x86)\\microsoft\\edge\\application\\msedge_proxy.exe",
LnkResolvedPath = "c:\\users\\powertoys\\appdata\\roaming\\microsoft\\windows\\start menu\\programs\\edge - bing.lnk", LnkResolvedPath = "c:\\users\\powertoys\\appdata\\roaming\\microsoft\\windows\\start menu\\programs\\edge - bing.lnk",
Arguments = " --profile-directory=Default --app-id=aocfnapldcnfbofgmbbllojgocaelgdd", Arguments = " --profile-directory=Default --app-id=aocfnapldcnfbofgmbbllojgocaelgdd",
AppType = 0 AppType = 0
}; };
static Win32 msedge = new Win32 static Win32 msedge = new Win32
{ {
Name = "Microsoft Edge", Name = "Microsoft Edge",
ExecutableName = "msedge.exe", ExecutableName = "msedge.exe",
FullPath = "c:\\program files (x86)\\microsoft\\edge\\application\\msedge.exe", FullPath = "c:\\program files (x86)\\microsoft\\edge\\application\\msedge.exe",
LnkResolvedPath = "c:\\programdata\\microsoft\\windows\\start menu\\programs\\microsoft edge.lnk", LnkResolvedPath = "c:\\programdata\\microsoft\\windows\\start menu\\programs\\microsoft edge.lnk",
AppType = 2 AppType = 2
}; };
static Win32 chrome = new Win32 static Win32 chrome = new Win32
{ {
Name = "Google Chrome", Name = "Google Chrome",
ExecutableName = "chrome.exe", ExecutableName = "chrome.exe",
FullPath = "c:\\program files (x86)\\google\\chrome\\application\\chrome.exe", FullPath = "c:\\program files (x86)\\google\\chrome\\application\\chrome.exe",
LnkResolvedPath = "c:\\programdata\\microsoft\\windows\\start menu\\programs\\google chrome.lnk", LnkResolvedPath = "c:\\programdata\\microsoft\\windows\\start menu\\programs\\google chrome.lnk",
AppType = 2 AppType = 2
}; };
static Win32 dummy_proxy_app = new Win32 static Win32 dummy_proxy_app = new Win32
{ {
Name = "Proxy App", Name = "Proxy App",
ExecutableName = "test_proxy.exe", ExecutableName = "test_proxy.exe",
FullPath = "c:\\program files (x86)\\microsoft\\edge\\application\\test_proxy.exe", FullPath = "c:\\program files (x86)\\microsoft\\edge\\application\\test_proxy.exe",
LnkResolvedPath = "c:\\programdata\\microsoft\\windows\\start menu\\programs\\test proxy.lnk", LnkResolvedPath = "c:\\programdata\\microsoft\\windows\\start menu\\programs\\test proxy.lnk",
AppType = 2 AppType = 2
}; };
static Win32 cmd_run_command = new Win32 static Win32 cmd_run_command = new Win32
{ {
Name = "cmd", Name = "cmd",
ExecutableName = "cmd.exe", ExecutableName = "cmd.exe",
FullPath = "c:\\windows\\system32\\cmd.exe", FullPath = "c:\\windows\\system32\\cmd.exe",
LnkResolvedPath = null, LnkResolvedPath = null,
AppType = 3 // Run command AppType = 3 // Run command
}; };
static Win32 cmder_run_command = new Win32 static Win32 cmder_run_command = new Win32
{ {
Name = "Cmder", Name = "Cmder",
Description = "Cmder: Lovely Console Emulator", Description = "Cmder: Lovely Console Emulator",
ExecutableName = "Cmder.exe", ExecutableName = "Cmder.exe",
FullPath = "c:\\tools\\cmder\\cmder.exe", FullPath = "c:\\tools\\cmder\\cmder.exe",
LnkResolvedPath = null, LnkResolvedPath = null,
AppType = 3 // Run command AppType = 3 // Run command
}; };
static Win32 dummy_internetShortcut_app = new Win32 static Win32 dummy_internetShortcut_app = new Win32
{ {
Name = "Shop Titans", Name = "Shop Titans",
ExecutableName = "Shop Titans.url", ExecutableName = "Shop Titans.url",
FullPath = "steam://rungameid/1258080", FullPath = "steam://rungameid/1258080",
ParentDirectory = "C:\\Users\\temp\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\\Steam", ParentDirectory = "C:\\Users\\temp\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\\Steam",
LnkResolvedPath = null, LnkResolvedPath = null,
AppType = 1 AppType = 1
}; };
static Win32 dummy_internetShortcut_app_duplicate = new Win32 static Win32 dummy_internetShortcut_app_duplicate = new Win32
{ {
Name = "Shop Titans", Name = "Shop Titans",
ExecutableName = "Shop Titans.url", ExecutableName = "Shop Titans.url",
FullPath = "steam://rungameid/1258080", FullPath = "steam://rungameid/1258080",
ParentDirectory = "C:\\Users\\temp\\Desktop", ParentDirectory = "C:\\Users\\temp\\Desktop",
LnkResolvedPath = null, LnkResolvedPath = null,
AppType = 1 AppType = 1
}; };
[Test] [Test]
public void DedupFunction_whenCalled_mustRemoveDuplicateNotepads() public void DedupFunction_whenCalled_mustRemoveDuplicateNotepads()
{ {
// Arrange // Arrange
List<Win32> prgms = new List<Win32>(); List<Win32> prgms = new List<Win32>();
prgms.Add(notepad_appdata); prgms.Add(notepad_appdata);
prgms.Add(notepad_users); prgms.Add(notepad_users);
// Act // Act
Win32[] apps = Win32.DeduplicatePrograms(prgms.AsParallel()); Win32[] apps = Win32.DeduplicatePrograms(prgms.AsParallel());
// Assert // Assert
Assert.AreEqual(apps.Length, 1); Assert.AreEqual(apps.Length, 1);
} }
[Test] [Test]
public void DedupFunction_whenCalled_MustRemoveInternetShortcuts() public void DedupFunction_whenCalled_MustRemoveInternetShortcuts()
{ {
// Arrange // Arrange
List<Win32> prgms = new List<Win32>(); List<Win32> prgms = new List<Win32>();
prgms.Add(dummy_internetShortcut_app); prgms.Add(dummy_internetShortcut_app);
prgms.Add(dummy_internetShortcut_app_duplicate); prgms.Add(dummy_internetShortcut_app_duplicate);
// Act // Act
Win32[] apps = Win32.DeduplicatePrograms(prgms.AsParallel()); Win32[] apps = Win32.DeduplicatePrograms(prgms.AsParallel());
// Assert // Assert
Assert.AreEqual(apps.Length, 1); Assert.AreEqual(apps.Length, 1);
} }
[Test] [Test]
public void DedupFunction_whenCalled_mustNotRemovelnkWhichdoesNotHaveExe() public void DedupFunction_whenCalled_mustNotRemovelnkWhichdoesNotHaveExe()
{ {
// Arrange // Arrange
List<Win32> prgms = new List<Win32>(); List<Win32> prgms = new List<Win32>();
prgms.Add(file_explorer); prgms.Add(file_explorer);
// Act // Act
Win32[] apps = Win32.DeduplicatePrograms(prgms.AsParallel()); Win32[] apps = Win32.DeduplicatePrograms(prgms.AsParallel());
// Assert // Assert
Assert.AreEqual(apps.Length, 1); Assert.AreEqual(apps.Length, 1);
} }
[Test] [Test]
public void DedupFunction_mustRemoveDuplicates_forExeExtensionsWithoutLnkResolvedPath() public void DedupFunction_mustRemoveDuplicates_forExeExtensionsWithoutLnkResolvedPath()
{ {
// Arrange // Arrange
List<Win32> prgms = new List<Win32>(); List<Win32> prgms = new List<Win32>();
prgms.Add(wordpad); prgms.Add(wordpad);
prgms.Add(wordpad_duplicate); prgms.Add(wordpad_duplicate);
// Act // Act
Win32[] apps = Win32.DeduplicatePrograms(prgms.AsParallel()); Win32[] apps = Win32.DeduplicatePrograms(prgms.AsParallel());
// Assert // Assert
Assert.AreEqual(apps.Length, 1); Assert.AreEqual(apps.Length, 1);
Assert.IsTrue(!string.IsNullOrEmpty(apps[0].LnkResolvedPath)); Assert.IsTrue(!string.IsNullOrEmpty(apps[0].LnkResolvedPath));
} }
[Test] [Test]
public void DedupFunction_mustNotRemovePrograms_withSameExeNameAndFullPath() public void DedupFunction_mustNotRemovePrograms_withSameExeNameAndFullPath()
{ {
// Arrange // Arrange
List<Win32> prgms = new List<Win32>(); List<Win32> prgms = new List<Win32>();
prgms.Add(azure_command_prompt); prgms.Add(azure_command_prompt);
prgms.Add(visual_studio_command_prompt); prgms.Add(visual_studio_command_prompt);
prgms.Add(command_prompt); prgms.Add(command_prompt);
// Act // Act
Win32[] apps = Win32.DeduplicatePrograms(prgms.AsParallel()); Win32[] apps = Win32.DeduplicatePrograms(prgms.AsParallel());
// Assert // Assert
Assert.AreEqual(apps.Length, 3); Assert.AreEqual(apps.Length, 3);
} }
[Test] [Test]
public void FunctionIsWebApplication_ShouldReturnTrue_ForWebApplications() public void FunctionIsWebApplication_ShouldReturnTrue_ForWebApplications()
{ {
// The IsWebApplication(() function must return true for all PWAs and pinned web pages // The IsWebApplication(() function must return true for all PWAs and pinned web pages
Assert.IsTrue(twitter_pwa.IsWebApplication()); Assert.IsTrue(twitter_pwa.IsWebApplication());
Assert.IsTrue(pinned_webpage.IsWebApplication()); Assert.IsTrue(pinned_webpage.IsWebApplication());
Assert.IsTrue(edge_named_pinned_webpage.IsWebApplication()); Assert.IsTrue(edge_named_pinned_webpage.IsWebApplication());
// Should not filter apps whose executable name ends with proxy.exe // Should not filter apps whose executable name ends with proxy.exe
Assert.IsFalse(dummy_proxy_app.IsWebApplication()); Assert.IsFalse(dummy_proxy_app.IsWebApplication());
} }
[TestCase("ignore")] [TestCase("ignore")]
public void FunctionFilterWebApplication_ShouldReturnFalse_WhenSearchingForTheMainApp(string query) public void FunctionFilterWebApplication_ShouldReturnFalse_WhenSearchingForTheMainApp(string query)
{ {
// Irrespective of the query, the FilterWebApplication() Function must not filter main apps such as edge and chrome // Irrespective of the query, the FilterWebApplication() Function must not filter main apps such as edge and chrome
Assert.IsFalse(msedge.FilterWebApplication(query)); Assert.IsFalse(msedge.FilterWebApplication(query));
Assert.IsFalse(chrome.FilterWebApplication(query)); Assert.IsFalse(chrome.FilterWebApplication(query));
} }
[TestCase("edge", ExpectedResult = true)] [TestCase("edge", ExpectedResult = true)]
[TestCase("EDGE", ExpectedResult = true)] [TestCase("EDGE", ExpectedResult = true)]
[TestCase("msedge", ExpectedResult = true)] [TestCase("msedge", ExpectedResult = true)]
[TestCase("Microsoft", ExpectedResult = true)] [TestCase("Microsoft", ExpectedResult = true)]
[TestCase("edg", ExpectedResult = true)] [TestCase("edg", ExpectedResult = true)]
[TestCase("Edge page", ExpectedResult = false)] [TestCase("Edge page", ExpectedResult = false)]
[TestCase("Edge Web page", ExpectedResult = false)] [TestCase("Edge Web page", ExpectedResult = false)]
public bool EdgeWebSites_ShouldBeFiltered_WhenSearchingForEdge(string query) public bool EdgeWebSites_ShouldBeFiltered_WhenSearchingForEdge(string query)
{ {
return pinned_webpage.FilterWebApplication(query); return pinned_webpage.FilterWebApplication(query);
} }
[TestCase("chrome", ExpectedResult = true)] [TestCase("chrome", ExpectedResult = true)]
[TestCase("CHROME", ExpectedResult = true)] [TestCase("CHROME", ExpectedResult = true)]
[TestCase("Google", ExpectedResult = true)] [TestCase("Google", ExpectedResult = true)]
[TestCase("Google Chrome", ExpectedResult = true)] [TestCase("Google Chrome", ExpectedResult = true)]
[TestCase("Google Chrome twitter", ExpectedResult = false)] [TestCase("Google Chrome twitter", ExpectedResult = false)]
public bool ChromeWebSites_ShouldBeFiltered_WhenSearchingForChrome(string query) public bool ChromeWebSites_ShouldBeFiltered_WhenSearchingForChrome(string query)
{ {
return twitter_pwa.FilterWebApplication(query); return twitter_pwa.FilterWebApplication(query);
} }
[TestCase("twitter", 0, ExpectedResult = false)] [TestCase("twitter", 0, ExpectedResult = false)]
[TestCase("Twit", 0, ExpectedResult = false)] [TestCase("Twit", 0, ExpectedResult = false)]
[TestCase("TWITTER", 0, ExpectedResult = false)] [TestCase("TWITTER", 0, ExpectedResult = false)]
[TestCase("web", 1, ExpectedResult = false)] [TestCase("web", 1, ExpectedResult = false)]
[TestCase("Page", 1, ExpectedResult = false)] [TestCase("Page", 1, ExpectedResult = false)]
[TestCase("WEB PAGE", 1, ExpectedResult = false)] [TestCase("WEB PAGE", 1, ExpectedResult = false)]
[TestCase("edge", 2, ExpectedResult = false)] [TestCase("edge", 2, ExpectedResult = false)]
[TestCase("EDGE", 2, ExpectedResult = false)] [TestCase("EDGE", 2, ExpectedResult = false)]
public bool PinnedWebPages_ShouldNotBeFiltered_WhenSearchingForThem(string query, int Case) public bool PinnedWebPages_ShouldNotBeFiltered_WhenSearchingForThem(string query, int Case)
{ {
const uint CASE_TWITTER = 0; const uint CASE_TWITTER = 0;
const uint CASE_WEB_PAGE = 1; const uint CASE_WEB_PAGE = 1;
const uint CASE_EDGE_NAMED_WEBPAGE = 2; const uint CASE_EDGE_NAMED_WEBPAGE = 2;
// If the query is a part of the name of the web application, it should not be filtered, // If the query is a part of the name of the web application, it should not be filtered,
// even if the name is the same as that of the main application, eg: case 2 - edge // even if the name is the same as that of the main application, eg: case 2 - edge
if (Case == CASE_TWITTER) if (Case == CASE_TWITTER)
{ {
return twitter_pwa.FilterWebApplication(query); return twitter_pwa.FilterWebApplication(query);
} }
else if(Case == CASE_WEB_PAGE) else if (Case == CASE_WEB_PAGE)
{ {
return pinned_webpage.FilterWebApplication(query); return pinned_webpage.FilterWebApplication(query);
} }
else if(Case == CASE_EDGE_NAMED_WEBPAGE) else if (Case == CASE_EDGE_NAMED_WEBPAGE)
{ {
return edge_named_pinned_webpage.FilterWebApplication(query); return edge_named_pinned_webpage.FilterWebApplication(query);
} }
// unreachable code // unreachable code
return true; return true;
} }
[TestCase("Command Prompt")] [TestCase("Command Prompt")]
[TestCase("cmd")] [TestCase("cmd")]
[TestCase("cmd.exe")] [TestCase("cmd.exe")]
[TestCase("ignoreQueryText")] [TestCase("ignoreQueryText")]
public void Win32Applications_ShouldNotBeFiltered_WhenFilteringRunCommands(string query) public void Win32Applications_ShouldNotBeFiltered_WhenFilteringRunCommands(string query)
{ {
// Even if there is an exact match in the name or exe name, applications should never be filtered // Even if there is an exact match in the name or exe name, win32 applications should never be filtered
Assert.IsTrue(command_prompt.QueryEqualsNameForRunCommands(query)); Assert.IsTrue(command_prompt.QueryEqualsNameForRunCommands(query));
} }
[TestCase("cmd")] [TestCase("cmd")]
[TestCase("Cmd")] [TestCase("Cmd")]
[TestCase("CMD")] [TestCase("CMD")]
public void RunCommands_ShouldNotBeFiltered_OnExactMatch(string query) public void RunCommands_ShouldNotBeFiltered_OnExactMatch(string query)
{ {
// Partial matches should be filtered as cmd is not equal to cmder // Partial matches should be filtered as cmd is not equal to cmder
Assert.IsFalse(cmder_run_command.QueryEqualsNameForRunCommands(query)); Assert.IsFalse(cmder_run_command.QueryEqualsNameForRunCommands(query));
// the query matches the name (cmd) and is therefore not filtered (case-insensitive) // the query matches the name (cmd) and is therefore not filtered (case-insensitive)
Assert.IsTrue(cmd_run_command.QueryEqualsNameForRunCommands(query)); Assert.IsTrue(cmd_run_command.QueryEqualsNameForRunCommands(query));
} }
[Test] [Test]
public void WEB_APPLICATION_ReturnContextMenuWithOpenInConsole_WhenContextMenusIsCalled() public void WEB_APPLICATION_ReturnContextMenuWithOpenInConsole_WhenContextMenusIsCalled()
{ {
// Arrange // Arrange
var mock = new Mock<IPublicAPI>(); var mock = new Mock<IPublicAPI>();
mock.Setup(x => x.GetTranslation(It.IsAny<string>())).Returns(It.IsAny<string>()); mock.Setup(x => x.GetTranslation(It.IsAny<string>())).Returns(It.IsAny<string>());
// Act // Act
List<ContextMenuResult> contextMenuResults = pinned_webpage.ContextMenus(mock.Object); List<ContextMenuResult> contextMenuResults = pinned_webpage.ContextMenus(mock.Object);
// Assert // Assert
Assert.AreEqual(contextMenuResults.Count, 3); Assert.AreEqual(contextMenuResults.Count, 3);
mock.Verify(x => x.GetTranslation("wox_plugin_program_run_as_administrator"), Times.Once()); mock.Verify(x => x.GetTranslation("wox_plugin_program_run_as_administrator"), Times.Once());
mock.Verify(x => x.GetTranslation("wox_plugin_program_open_containing_folder"), Times.Once()); mock.Verify(x => x.GetTranslation("wox_plugin_program_open_containing_folder"), Times.Once());
mock.Verify(x => x.GetTranslation("wox_plugin_program_open_in_console"), Times.Once()); mock.Verify(x => x.GetTranslation("wox_plugin_program_open_in_console"), Times.Once());
} }
[Test] [Test]
public void INTERNET_SHORTCUT_APPLICATION_ReturnContextMenuWithOpenInConsole_WhenContextMenusIsCalled() public void INTERNET_SHORTCUT_APPLICATION_ReturnContextMenuWithOpenInConsole_WhenContextMenusIsCalled()
{ {
// Arrange // Arrange
var mock = new Mock<IPublicAPI>(); var mock = new Mock<IPublicAPI>();
mock.Setup(x => x.GetTranslation(It.IsAny<string>())).Returns(It.IsAny<string>()); mock.Setup(x => x.GetTranslation(It.IsAny<string>())).Returns(It.IsAny<string>());
// Act // Act
List<ContextMenuResult> contextMenuResults = dummy_internetShortcut_app.ContextMenus(mock.Object); List<ContextMenuResult> contextMenuResults = dummy_internetShortcut_app.ContextMenus(mock.Object);
// Assert // Assert
Assert.AreEqual(contextMenuResults.Count, 2); Assert.AreEqual(contextMenuResults.Count, 2);
mock.Verify(x => x.GetTranslation("wox_plugin_program_open_containing_folder"), Times.Once()); mock.Verify(x => x.GetTranslation("wox_plugin_program_open_containing_folder"), Times.Once());
mock.Verify(x => x.GetTranslation("wox_plugin_program_open_in_console"), Times.Once()); mock.Verify(x => x.GetTranslation("wox_plugin_program_open_in_console"), Times.Once());
} }
[Test] [Test]
public void WIN32_APPLICATION_ReturnContextMenuWithOpenInConsole_WhenContextMenusIsCalled() public void WIN32_APPLICATION_ReturnContextMenuWithOpenInConsole_WhenContextMenusIsCalled()
{ {
// Arrange // Arrange
var mock = new Mock<IPublicAPI>(); var mock = new Mock<IPublicAPI>();
mock.Setup(x => x.GetTranslation(It.IsAny<string>())).Returns(It.IsAny<string>()); mock.Setup(x => x.GetTranslation(It.IsAny<string>())).Returns(It.IsAny<string>());
// Act // Act
List<ContextMenuResult> contextMenuResults = chrome.ContextMenus(mock.Object); List<ContextMenuResult> contextMenuResults = chrome.ContextMenus(mock.Object);
// Assert // Assert
Assert.AreEqual(contextMenuResults.Count, 3); Assert.AreEqual(contextMenuResults.Count, 3);
mock.Verify(x => x.GetTranslation("wox_plugin_program_run_as_administrator"), Times.Once()); mock.Verify(x => x.GetTranslation("wox_plugin_program_run_as_administrator"), Times.Once());
mock.Verify(x => x.GetTranslation("wox_plugin_program_open_containing_folder"), Times.Once()); mock.Verify(x => x.GetTranslation("wox_plugin_program_open_containing_folder"), Times.Once());
mock.Verify(x => x.GetTranslation("wox_plugin_program_open_in_console"), Times.Once()); mock.Verify(x => x.GetTranslation("wox_plugin_program_open_in_console"), Times.Once());
} }
[Test] [Test]
public void RUN_COMMAND_ReturnContextMenuWithOpenInConsole_WhenContextMenusIsCalled() public void RUN_COMMAND_ReturnContextMenuWithOpenInConsole_WhenContextMenusIsCalled()
{ {
// Arrange // Arrange
var mock = new Mock<IPublicAPI>(); var mock = new Mock<IPublicAPI>();
mock.Setup(x => x.GetTranslation(It.IsAny<string>())).Returns(It.IsAny<string>()); mock.Setup(x => x.GetTranslation(It.IsAny<string>())).Returns(It.IsAny<string>());
// Act // Act
List<ContextMenuResult> contextMenuResults = cmd_run_command.ContextMenus(mock.Object); List<ContextMenuResult> contextMenuResults = cmd_run_command.ContextMenus(mock.Object);
// Assert // Assert
Assert.AreEqual(contextMenuResults.Count, 3); Assert.AreEqual(contextMenuResults.Count, 3);
mock.Verify(x => x.GetTranslation("wox_plugin_program_run_as_administrator"), Times.Once()); mock.Verify(x => x.GetTranslation("wox_plugin_program_run_as_administrator"), Times.Once());
mock.Verify(x => x.GetTranslation("wox_plugin_program_open_containing_folder"), Times.Once()); mock.Verify(x => x.GetTranslation("wox_plugin_program_open_containing_folder"), Times.Once());
mock.Verify(x => x.GetTranslation("wox_plugin_program_open_in_console"), Times.Once()); mock.Verify(x => x.GetTranslation("wox_plugin_program_open_in_console"), Times.Once());
} }
[Test] [Test]
public void Win32Apps_ShouldSetNameAsTitle_WhileCreatingResult() public void Win32Apps_ShouldSetNameAsTitle_WhileCreatingResult()
{ {
var mock = new Mock<IPublicAPI>(); var mock = new Mock<IPublicAPI>();
mock.Setup(x => x.GetTranslation(It.IsAny<string>())).Returns(It.IsAny<string>()); mock.Setup(x => x.GetTranslation(It.IsAny<string>())).Returns(It.IsAny<string>());
StringMatcher.Instance = new StringMatcher(); StringMatcher.Instance = new StringMatcher();
// Act // Act
var result = cmder_run_command.Result("cmder", mock.Object); var result = cmder_run_command.Result("cmder", mock.Object);
// Assert // Assert
Assert.IsTrue(result.Title.Equals(cmder_run_command.Name)); Assert.IsTrue(result.Title.Equals(cmder_run_command.Name));
Assert.IsFalse(result.Title.Equals(cmder_run_command.Description)); Assert.IsFalse(result.Title.Equals(cmder_run_command.Description));
} }
} }
} }

148
src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Storage/ListRepositoryTests.cs Normal file
View File

@ -0,0 +1,148 @@
using Microsoft.Plugin.Program.Storage;
using Moq;
using NUnit.Framework;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Windows.Media.Capture;
using Wox.Infrastructure.Storage;
namespace Microsoft.Plugin.Program.UnitTests.Storage
{
[TestFixture]
class ListRepositoryTests
{
[Test]
public void Contains_ShouldReturnTrue_WhenListIsInitializedWithItem()
{
//Arrange
var itemName = "originalItem1";
IRepository<string> repository = new ListRepository<string>() { itemName };
//Act
var result = repository.Contains(itemName);
//Assert
Assert.IsTrue(result);
}
[Test]
public void Contains_ShouldReturnTrue_WhenListIsUpdatedWithAdd()
{
//Arrange
IRepository<string> repository = new ListRepository<string>();
//Act
var itemName = "newItem";
repository.Add(itemName);
var result = repository.Contains(itemName);
//Assert
Assert.IsTrue(result);
}
[Test]
public void Contains_ShouldReturnFalse_WhenListIsUpdatedWithRemove()
{
//Arrange
var itemName = "originalItem1";
IRepository<string> repository = new ListRepository<string>() { itemName };
//Act
repository.Remove(itemName);
var result = repository.Contains(itemName);
//Assert
Assert.IsFalse(result);
}
[Test]
public async Task Add_ShouldNotThrow_WhenBeingIterated()
{
//Arrange
ListRepository<string> repository = new ListRepository<string>();
var numItems = 1000;
for(var i=0; i<numItems;++i)
{
repository.Add($"OriginalItem_{i}");
}
//Act - Begin iterating on one thread
var iterationTask = Task.Run(() =>
{
var remainingIterations = 10000;
while (remainingIterations > 0)
{
foreach (var item in repository)
{
//keep iterating
}
--remainingIterations;
}
});
//Act - Insert on another thread
var addTask = Task.Run(() =>
{
for (var i = 0; i < numItems; ++i)
{
repository.Add($"NewItem_{i}");
}
});
//Assert that this does not throw. Collections that aren't syncronized will throw an invalidoperatioexception if the list is modified while enumerating
Assert.DoesNotThrowAsync(async () =>
{
await Task.WhenAll(new Task[] { iterationTask, addTask });
});
}
[Test]
public async Task Remove_ShouldNotThrow_WhenBeingIterated()
{
//Arrange
ListRepository<string> repository = new ListRepository<string>();
var numItems = 1000;
for (var i = 0; i < numItems; ++i)
{
repository.Add($"OriginalItem_{i}");
}
//Act - Begin iterating on one thread
var iterationTask = Task.Run(() =>
{
var remainingIterations = 10000;
while (remainingIterations > 0)
{
foreach (var item in repository)
{
//keep iterating
}
--remainingIterations;
}
});
//Act - Remove on another thread
var addTask = Task.Run(() =>
{
for (var i = 0; i < numItems; ++i)
{
repository.Remove($"OriginalItem_{i}");
}
});
//Assert that this does not throw. Collections that aren't syncronized will throw an invalidoperatioexception if the list is modified while enumerating
Assert.DoesNotThrowAsync(async () =>
{
await Task.WhenAll(new Task[] { iterationTask, addTask });
});
}
}
}

10
src/modules/launcher/Plugins/Microsoft.Plugin.Program.UnitTests/Storage/PackageRepositoryTest.cs Normal file
View File

@ -0,0 +1,10 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace Microsoft.Plugin.Program.UnitTests.Storage
{
class PackageRepositoryTest
{
}
}

433
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Main.cs
View File

@ -1,207 +1,185 @@
using Microsoft.PowerToys.Settings.UI.Lib; using Microsoft.PowerToys.Settings.UI.Lib;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Timers; using System.Timers;
using System.Windows.Controls; using System.Windows.Controls;
using Wox.Infrastructure.Logger; using Wox.Infrastructure.Logger;
using Wox.Infrastructure.Storage; using Wox.Infrastructure.Storage;
using Wox.Plugin; using Wox.Plugin;
using Microsoft.Plugin.Program.Views; using Microsoft.Plugin.Program.Views;
using Stopwatch = Wox.Infrastructure.Stopwatch; using Stopwatch = Wox.Infrastructure.Stopwatch;
using Microsoft.Plugin.Program.Programs; using Windows.ApplicationModel;
using Microsoft.Plugin.Program.Storage;
namespace Microsoft.Plugin.Program using Microsoft.Plugin.Program.Programs;
{
public class Main : ISettingProvider, IPlugin, IPluginI18n, IContextMenu, ISavable, IReloadable, IDisposable namespace Microsoft.Plugin.Program
{ {
private static readonly object IndexLock = new object(); public class Main : IPlugin, IPluginI18n, IContextMenu, ISavable, IReloadable, IDisposable
internal static Programs.Win32[] _win32s { get; set; } {
internal static Programs.UWP.Application[] _uwps { get; set; } private static readonly object IndexLock = new object();
internal static Settings _settings { get; set; } internal static Programs.Win32[] _win32s { get; set; }
internal static Settings _settings { get; set; }
FileSystemWatcher _watcher = null;
System.Timers.Timer _timer = null; private static bool IsStartupIndexProgramsRequired => _settings.LastIndexTime.AddDays(3) < DateTime.Today;
private static bool IsStartupIndexProgramsRequired => _settings.LastIndexTime.AddDays(3) < DateTime.Today; private static PluginInitContext _context;
private static PluginInitContext _context; private static BinaryStorage<Programs.Win32[]> _win32Storage;
private readonly PluginJsonStorage<Settings> _settingsStorage;
private static BinaryStorage<Programs.Win32[]> _win32Storage;
private static BinaryStorage<Programs.UWP.Application[]> _uwpStorage;
private readonly PluginJsonStorage<Settings> _settingsStorage;
private bool _disposed = false; private bool _disposed = false;
private PackageRepository _packageRepository = new PackageRepository(new PackageCatalogWrapper(), new BinaryStorage<IList<UWP.Application>>("UWP"));
public Main()
{ public Main()
_settingsStorage = new PluginJsonStorage<Settings>(); {
_settings = _settingsStorage.Load(); _settingsStorage = new PluginJsonStorage<Settings>();
_settings = _settingsStorage.Load();
Stopwatch.Normal("|Microsoft.Plugin.Program.Main|Preload programs cost", () =>
{ Stopwatch.Normal("|Microsoft.Plugin.Program.Main|Preload programs cost", () =>
_win32Storage = new BinaryStorage<Programs.Win32[]>("Win32"); {
_win32s = _win32Storage.TryLoad(new Programs.Win32[] { }); _win32Storage = new BinaryStorage<Programs.Win32[]>("Win32");
_uwpStorage = new BinaryStorage<Programs.UWP.Application[]>("UWP"); _win32s = _win32Storage.TryLoad(new Programs.Win32[] { });
_uwps = _uwpStorage.TryLoad(new Programs.UWP.Application[] { });
}); _packageRepository.Load();
Log.Info($"|Microsoft.Plugin.Program.Main|Number of preload win32 programs <{_win32s.Length}>"); });
Log.Info($"|Microsoft.Plugin.Program.Main|Number of preload uwps <{_uwps.Length}>"); Log.Info($"|Microsoft.Plugin.Program.Main|Number of preload win32 programs <{_win32s.Length}>");
var a = Task.Run(() => var a = Task.Run(() =>
{ {
if (IsStartupIndexProgramsRequired || !_win32s.Any()) if (IsStartupIndexProgramsRequired || !_win32s.Any())
Stopwatch.Normal("|Microsoft.Plugin.Program.Main|Win32Program index cost", IndexWin32Programs); Stopwatch.Normal("|Microsoft.Plugin.Program.Main|Win32Program index cost", IndexWin32Programs);
}); });
var b = Task.Run(() => var b = Task.Run(() =>
{ {
if (IsStartupIndexProgramsRequired || !_uwps.Any()) if (IsStartupIndexProgramsRequired || !_packageRepository.Any())
Stopwatch.Normal("|Microsoft.Plugin.Program.Main|Win32Program index cost", IndexUWPPrograms); Stopwatch.Normal("|Microsoft.Plugin.Program.Main|Win32Program index cost", _packageRepository.IndexPrograms);
}); });
Task.WaitAll(a, b);
Task.WaitAll(a, b);
_settings.LastIndexTime = DateTime.Today;
_settings.LastIndexTime = DateTime.Today;
InitializeFileWatchers(); }
InitializeTimer();
} public void Save()
{
public void Save() _settingsStorage.Save();
{ _win32Storage.Save(_win32s);
_settingsStorage.Save(); _packageRepository.Save();
_win32Storage.Save(_win32s); }
_uwpStorage.Save(_uwps);
} public List<Result> Query(Query query)
{
public List<Result> Query(Query query) Programs.Win32[] win32;
{
Programs.Win32[] win32; lock (IndexLock)
Programs.UWP.Application[] uwps; {
// just take the reference inside the lock to eliminate query time issues.
lock (IndexLock) win32 = _win32s;
{ }
// just take the reference inside the lock to eliminate query time issues.
win32 = _win32s; var results1 = win32.AsParallel()
uwps = _uwps; .Where(p => p.Enabled)
} .Select(p => p.Result(query.Search, _context.API));
var results1 = win32.AsParallel() var results2 = _packageRepository.AsParallel()
.Where(p => p.Enabled) .Where(p => p.Enabled)
.Select(p => p.Result(query.Search, _context.API)); .Select(p => p.Result(query.Search, _context.API));
var results2 = uwps.AsParallel() var result = results1.Concat(results2).Where(r => r != null && r.Score > 0).ToList();
.Where(p => p.Enabled) return result;
.Select(p => p.Result(query.Search, _context.API)); }
var result = results1.Concat(results2).Where(r => r != null && r.Score > 0).ToList(); public void Init(PluginInitContext context)
return result; {
} _context = context;
_context.API.ThemeChanged += OnThemeChanged;
public void Init(PluginInitContext context) UpdateUWPIconPath(_context.API.GetCurrentTheme());
{ }
_context = context;
_context.API.ThemeChanged += OnThemeChanged; public void OnThemeChanged(Theme _, Theme currentTheme)
UpdateUWPIconPath(_context.API.GetCurrentTheme()); {
} UpdateUWPIconPath(currentTheme);
}
public void OnThemeChanged(Theme _, Theme currentTheme)
{ public void UpdateUWPIconPath(Theme theme)
UpdateUWPIconPath(currentTheme); {
} foreach (UWP.Application app in _packageRepository)
{
public void UpdateUWPIconPath(Theme theme) app.UpdatePath(theme);
{ }
foreach (UWP.Application app in _uwps) }
{
app.UpdatePath(theme); public static void IndexWin32Programs()
} {
} var win32S = Programs.Win32.All(_settings);
lock (IndexLock)
public static void IndexWin32Programs() {
{ _win32s = win32S;
var win32S = Programs.Win32.All(_settings); }
lock (IndexLock) }
{
_win32s = win32S;
}
} public void IndexPrograms()
{
public static void IndexUWPPrograms() var t1 = Task.Run(() => IndexWin32Programs());
{ var t2 = Task.Run(() => _packageRepository.IndexPrograms());
var windows10 = new Version(10, 0);
var support = Environment.OSVersion.Version.Major >= windows10.Major; Task.WaitAll(t1, t2);
var applications = support ? Programs.UWP.All() : new Programs.UWP.Application[] { }; _settings.LastIndexTime = DateTime.Today;
lock (IndexLock) }
{
_uwps = applications; public string GetTranslatedPluginTitle()
} {
} return _context.API.GetTranslation("wox_plugin_program_plugin_name");
}
public static void IndexPrograms()
{ public string GetTranslatedPluginDescription()
var t1 = Task.Run(() => IndexWin32Programs()); {
var t2 = Task.Run(() => IndexUWPPrograms()); return _context.API.GetTranslation("wox_plugin_program_plugin_description");
}
Task.WaitAll(t1, t2);
public List<ContextMenuResult> LoadContextMenus(Result selectedResult)
_settings.LastIndexTime = DateTime.Today; {
} var menuOptions = new List<ContextMenuResult>();
var program = selectedResult.ContextData as Programs.IProgram;
public Control CreateSettingPanel() if (program != null)
{ {
return new ProgramSetting(_context, _settings, _win32s, _uwps); menuOptions = program.ContextMenus(_context.API);
} }
public string GetTranslatedPluginTitle() return menuOptions;
{ }
return _context.API.GetTranslation("wox_plugin_program_plugin_name");
} public static void StartProcess(Func<ProcessStartInfo, Process> runProcess, ProcessStartInfo info)
{
public string GetTranslatedPluginDescription() try
{ {
return _context.API.GetTranslation("wox_plugin_program_plugin_description"); runProcess(info);
} }
catch (Exception)
public List<ContextMenuResult> LoadContextMenus(Result selectedResult) {
{ var name = "Plugin: Program";
var menuOptions = new List<ContextMenuResult>(); var message = $"Unable to start: {info.FileName}";
var program = selectedResult.ContextData as Programs.IProgram; _context.API.ShowMsg(name, message, string.Empty);
if (program != null) }
{ }
menuOptions = program.ContextMenus(_context.API);
} public void ReloadData()
{
return menuOptions; IndexPrograms();
} }
public static void StartProcess(Func<ProcessStartInfo, Process> runProcess, ProcessStartInfo info) public void UpdateSettings(PowerLauncherSettings settings)
{ {
try }
{
runProcess(info);
}
catch (Exception)
{
var name = "Plugin: Program";
var message = $"Unable to start: {info.FileName}";
_context.API.ShowMsg(name, message, string.Empty);
}
}
public void ReloadData()
{
IndexPrograms();
}
public void UpdateSettings(PowerLauncherSettings settings)
{
}
public void Dispose() public void Dispose()
{ {
@ -221,52 +199,5 @@ namespace Microsoft.Plugin.Program
} }
} }
void InitializeFileWatchers() }
{
// Create a new FileSystemWatcher and set its properties.
_watcher = new FileSystemWatcher();
var resolvedPath = Environment.ExpandEnvironmentVariables("%ProgramFiles%");
_watcher.Path = resolvedPath;
//Filter to create and deletes of 'microsoft.system.package.metadata' directories.
_watcher.NotifyFilter = NotifyFilters.DirectoryName | NotifyFilters.FileName;
_watcher.IncludeSubdirectories = true;
// Add event handlers.
_watcher.Created += OnChanged;
_watcher.Deleted += OnChanged;
// Begin watching.
_watcher.EnableRaisingEvents = true;
}
void InitializeTimer()
{
//multiple file writes occur on install / uninstall. Adding a delay before actually indexing.
var delayInterval = 5000;
_timer = new System.Timers.Timer(delayInterval);
_timer.Enabled = true;
_timer.AutoReset = false;
_timer.Elapsed += FileWatchElapsedTimer;
_timer.Stop();
}
//When a watched directory changes then reset the timer.
private void OnChanged(object source, FileSystemEventArgs e)
{
Log.Debug($"|Microsoft.Plugin.Program.Main|Directory Changed: {e.FullPath} {e.ChangeType} - Resetting timer.");
_timer.Stop();
_timer.Start();
}
private void FileWatchElapsedTimer(object sender, ElapsedEventArgs e)
{
Task.Run(() =>
{
Log.Debug($"|Microsoft.Plugin.Program.Main| ReIndexing UWP Programs");
IndexUWPPrograms();
Log.Debug($"|Microsoft.Plugin.Program.Main| Done ReIndexing");
});
}
}
} }

15
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/IPackageCatalog.cs Normal file
View File

@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Text;
using Windows.ApplicationModel;
using Windows.Foundation;
namespace Microsoft.Plugin.Program.Programs
{
internal interface IPackageCatalog
{
event TypedEventHandler<PackageCatalog, PackageInstallingEventArgs> PackageInstalling;
event TypedEventHandler<PackageCatalog, PackageUninstallingEventArgs> PackageUninstalling;
event TypedEventHandler<PackageCatalog, PackageUpdatingEventArgs> PackageUpdating;
}
}

73
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/PackageCatalogWrapper.cs Normal file
View File

@ -0,0 +1,73 @@
using System;
using System.Collections.Generic;
using System.Text;
using Windows.ApplicationModel;
using Windows.Foundation;
namespace Microsoft.Plugin.Program.Programs
{
/// <summary>
/// This is a simple wrapper class around the PackageCatalog to facilitate unit testing.
/// </summary>
internal class PackageCatalogWrapper : IPackageCatalog
{
PackageCatalog _packageCatalog;
public PackageCatalogWrapper()
{
//Opens the catalog of packages that is available for the current user.
_packageCatalog = PackageCatalog.OpenForCurrentUser();
}
//
// Summary:
// Indicates that an app package is installing.
public event TypedEventHandler<PackageCatalog, PackageInstallingEventArgs> PackageInstalling
{
add
{
_packageCatalog.PackageInstalling += value;
}
remove
{
_packageCatalog.PackageInstalling -= value;
}
}
//
// Summary:
// Indicates that an app package is uninstalling.
public event TypedEventHandler<PackageCatalog, PackageUninstallingEventArgs> PackageUninstalling
{
add
{
_packageCatalog.PackageUninstalling += value;
}
remove
{
_packageCatalog.PackageUninstalling -= value;
}
}
//
// Summary:
// Indicates that an app package is updating.
public event TypedEventHandler<PackageCatalog, PackageUpdatingEventArgs> PackageUpdating
{
add
{
_packageCatalog.PackageUpdating += value;
}
remove
{
_packageCatalog.PackageUpdating -= value;
}
}
}
}

40
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Programs/UWP.cs
View File

@ -31,7 +31,7 @@ namespace Microsoft.Plugin.Program.Programs
{ {
public string Name { get; } public string Name { get; }
public string FullName { get; } public string FullName { get; }
public string FamilyName { get; } public string FamilyName { get; }
public string Location { get; set; } public string Location { get; set; }
public Application[] Apps { get; set; } public Application[] Apps { get; set; }
@ -40,24 +40,17 @@ namespace Microsoft.Plugin.Program.Programs
public UWP(Package package) public UWP(Package package)
{ {
Location = package.InstalledLocation.Path;
Name = package.Id.Name; Name = package.Id.Name;
FullName = package.Id.FullName; FullName = package.Id.FullName;
FamilyName = package.Id.FamilyName; FamilyName = package.Id.FamilyName;
InitializeAppInfo();
Apps = Apps.Where(a =>
{
var valid =
!string.IsNullOrEmpty(a.UserModelId) &&
!string.IsNullOrEmpty(a.DisplayName);
return valid;
}).ToArray();
} }
private void InitializeAppInfo() public void InitializeAppInfo(string installedLocation)
{ {
Location = installedLocation;
AppxPackageHelper _helper = new AppxPackageHelper(); AppxPackageHelper _helper = new AppxPackageHelper();
var path = Path.Combine(Location, "AppxManifest.xml"); var path = Path.Combine(installedLocation, "AppxManifest.xml");
var namespaces = XmlNamespaces(path); var namespaces = XmlNamespaces(path);
InitPackageVersion(namespaces); InitPackageVersion(namespaces);
@ -76,9 +69,17 @@ namespace Microsoft.Plugin.Program.Programs
{ {
var app = new Application(_app, this); var app = new Application(_app, this);
apps.Add(app); apps.Add(app);
} }
Apps = apps.Where(a => a.AppListEntry != "none").ToArray(); Apps = apps.Where(a =>
{
var valid =
!string.IsNullOrEmpty(a.UserModelId) &&
!string.IsNullOrEmpty(a.DisplayName) &&
a.AppListEntry != "none";
return valid;
}).ToArray();
} }
else else
{ {
@ -154,21 +155,14 @@ namespace Microsoft.Plugin.Program.Programs
try try
{ {
u = new UWP(p); u = new UWP(p);
u.InitializeAppInfo(p.InstalledLocation.Path);
} }
#if !DEBUG
catch (Exception e) catch (Exception e)
{ {
ProgramLogger.LogException($"|UWP|All|{p.InstalledLocation}|An unexpected error occurred and " ProgramLogger.LogException($"|UWP|All|{p.InstalledLocation}|An unexpected error occurred and "
+ $"unable to convert Package to UWP for {p.Id.FullName}", e); + $"unable to convert Package to UWP for {p.Id.FullName}", e);
return new Application[] { }; return new Application[] { };
} }
#endif
#if DEBUG //make developer aware and implement handling
catch
{
throw;
}
#endif
return u.Apps; return u.Apps;
}).ToArray(); }).ToArray();

11
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Storage/IProgramRepository.cs Normal file
View File

@ -0,0 +1,11 @@
using Windows.ApplicationModel;
namespace Microsoft.Plugin.Program.Storage
{
internal interface IProgramRepository
{
void IndexPrograms();
void Load();
void Save();
}
}

89
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Storage/PackageRepository.cs Normal file
View File

@ -0,0 +1,89 @@
using Microsoft.Plugin.Program.Logger;
using Microsoft.Plugin.Program.Programs;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Windows.ApplicationModel;
using Wox.Infrastructure.Storage;
namespace Microsoft.Plugin.Program.Storage
{
/// <summary>
/// A repository for storing packaged applications such as UWP apps or appx packaged desktop apps.
/// This repository will also monitor for changes to the PackageCatelog and update the repository accordingly
/// </summary>
internal class PackageRepository : ListRepository<UWP.Application>, IProgramRepository
{
private IStorage<IList<UWP.Application>> _storage;
private IPackageCatalog _packageCatalog;
public PackageRepository(IPackageCatalog packageCatalog, IStorage<IList<UWP.Application>> storage)
{
_storage = storage ?? throw new ArgumentNullException("storage", "StorageRepository requires an initialized storage interface");
_packageCatalog = packageCatalog ?? throw new ArgumentNullException("packageCatalog", "PackageRepository expects an interface to be able to subscribe to package events");
_packageCatalog.PackageInstalling += OnPackageInstalling;
_packageCatalog.PackageUninstalling += OnPackageUninstalling;
}
public void OnPackageInstalling(PackageCatalog p, PackageInstallingEventArgs args)
{
if (args.IsComplete)
{
try
{
var uwp = new UWP(args.Package);
uwp.InitializeAppInfo(args.Package.InstalledLocation.Path);
foreach (var app in uwp.Apps)
{
Add(app);
}
}
//InitializeAppInfo will throw if there is no AppxManifest.xml for the package.
//Note there are sometimes multiple packages per product and this doesn't necessarily mean that we haven't found the app.
//eg. "Could not find file 'C:\\Program Files\\WindowsApps\\Microsoft.WindowsTerminalPreview_2020.616.45.0_neutral_~_8wekyb3d8bbwe\\AppxManifest.xml'."
catch (System.IO.FileNotFoundException e)
{
ProgramLogger.LogException($"|UWP|OnPackageInstalling|{args.Package.InstalledLocation}|{e.Message}", e);
}
}
}
public void OnPackageUninstalling(PackageCatalog p, PackageUninstallingEventArgs args)
{
if (args.Progress == 0)
{
//find apps associated with this package.
var uwp = new UWP(args.Package);
var apps = Items.Where(a => a.Package.Equals(uwp)).ToArray();
foreach (var app in apps)
{
Remove(app);
}
}
}
public void IndexPrograms()
{
var windows10 = new Version(10, 0);
var support = Environment.OSVersion.Version.Major >= windows10.Major;
var applications = support ? Programs.UWP.All() : new Programs.UWP.Application[] { };
Set(applications);
}
public void Save()
{
_storage.Save(Items);
}
public void Load()
{
var items = _storage.TryLoad(new Programs.UWP.Application[] { });
Set(items);
}
}
}

21
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Views/Commands/ProgramSettingDisplay.cs
View File

@ -61,20 +61,6 @@ namespace Microsoft.Plugin.Program.Views.Commands
Enabled = t1.Enabled Enabled = t1.Enabled
} }
)); ));
Main._uwps
.Where(t1 => !ProgramSetting.ProgramSettingDisplayList.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier))
.ToList()
.ForEach(t1 => ProgramSetting.ProgramSettingDisplayList
.Add(
new ProgramSource
{
Name = t1.DisplayName,
Location = t1.Package.Location,
UniqueIdentifier = t1.UniqueIdentifier,
Enabled = t1.Enabled
}
));
} }
internal static void SetProgramSourcesStatus(this List<ProgramSource> list, List<ProgramSource> selectedProgramSourcesToDisable, bool status) internal static void SetProgramSourcesStatus(this List<ProgramSource> list, List<ProgramSource> selectedProgramSourcesToDisable, bool status)
@ -88,11 +74,6 @@ namespace Microsoft.Plugin.Program.Views.Commands
.Where(t1 => selectedProgramSourcesToDisable.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier && t1.Enabled != status)) .Where(t1 => selectedProgramSourcesToDisable.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier && t1.Enabled != status))
.ToList() .ToList()
.ForEach(t1 => t1.Enabled = status); .ForEach(t1 => t1.Enabled = status);
Main._uwps
.Where(t1 => selectedProgramSourcesToDisable.Any(x => x.UniqueIdentifier == t1.UniqueIdentifier && t1.Enabled != status))
.ToList()
.ForEach(t1 => t1.Enabled = status);
} }
internal static void StoreDisabledInSettings(this List<ProgramSource> list) internal static void StoreDisabledInSettings(this List<ProgramSource> list)
@ -133,7 +114,7 @@ namespace Microsoft.Plugin.Program.Views.Commands
internal static bool IsReindexRequired(this List<ProgramSource> selectedItems) internal static bool IsReindexRequired(this List<ProgramSource> selectedItems)
{ {
if (selectedItems.Where(t1 => t1.Enabled && !Main._uwps.Any(x => t1.UniqueIdentifier == x.UniqueIdentifier)).Count() > 0 if (selectedItems.Where(t1 => t1.Enabled).Count() > 0
&& selectedItems.Where(t1 => t1.Enabled && !Main._win32s.Any(x => t1.UniqueIdentifier == x.UniqueIdentifier)).Count() > 0) && selectedItems.Where(t1 => t1.Enabled && !Main._win32s.Any(x => t1.UniqueIdentifier == x.UniqueIdentifier)).Count() > 0)
return true; return true;

1
src/modules/launcher/Plugins/Microsoft.Plugin.Program/Views/ProgramSetting.xaml.cs
View File

@ -51,7 +51,6 @@ namespace Microsoft.Plugin.Program.Views
Task.Run(() => Task.Run(() =>
{ {
Dispatcher.Invoke(() => { indexingPanel.Visibility = Visibility.Visible; }); Dispatcher.Invoke(() => { indexingPanel.Visibility = Visibility.Visible; });
Main.IndexPrograms();
Dispatcher.Invoke(() => { indexingPanel.Visibility = Visibility.Hidden; }); Dispatcher.Invoke(() => { indexingPanel.Visibility = Visibility.Hidden; });
}); });
} }

2
src/modules/launcher/Wox.Infrastructure/Storage/BinaryStorage.cs
View File

@ -12,7 +12,7 @@ namespace Wox.Infrastructure.Storage
/// Storage object using binary data /// Storage object using binary data
/// Normally, it has better performance, but not readable /// Normally, it has better performance, but not readable
/// </summary> /// </summary>
public class BinaryStorage<T> public class BinaryStorage<T> : IStorage<T>
{ {
// This storage helper returns whether or not to delete the binary storage items // This storage helper returns whether or not to delete the binary storage items
private static readonly int BINARY_STORAGE = 0; private static readonly int BINARY_STORAGE = 0;

16
src/modules/launcher/Wox.Infrastructure/Storage/IRepository.cs Normal file
View File

@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
namespace Wox.Infrastructure.Storage
{
public interface IRepository<T>
{
void Add(T insertedItem);
void Remove(T removedItem);
bool Contains(T item);
void Set(IList<T> list);
bool Any();
}
}

23
src/modules/launcher/Wox.Infrastructure/Storage/IStorage.cs Normal file
View File

@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
namespace Wox.Infrastructure.Storage
{
public interface IStorage<T>
{
/// <summary>
/// Saves the data
/// </summary>
/// <param name="data"></param>
void Save(T data);
/// <summary>
/// Attempts to load data, otherwise it will return the default provided
/// </summary>
/// <param name="defaultData"></param>
/// <returns>The loaded data or default</returns>
T TryLoad(T defaultData);
}
}

80
src/modules/launcher/Wox.Infrastructure/Storage/ListRepository.cs Normal file
View File

@ -0,0 +1,80 @@
using NLog.Filters;
using System;
using System.Collections;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Controls.Primitives;
using Wox.Infrastructure;
using Wox.Infrastructure.Logger;
namespace Wox.Infrastructure.Storage
{
/// <summary>
/// The intent of this class is to provide a basic subset of 'list' like operations, without exposing callers to the internal representation
/// of the data structure. Currently this is implemented as a list for it's simplicity.
/// </summary>
/// <typeparam name="T"></typeparam>
public class ListRepository<T> : IRepository<T>, IEnumerable<T>
{
public IList<T> Items { get { return _items.Values.ToList(); } }
private ConcurrentDictionary<int, T> _items = new ConcurrentDictionary<int, T>();
public ListRepository()
{
}
public void Set(IList<T> items)
{
//enforce that internal representation
_items = new ConcurrentDictionary<int, T>(items.ToDictionary( i => i.GetHashCode()));
}
public bool Any()
{
return _items.Any();
}
public void Add(T insertedItem)
{
if (!_items.TryAdd(insertedItem.GetHashCode(), insertedItem))
{
Log.Error($"|ListRepository.Add| Item Already Exists <{insertedItem}>");
}
}
public void Remove(T removedItem)
{
if (!_items.TryRemove(removedItem.GetHashCode(), out _))
{
Log.Error($"|ListRepository.Remove| Item Not Found <{removedItem}>");
}
}
public ParallelQuery<T> AsParallel()
{
return _items.Values.AsParallel();
}
public bool Contains(T item)
{
return _items.ContainsKey(item.GetHashCode());
}
public IEnumerator<T> GetEnumerator()
{
return _items.Values.GetEnumerator();
}
IEnumerator IEnumerable.GetEnumerator()
{
return _items.GetEnumerator();
}
}
}

2
src/modules/launcher/Wox.Infrastructure/StringMatcher.cs
View File

@ -2,8 +2,10 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Linq; using System.Linq;
using System.Runtime.CompilerServices;
using static Wox.Infrastructure.StringMatcher; using static Wox.Infrastructure.StringMatcher;
[assembly: InternalsVisibleToAttribute("Microsoft.Plugin.Program.UnitTests")]
namespace Wox.Infrastructure namespace Wox.Infrastructure
{ {
public class StringMatcher public class StringMatcher