mir/PowerToys
2
0
Fork 0
mirror of https://github.com/microsoft/PowerToys synced 2025-08-31 06:25:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

updating: show the reason why the update couldn't be completed

Browse Source 
- include nonstd::expected library for modern error-handling
- add localized strings
- refactor updating.cpp
This commit is contained in:
yuyoyuppe
2020-11-18 17:31:15 +03:00
committed by Andrey Nekrasov
parent 63ce7ca981
commit 289532d7c8
14 changed files with 158 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/actions/spell-check/expect.txt vendored
View File

@@ -1327,6 +1327,7 @@ MAPTOSAMESHORTCUT
MAPVK MAPVK
Markdig Markdig
martinchrzan martinchrzan
martinmoene
MATCHALLOCCURENCES MATCHALLOCCURENCES
MATCHMODE MATCHMODE
MAXIMIZEBOX MAXIMIZEBOX
@@ -1504,6 +1505,7 @@ nonclient
NONCONVERT NONCONVERT
NONELEVATED NONELEVATED
NONINFRINGEMENT NONINFRINGEMENT
nonstd
nonwin nonwin
NOOWNERZORDER NOOWNERZORDER
NOPARENTNOTIFY NOPARENTNOTIFY
@@ -1573,6 +1575,7 @@ Onboarding
onebranch onebranch
onedrive onedrive
onedrivelogo onedrivelogo
onstd
ONITEM ONITEM
OOBE OOBE
opencode opencode
@@ -2148,6 +2151,7 @@ subfolder
Subheader Subheader
subkey subkey
SUBLANG SUBLANG
sublicensable
subquery subquery
subsetted subsetted
subsetter subsetter

4
.gitmodules vendored
View File

@@ -5,3 +5,7 @@
[submodule "deps/cxxopts"] [submodule "deps/cxxopts"]
path = deps/cxxopts path = deps/cxxopts
url = https://github.com/jarro2783/cxxopts.git url = https://github.com/jarro2783/cxxopts.git
[submodule "deps/expected-lite"]
path = deps/expected-lite
url = https://github.com/martinmoene/expected-lite.git

32
NOTICE.md
View File

@@ -153,7 +153,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
## PowerToy: Installer ## PowerToy: Installer/Runner
### spdlog ### spdlog
**Source**: https://github.com/gabime/spdlog **Source**: https://github.com/gabime/spdlog
@@ -207,3 +207,33 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
### expected-lite
**Source**: https://github.com/martinmoene/expected-lite
Boost Software License - Version 1.0 - August 17th, 2003
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:
The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

1
deps/expected-lite vendored Submodule

Submodule deps/expected-lite added at 076e96f683

8
deps/expected.props vendored Normal file
View File

@@ -0,0 +1,8 @@
<Project>
<Import Project="restore_git_submodules.props" Condition="'$(RestoreGitSubmodulesImported)' == ''" />
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)expected-lite\include\nonstd\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
</Project>

11
installer/PowerToysBootstrapper/bootstrapper/Resources.resx
View File

@@ -88,7 +88,7 @@
<data name="GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT" xml:space="preserve"> <data name="GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT" xml:space="preserve">
<value>An update to PowerToys is available. Visit our GitHub page to update.</value> <value>An update to PowerToys is available. Visit our GitHub page to update.</value>
</data> </data>
<data name="GITHUB_NEW_VERSION_UNAVAILABLE" xml:space="preserve"> <data name="GITHUB_NEW_VERSION_UP_TO_DATE" xml:space="preserve">
<value>PowerToys is up to date.</value> <value>PowerToys is up to date.</value>
</data> </data>
<data name="GITHUB_NEW_VERSION_VISIT" xml:space="preserve"> <data name="GITHUB_NEW_VERSION_VISIT" xml:space="preserve">
@@ -153,5 +153,12 @@
</data> </data>
<data name="SNOOZE_BUTTON" xml:space="preserve"> <data name="SNOOZE_BUTTON" xml:space="preserve">
<value>Snooze</value> <value>Snooze</value>
</data>
<data name="GITHUB_NEW_VERSION_USING_LOCAL_BUILD_ERROR" xml:space="preserve">
<value>Updating from a local build is not supported.</value>
<comment>User cannot autoupdate from a locally-built PowerToys version</comment>
</data>
<data name="GITHUB_NEW_VERSION_CHECK_ERROR" xml:space="preserve">
<value>Failed to connect to the server. Check your network connection or retry later.</value>
</data> </data>
</root> </root>

