Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-15 11:17:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

update packaged apps path

Browse Source
This commit is contained in:
seraphima
2024-06-26 17:40:57 +02:00
parent 18e1d851fe
commit dc9af4bc30
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/Projects/ProjectsLauncher/AppLauncher.cpp
View File

@@ -215,11 +215,8 @@ bool LaunchPackagedApp(const std::wstring& packageFullName)
} }
bool Launch(const Project::Application& app) bool Launch(const Project::Application& app)
{ {
// TODO: verify app path is up to date. bool launched { false };
// Packaged apps have version in the path, it will be outdated after update.
bool launched;
if (!app.packageFullName.empty() && app.commandLineArgs.empty()) if (!app.packageFullName.empty() && app.commandLineArgs.empty())
{ {
Logger::trace(L"Launching packaged without command line args {}", app.name); Logger::trace(L"Launching packaged without command line args {}", app.name);
@@ -257,7 +254,7 @@ bool Launch(const Project::Application& app)
return launched; return launched;
} }
void Launch(const Project& project) Project Launch(Project project)
{ {
// Get the set of windows before launching the app // Get the set of windows before launching the app
std::vector<HWND> windowsBefore = WindowEnumerator::Enumerate(WindowFilter::Filter); std::vector<HWND> windowsBefore = WindowEnumerator::Enumerate(WindowFilter::Filter);
@@ -265,8 +262,22 @@ void Launch(const Project& project)
auto apps = Utils::Apps::GetAppsList(); auto apps = Utils::Apps::GetAppsList();
auto monitors = MonitorUtils::IdentifyMonitors(); auto monitors = MonitorUtils::IdentifyMonitors();
for (const auto& app : project.apps) for (auto& app : project.apps)
{ {
// Packaged apps have version in the path, it will be outdated after update.
// We need make sure the current package is up to date.
if (!app.packageFullName.empty())
{
auto installedApp = std::find_if(apps.begin(), apps.end(), [&](const Utils::Apps::AppData& val) { return val.name == app.name; });
if (installedApp != apps.end() && app.packageFullName != installedApp->packageFullName)
{
std::wstring exeFileName = app.path.substr(app.path.find_last_of(L"\\") + 1);
app.packageFullName = installedApp->packageFullName;
app.path = installedApp->installPath + L"\\" + exeFileName;
Logger::trace(L"Updated package full name for {}: {}", app.name, app.packageFullName);
}
}
if (Launch(app)) if (Launch(app))
{ {
launchedWindows.push_back({ app, nullptr }); launchedWindows.push_back({ app, nullptr });
@@ -378,4 +389,6 @@ void Launch(const Project& project)
Logger::error(L"Failed placing {}", app.name); Logger::error(L"Failed placing {}", app.name);
} }
} }
return project;
} }

2
src/modules/Projects/ProjectsLauncher/AppLauncher.h
View File

@@ -3,4 +3,4 @@
#include <projects-common/Data.h> #include <projects-common/Data.h>
bool Launch(const Project::Application& app); bool Launch(const Project::Application& app);
void Launch(const Project& project); Project Launch(Project project);

2
src/modules/Projects/ProjectsLauncher/main.cpp
View File

@@ -76,7 +76,7 @@ int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hInstPrev, LPSTR cmdline, int cm
Logger::info(L"Launch Project {} : {}", projectToLaunch.name, projectToLaunch.id); Logger::info(L"Launch Project {} : {}", projectToLaunch.name, projectToLaunch.id);
// launch apps // launch apps
Launch(projectToLaunch); projectToLaunch = Launch(projectToLaunch);
// update last-launched time // update last-launched time
time_t launchedTime = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()); time_t launchedTime = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());