Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[Download]: Use auto keyword

Browse Source
This commit is contained in:
FutureRave 2022-12-01 18:33:32 +00:00
parent becfbe42fa
commit 2ef78d5042
No known key found for this signature in database
GPG Key ID: 22F9079C86CFAB31
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Components/Modules/Download.cpp
View File

@ -119,7 +119,7 @@ namespace Components
auto file = download->files[index]; auto file = download->files[index];
std::string path = download->mod + "/" + file.name; auto path = download->mod + "/" + file.name;
if (download->isMap) if (download->isMap)
{ {
path = "usermaps/" + path; path = "usermaps/" + path;
@ -127,8 +127,7 @@ namespace Components
if (Utils::IO::FileExists(path)) if (Utils::IO::FileExists(path))
{ {
std::string data = Utils::IO::ReadFile(path); auto data = Utils::IO::ReadFile(path);
if (data.size() == file.size && Utils::String::DumpHex(Utils::Cryptography::SHA256::Compute(data), "") == file.hash) if (data.size() == file.size && Utils::String::DumpHex(Utils::Cryptography::SHA256::Compute(data), "") == file.hash)
{ {
download->totalBytes += file.size; download->totalBytes += file.size;
@ -233,11 +232,11 @@ namespace Components
{ {
if (!download) download = &CLDownload; if (!download) download = &CLDownload;
std::string host = "http://" + download->target.getString(); auto host = "http://" + download->target.getString();
std::string listUrl = host + (download->isMap ? "/map" : "/list") + (download->isPrivate ? ("?password=" + download->hashedPassword) : ""); auto listUrl = host + (download->isMap ? "/map" : "/list") + (download->isPrivate ? ("?password=" + download->hashedPassword) : "");
std::string list = Utils::WebIO("IW4x", listUrl).setTimeout(5000)->get(); auto list = Utils::WebIO("IW4x", listUrl).setTimeout(5000)->get();
if (list.empty()) if (list.empty())
{ {
if (download->terminateThread) return; if (download->terminateThread) return;
@ -472,7 +471,7 @@ namespace Components
} }
std::unordered_map<std::string, nlohmann::json> jsonFileList; std::unordered_map<std::string, nlohmann::json> jsonFileList;
std::string fileBuffer = Utils::IO::ReadFile(filename.generic_string()); auto fileBuffer = Utils::IO::ReadFile(filename.generic_string());
if (fileBuffer.empty()) if (fileBuffer.empty())
{ {
continue; continue;
@ -516,7 +515,7 @@ namespace Components
const auto filename = std::format("{}\\{}{}", path.generic_string(), mapName, Maps::UserMapFiles[i]); const auto filename = std::format("{}\\{}{}", path.generic_string(), mapName, Maps::UserMapFiles[i]);
std::unordered_map<std::string, nlohmann::json> file; std::unordered_map<std::string, nlohmann::json> file;
std::string fileBuffer = Utils::IO::ReadFile(filename); auto fileBuffer = Utils::IO::ReadFile(filename);
if (fileBuffer.empty()) if (fileBuffer.empty())
{ {
continue; continue;