11
src/action_runner/Resources.resx
View File

@@ -88,7 +88,7 @@
<data name="GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT" xml:space="preserve"> <data name="GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT" xml:space="preserve">
<value>An update to PowerToys is available. Visit our GitHub page to update.</value> <value>An update to PowerToys is available. Visit our GitHub page to update.</value>
</data> </data>
<data name="GITHUB_NEW_VERSION_UNAVAILABLE" xml:space="preserve"> <data name="GITHUB_NEW_VERSION_UP_TO_DATE" xml:space="preserve">
<value>PowerToys is up to date.</value> <value>PowerToys is up to date.</value>
</data> </data>
<data name="GITHUB_NEW_VERSION_VISIT" xml:space="preserve"> <data name="GITHUB_NEW_VERSION_VISIT" xml:space="preserve">
@@ -126,5 +126,12 @@
</data> </data>
<data name="SNOOZE_BUTTON" xml:space="preserve"> <data name="SNOOZE_BUTTON" xml:space="preserve">
<value>Snooze</value> <value>Snooze</value>
</data>
<data name="GITHUB_NEW_VERSION_USING_LOCAL_BUILD_ERROR" xml:space="preserve">
<value>Updating from a local build is not supported.</value>
<comment>User cannot autoupdate from a locally-built PowerToys version</comment>
</data>
<data name="GITHUB_NEW_VERSION_CHECK_ERROR" xml:space="preserve">
<value>Failed to connect to the server. Check your network connection or retry later.</value>
</data> </data>
</root> </root>

8
src/common/updating/notifications.cpp
View File

@@ -22,13 +22,12 @@ namespace updating
return current_version_to_next_version; return current_version_to_next_version;
} }
void show_unavailable(const notifications::strings& strings) void show_unavailable(const notifications::strings& strings, std::wstring reason)
{ {
remove_toasts(UPDATING_PROCESS_TOAST_TAG); remove_toasts(UPDATING_PROCESS_TOAST_TAG);
toast_params toast_params{ UPDATING_PROCESS_TOAST_TAG, false }; toast_params toast_params{ UPDATING_PROCESS_TOAST_TAG, false };
std::wstring contents = strings.GITHUB_NEW_VERSION_UNAVAILABLE; show_toast(std::move(reason), strings.TOAST_TITLE, std::move(toast_params));
show_toast(std::move(contents), strings.TOAST_TITLE, std::move(toast_params));
} }
void show_available(const updating::new_version_download_info& info, const notifications::strings& strings) void show_available(const updating::new_version_download_info& info, const notifications::strings& strings)
@@ -120,8 +119,7 @@ namespace updating
strings.GITHUB_NEW_VERSION_SNOOZE_TITLE, strings.GITHUB_NEW_VERSION_SNOOZE_TITLE,
{ { strings.GITHUB_NEW_VERSION_UPDATE_SNOOZE_1D, 24 * 60 }, { { strings.GITHUB_NEW_VERSION_UPDATE_SNOOZE_1D, 24 * 60 },
{ strings.GITHUB_NEW_VERSION_UPDATE_SNOOZE_5D, 120 * 60 } }, { strings.GITHUB_NEW_VERSION_UPDATE_SNOOZE_5D, 120 * 60 } },
strings.SNOOZE_BUTTON strings.SNOOZE_BUTTON } },
} },
std::move(toast_params)); std::move(toast_params));
} }

84
src/common/updating/notifications.h
View File

