Rim/h1-mod
Rim/h1-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

tiny error msg changes

Browse Source
This commit is contained in:
m 2023-12-13 23:34:38 -06:00
parent f2fb484b57
commit 2915acf2ac
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/client/component/download.cpp
View File

@ -170,7 +170,7 @@ namespace download
auto data = utils::http::get_data(url, {}, {}, &progress_callback); auto data = utils::http::get_data(url, {}, {}, &progress_callback);
if (!data.has_value()) if (!data.has_value())
{ {
menu_error("Download failed: An unknown error occurred, please try again."); menu_error(utils::string::va("Download failed: An unknown error occurred when getting data from '%s', please try again.", url));
return; return;
} }
@ -182,6 +182,13 @@ namespace download
auto& result = data.value(); auto& result = data.value();
if (result.code != CURLE_OK) if (result.code != CURLE_OK)
{ {
if (result.code == CURLE_COULDNT_CONNECT)
{
menu_error(utils::string::va("Download failed: Couldn't connect to server '%s' (%i)\n",
url, result.code));
return;
}
menu_error(utils::string::va("Download failed: %s (%i)\n", menu_error(utils::string::va("Download failed: %s (%i)\n",
curl_easy_strerror(result.code), result.code)); curl_easy_strerror(result.code), result.code));
return; return;
@ -189,7 +196,7 @@ namespace download
if (result.response_code >= 400) if (result.response_code >= 400)
{ {
menu_error(utils::string::va("Download failed: Server returned bad response code %i\n", menu_error(utils::string::va("Download failed: Server returned bad response code (%i)\n",
result.response_code)); result.response_code));
return; return;
} }
@ -197,7 +204,7 @@ namespace download
const auto hash = utils::hash::get_buffer_hash(result.buffer, file.name); const auto hash = utils::hash::get_buffer_hash(result.buffer, file.name);
if (hash != file.hash) if (hash != file.hash)
{ {
menu_error(utils::string::va("Download failed: file hash doesn't match the server's (%s: %s != %s)\n", menu_error(utils::string::va("Download failed: File hash doesn't match the server's (%s: %s != %s)\n",
file.name.data(), hash.data(), file.hash.data())); file.name.data(), hash.data(), file.hash.data()));
return; return;
} }
@ -233,7 +240,7 @@ namespace download
scheduler::once([] scheduler::once([]
{ {
ui_scripting::notify("mod_download_done", {}); ui_scripting::notify("mod_download_done", {});
party::menu_error("Download for server mod has been cancelled."); party::menu_error("Download failed: Aborted");
}, scheduler::pipeline::lui); }, scheduler::pipeline::lui);
} }