@@ -10,30 +10,36 @@ namespace updating
{ {
struct strings struct strings
{ {
std::wstring DOWNLOAD_COMPLETE;
std::wstring DOWNLOAD_IN_PROGRESS;
std::wstring GITHUB_NEW_VERSION_ABORT;
std::wstring GITHUB_NEW_VERSION_AVAILABLE; std::wstring GITHUB_NEW_VERSION_AVAILABLE;
std::wstring GITHUB_NEW_VERSION_DOWNLOAD_STARTED; std::wstring GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT;
std::wstring GITHUB_NEW_VERSION_READY_TO_INSTALL; std::wstring GITHUB_NEW_VERSION_CHECK_ERROR;
std::wstring GITHUB_NEW_VERSION_DOWNLOAD_INSTALL_ERROR; std::wstring GITHUB_NEW_VERSION_DOWNLOAD_INSTALL_ERROR;
std::wstring GITHUB_NEW_VERSION_DOWNLOAD_STARTED;
std::wstring GITHUB_NEW_VERSION_MORE_INFO;
std::wstring GITHUB_NEW_VERSION_READY_TO_INSTALL;
std::wstring GITHUB_NEW_VERSION_SNOOZE_TITLE;
std::wstring GITHUB_NEW_VERSION_UP_TO_DATE;
std::wstring GITHUB_NEW_VERSION_UPDATE_NOW; std::wstring GITHUB_NEW_VERSION_UPDATE_NOW;
std::wstring GITHUB_NEW_VERSION_UPDATE_AFTER_RESTART; std::wstring GITHUB_NEW_VERSION_UPDATE_AFTER_RESTART;
std::wstring UNINSTALLATION_UNKNOWN_ERROR;
std::wstring GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT;
std::wstring GITHUB_NEW_VERSION_UNAVAILABLE;
std::wstring GITHUB_NEW_VERSION_VISIT;
std::wstring GITHUB_NEW_VERSION_MORE_INFO;
std::wstring GITHUB_NEW_VERSION_ABORT;
std::wstring GITHUB_NEW_VERSION_SNOOZE_TITLE;
std::wstring SNOOZE_BUTTON;
std::wstring GITHUB_NEW_VERSION_UPDATE_SNOOZE_1D; std::wstring GITHUB_NEW_VERSION_UPDATE_SNOOZE_1D;
std::wstring GITHUB_NEW_VERSION_UPDATE_SNOOZE_5D; std::wstring GITHUB_NEW_VERSION_UPDATE_SNOOZE_5D;
std::wstring DOWNLOAD_IN_PROGRESS; std::wstring GITHUB_NEW_VERSION_USING_LOCAL_BUILD_ERROR;
std::wstring DOWNLOAD_COMPLETE; std::wstring GITHUB_NEW_VERSION_VISIT;
std::wstring TOAST_TITLE;
std::wstring OFFER_UNINSTALL_MSI; std::wstring OFFER_UNINSTALL_MSI;
std::wstring OFFER_UNINSTALL_MSI_TITLE; std::wstring OFFER_UNINSTALL_MSI_TITLE;
std::wstring SNOOZE_BUTTON;
std::wstring TOAST_TITLE;
std::wstring UNINSTALLATION_UNKNOWN_ERROR;
}; };
void show_unavailable(const notifications::strings& strings); void show_unavailable(const notifications::strings& strings, std::wstring reason);
void show_available(const updating::new_version_download_info& info, const strings&); void show_available(const updating::new_version_download_info& info, const strings&);
void show_download_start(const updating::new_version_download_info& info, const strings&); void show_download_start(const updating::new_version_download_info& info, const strings&);
void show_visit_github(const updating::new_version_download_info& info, const strings&); void show_visit_github(const updating::new_version_download_info& info, const strings&);
@@ -45,28 +51,30 @@ namespace updating
} }
} }
#define create_notifications_strings() \ #define create_notifications_strings() \
::updating::notifications::strings \ ::updating::notifications::strings \
{ \ { \
.GITHUB_NEW_VERSION_AVAILABLE = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_AVAILABLE), \ .DOWNLOAD_COMPLETE = GET_RESOURCE_STRING(IDS_DOWNLOAD_COMPLETE), \
.GITHUB_NEW_VERSION_DOWNLOAD_STARTED = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_DOWNLOAD_STARTED), \ .DOWNLOAD_IN_PROGRESS = GET_RESOURCE_STRING(IDS_DOWNLOAD_IN_PROGRESS), \
.GITHUB_NEW_VERSION_READY_TO_INSTALL = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_READY_TO_INSTALL), \ .GITHUB_NEW_VERSION_ABORT = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_ABORT), \
.GITHUB_NEW_VERSION_DOWNLOAD_INSTALL_ERROR = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_DOWNLOAD_INSTALL_ERROR), \ .GITHUB_NEW_VERSION_AVAILABLE = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_AVAILABLE), \
.GITHUB_NEW_VERSION_UPDATE_NOW = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_UPDATE_NOW), \ .GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT), \
.GITHUB_NEW_VERSION_UPDATE_AFTER_RESTART = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_UPDATE_AFTER_RESTART), \ .GITHUB_NEW_VERSION_CHECK_ERROR = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_CHECK_ERROR), \
.UNINSTALLATION_UNKNOWN_ERROR = GET_RESOURCE_STRING(IDS_UNINSTALLATION_UNKNOWN_ERROR), \ .GITHUB_NEW_VERSION_DOWNLOAD_INSTALL_ERROR = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_DOWNLOAD_INSTALL_ERROR), \
.GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT), \ .GITHUB_NEW_VERSION_DOWNLOAD_STARTED = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_DOWNLOAD_STARTED), \
.GITHUB_NEW_VERSION_UNAVAILABLE = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_UNAVAILABLE), \ .GITHUB_NEW_VERSION_MORE_INFO = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_MORE_INFO), \
.GITHUB_NEW_VERSION_VISIT = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_VISIT), \ .GITHUB_NEW_VERSION_READY_TO_INSTALL = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_READY_TO_INSTALL), \
.GITHUB_NEW_VERSION_MORE_INFO = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_MORE_INFO), \ .GITHUB_NEW_VERSION_SNOOZE_TITLE = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_SNOOZE_TITLE), \
.GITHUB_NEW_VERSION_ABORT = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_ABORT), \ .GITHUB_NEW_VERSION_UP_TO_DATE = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_UP_TO_DATE), \
.GITHUB_NEW_VERSION_SNOOZE_TITLE = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_SNOOZE_TITLE), \ .GITHUB_NEW_VERSION_UPDATE_NOW = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_UPDATE_NOW), \
.SNOOZE_BUTTON = GET_RESOURCE_STRING(IDS_SNOOZE_BUTTON), \ .GITHUB_NEW_VERSION_UPDATE_AFTER_RESTART = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_UPDATE_AFTER_RESTART), \
.GITHUB_NEW_VERSION_UPDATE_SNOOZE_1D = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_UPDATE_SNOOZE_1D), \ .GITHUB_NEW_VERSION_UPDATE_SNOOZE_1D = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_UPDATE_SNOOZE_1D), \
.GITHUB_NEW_VERSION_UPDATE_SNOOZE_5D = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_UPDATE_SNOOZE_5D), \ .GITHUB_NEW_VERSION_UPDATE_SNOOZE_5D = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_UPDATE_SNOOZE_5D), \
.DOWNLOAD_IN_PROGRESS = GET_RESOURCE_STRING(IDS_DOWNLOAD_IN_PROGRESS), \ .GITHUB_NEW_VERSION_USING_LOCAL_BUILD_ERROR = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_USING_LOCAL_BUILD_ERROR), \
.DOWNLOAD_COMPLETE = GET_RESOURCE_STRING(IDS_DOWNLOAD_COMPLETE), \ .GITHUB_NEW_VERSION_VISIT = GET_RESOURCE_STRING(IDS_GITHUB_NEW_VERSION_VISIT), \
.TOAST_TITLE = GET_RESOURCE_STRING(IDS_TOAST_TITLE), \ .OFFER_UNINSTALL_MSI = GET_RESOURCE_STRING(IDS_OFFER_UNINSTALL_MSI), \
.OFFER_UNINSTALL_MSI = GET_RESOURCE_STRING(IDS_OFFER_UNINSTALL_MSI), \ .OFFER_UNINSTALL_MSI_TITLE = GET_RESOURCE_STRING(IDS_OFFER_UNINSTALL_MSI_TITLE), \
.OFFER_UNINSTALL_MSI_TITLE = GET_RESOURCE_STRING(IDS_OFFER_UNINSTALL_MSI_TITLE) \ .SNOOZE_BUTTON = GET_RESOURCE_STRING(IDS_SNOOZE_BUTTON), \
.TOAST_TITLE = GET_RESOURCE_STRING(IDS_TOAST_TITLE), \
.UNINSTALLATION_UNKNOWN_ERROR = GET_RESOURCE_STRING(IDS_UNINSTALLATION_UNKNOWN_ERROR) \
} }

1
src/common/updating/pch.h
View File

@@ -15,5 +15,6 @@
#include <ShlObj_core.h> #include <ShlObj_core.h>
#include <shellapi.h> #include <shellapi.h>
#include <filesystem> #include <filesystem>
#include <expected.hpp>
#endif //PCH_H #endif //PCH_H

62
src/common/updating/updating.cpp
View File

@@ -28,12 +28,12 @@ namespace // Strings in this namespace should not be localized
namespace updating namespace updating
{ {
std::future<std::optional<new_version_download_info>> get_new_github_version_info_async() std::future<nonstd::expected<new_version_download_info, std::wstring>> get_new_github_version_info_async(const notifications::strings& strings)
{ {
// If the current version starts with 0.0.*, it means we're on a local build from a farm and shouldn't check for updates. // If the current version starts with 0.0.*, it means we're on a local build from a farm and shouldn't check for updates.
if (VERSION_MAJOR == 0 && VERSION_MINOR == 0) if (VERSION_MAJOR == 0 && VERSION_MINOR == 0)
{ {
co_return std::nullopt; co_return nonstd::make_unexpected(strings.GITHUB_NEW_VERSION_USING_LOCAL_BUILD_ERROR);
} }
try try
{ {
@@ -46,39 +46,37 @@ namespace updating
VersionHelper github_version(winrt::to_string(new_version)); VersionHelper github_version(winrt::to_string(new_version));
VersionHelper current_version(VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION); VersionHelper current_version(VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION);
if (github_version > current_version) if (github_version <= current_version)
{ {
const std::wstring_view required_architecture = get_architecture_string(get_current_architecture()); co_return nonstd::make_unexpected(strings.GITHUB_NEW_VERSION_UP_TO_DATE);
constexpr const std::wstring_view required_filename_pattern = updating::INSTALLER_FILENAME_PATTERN; }
// Desc-sorted by its priority
const std::array<std::wstring_view, 2> asset_extensions = { L".exe", L".msi" };
for (const auto asset_extension : asset_extensions)
{
for (auto asset_elem : json_body.GetNamedArray(L"assets"))
{
auto asset{ asset_elem.GetObjectW() };
std::wstring filename_lower = asset.GetNamedString(L"name", {}).c_str();
std::transform(begin(filename_lower), end(filename_lower), begin(filename_lower), ::towlower);
const bool extension_matched = filename_lower.ends_with(asset_extension); const std::wstring_view required_architecture = get_architecture_string(get_current_architecture());
const bool architecture_matched = filename_lower.find(required_architecture) != std::wstring::npos; constexpr const std::wstring_view required_filename_pattern = updating::INSTALLER_FILENAME_PATTERN;
const bool filename_matched = filename_lower.find(required_filename_pattern) != std::wstring::npos; // Desc-sorted by its priority
if (extension_matched && architecture_matched && filename_matched) const std::array<std::wstring_view, 2> asset_extensions = { L".exe", L".msi" };
{ for (const auto asset_extension : asset_extensions)
winrt::Windows::Foundation::Uri msi_download_url{ asset.GetNamedString(L"browser_download_url") }; {
co_return new_version_download_info{ std::move(release_page_uri), new_version.c_str(), std::move(msi_download_url), std::move(filename_lower) }; for (auto asset_elem : json_body.GetNamedArray(L"assets"))
} {
auto asset{ asset_elem.GetObjectW() };
std::wstring filename_lower = asset.GetNamedString(L"name", {}).c_str();
std::transform(begin(filename_lower), end(filename_lower), begin(filename_lower), ::towlower);
const bool extension_matched = filename_lower.ends_with(asset_extension);
const bool architecture_matched = filename_lower.find(required_architecture) != std::wstring::npos;
const bool filename_matched = filename_lower.find(required_filename_pattern) != std::wstring::npos;
if (extension_matched && architecture_matched && filename_matched)
{
winrt::Windows::Foundation::Uri msi_download_url{ asset.GetNamedString(L"browser_download_url") };
co_return new_version_download_info{ std::move(release_page_uri), new_version.c_str(), std::move(msi_download_url), std::move(filename_lower) };
} }
} }
} }
else
{
co_return std::nullopt;
}
} }
catch (...) catch (...)
{ {
co_return std::nullopt; co_return nonstd::make_unexpected(strings.GITHUB_NEW_VERSION_CHECK_ERROR);
} }
} }
@@ -106,7 +104,7 @@ namespace updating
std::future<void> try_autoupdate(const bool download_updates_automatically, const notifications::strings& strings) std::future<void> try_autoupdate(const bool download_updates_automatically, const notifications::strings& strings)
{ {
const auto new_version = co_await get_new_github_version_info_async(); const auto new_version = co_await get_new_github_version_info_async(strings);
if (!new_version) if (!new_version)
{ {
co_return; co_return;
@@ -146,10 +144,10 @@ namespace updating
std::future<std::wstring> check_new_version_available(const notifications::strings& strings) std::future<std::wstring> check_new_version_available(const notifications::strings& strings)
{ {
const auto new_version = co_await get_new_github_version_info_async(); auto new_version = co_await get_new_github_version_info_async(strings);
if (!new_version) if (!new_version)
{ {
updating::notifications::show_unavailable(strings); updating::notifications::show_unavailable(strings, std::move(new_version.error()));
co_return VersionHelper{ VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION }.toWstring(); co_return VersionHelper{ VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION }.toWstring();
} }
@@ -159,7 +157,7 @@ namespace updating
std::future<std::wstring> download_update(const notifications::strings& strings) std::future<std::wstring> download_update(const notifications::strings& strings)
{ {
const auto new_version = co_await get_new_github_version_info_async(); const auto new_version = co_await get_new_github_version_info_async(strings);
if (!new_version) if (!new_version)
{ {
co_return L""; co_return L"";
@@ -185,4 +183,4 @@ namespace updating
co_return new_version->installer_filename; co_return new_version->installer_filename;
} }
} }

5
src/common/updating/updating.h
View File

@@ -13,13 +13,12 @@ namespace updating
{ {
struct new_version_download_info struct new_version_download_info
{ {
winrt::Windows::Foundation::Uri release_page_uri; winrt::Windows::Foundation::Uri release_page_uri = nullptr;
std::wstring version_string; std::wstring version_string;
winrt::Windows::Foundation::Uri installer_download_url; winrt::Windows::Foundation::Uri installer_download_url = nullptr;
std::wstring installer_filename; std::wstring installer_filename;
}; };
std::future<std::optional<new_version_download_info>> get_new_github_version_info_async();
std::future<void> try_autoupdate(const bool download_updates_automatically, const notifications::strings&); std::future<void> try_autoupdate(const bool download_updates_automatically, const notifications::strings&);
std::filesystem::path get_pending_updates_path(); std::filesystem::path get_pending_updates_path();

1
src/common/updating/updating.vcxproj
View File

@@ -28,6 +28,7 @@
<ProjectName>updating</ProjectName> <ProjectName>updating</ProjectName>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="..\..\..\deps\expected.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>

11
src/runner/Resources.resx
View File

@@ -115,7 +115,7 @@
<data name="GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT" xml:space="preserve"> <data name="GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT" xml:space="preserve">
<value>An update to PowerToys is available. Visit our GitHub page to update.</value> <value>An update to PowerToys is available. Visit our GitHub page to update.</value>
</data> </data>
<data name="GITHUB_NEW_VERSION_UNAVAILABLE" xml:space="preserve"> <data name="GITHUB_NEW_VERSION_UP_TO_DATE" xml:space="preserve">
<value>PowerToys is up to date.</value> <value>PowerToys is up to date.</value>
</data> </data>
<data name="GITHUB_NEW_VERSION_VISIT" xml:space="preserve"> <data name="GITHUB_NEW_VERSION_VISIT" xml:space="preserve">
@@ -160,5 +160,12 @@
<data name="EXIT_MENU_TEXT" xml:space="preserve"> <data name="EXIT_MENU_TEXT" xml:space="preserve">
<value>Exit</value> <value>Exit</value>
<comment>Exit as a verb, as in Exit the application</comment> <comment>Exit as a verb, as in Exit the application</comment>
</data> </data>
<data name="GITHUB_NEW_VERSION_USING_LOCAL_BUILD_ERROR" xml:space="preserve">
<value>Updating from a local build is not supported.</value>
<comment>User cannot autoupdate from a locally-built PowerToys version</comment>
</data>
<data name="GITHUB_NEW_VERSION_CHECK_ERROR" xml:space="preserve">
<value>Failed to connect to the server. Check your network connection or retry later.</value>
</data>
</root> </root>