alterware/aw-installer
1
0
Fork 0
mirror of https://github.com/alterware/aw-installer.git synced 2025-04-19 08:02:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

maint: refactor filesystem code

Browse Source
This commit is contained in:
6arelyFuture 2025-01-27 19:48:10 +01:00
parent fe27fcd762
commit 1cb507571b
Signed by: Future
GPG Key ID: F2000F181A4F7C85
1 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/updater/file_updater.cpp
View File

@ -30,14 +30,14 @@ namespace updater
return {}; return {};
} }
if (release_json.HasMember("tag_name") && release_json["tag_name"].IsString()) if (!release_json.HasMember("tag_name") || !release_json["tag_name"].IsString())
{ {
const auto* tag_name = release_json["tag_name"].GetString(); console::error("Remote JSON response from \"%s\" does not contain the data we expected", release_url.c_str());
return tag_name; return {};
} }
console::error("Remote JSON response from \"%s\" does not contain the data we expected", release_url.c_str()); const auto* tag_name = release_json["tag_name"].GetString();
return {}; return tag_name;
} }
} }
@ -145,7 +145,7 @@ namespace updater
void file_updater::create_version_file(const std::string& revision_version) const void file_updater::create_version_file(const std::string& revision_version) const
{ {
console::info("Creating version file \"%s\". Revision is \"%s\"", this->version_file_.c_str(), revision_version.c_str()); console::info("Creating version file \"%s\". Revision is \"%s\"", this->version_file_.string().c_str(), revision_version.c_str());
rapidjson::Document doc{}; rapidjson::Document doc{};
doc.SetObject(); doc.SetObject();
@ -183,8 +183,14 @@ namespace updater
return false; return false;
} }
// Download the files in the working directory, move them later. // Download the files in the temp directory, move them later.
const auto out_file = std::filesystem::current_path() / this->out_name_; std::error_code ec;
const auto out_file = std::filesystem::temp_directory_path(ec) / this->out_name_;
if (ec)
{
console::error("Got error \"%s\" while trying to get the temp dir", ec.message().c_str());
return false;
}
console::info("Writing file to \"%s\"", out_file.string().c_str()); console::info("Writing file to \"%s\"", out_file.string().c_str());
@ -201,31 +207,47 @@ namespace updater
// Not a fan of using exceptions here. Once C++23 is more widespread I'd like to use <expected> // Not a fan of using exceptions here. Once C++23 is more widespread I'd like to use <expected>
bool file_updater::deploy_files() const bool file_updater::deploy_files() const
{ {
const auto out_dir = std::filesystem::current_path() / ".out"; std::error_code ec;
const auto out_dir = std::filesystem::temp_directory_path(ec) / ".out";
assert(utils::io::file_exists(this->out_name_.string())); if (ec)
// Always try to cleanup
const auto _ = gsl::finally([this, &out_dir]() -> void
{ {
utils::io::remove_file(this->out_name_.string()); console::error("Got error \"%s\" while trying to get the temp dir", ec.message().c_str());
return false;
}
const auto out_file = std::filesystem::temp_directory_path(ec) / this->out_name_;
if (ec)
{
console::error("Got error \"%s\" while trying to get the temp dir", ec.message().c_str());
return false;
}
assert(utils::io::file_exists(out_file.string()));
// Always try to clean-up
const auto _ = gsl::finally([&out_dir, &out_file, &ec]() -> void
{
utils::io::remove_file(out_file.string());
std::error_code ec;
std::filesystem::remove_all(out_dir, ec); std::filesystem::remove_all(out_dir, ec);
if (ec)
{
console::error("Got error \"%s\" while trying to clean-up the temp dir", ec.message().c_str());
}
}); });
try try
{ {
utils::io::create_directory(out_dir); utils::io::create_directory(out_dir);
utils::compression::zip::archive::decompress(this->out_name_.string(), out_dir); utils::compression::zip::archive::decompress(out_file.string(), out_dir);
} }
catch (const std::exception& ex) catch (const std::exception& ex)
{ {
console::error("Get error \"%s\" while decompressing \"%s\"", ex.what(), this->out_name_.string().c_str()); console::error("Got error \"%s\" while decompressing \"%s\"", ex.what(), out_file.string().c_str());
return false; return false;
} }
console::info("\"%s\" was decompressed. Removing files that must be skipped", this->out_name_.string().c_str()); console::info("\"%s\" was decompressed. Removing files that must be skipped", out_file.string().c_str());
this->skip_files(out_dir); this->skip_files(out_dir);
console::info("Deploying files to \"%s\"", this->base_.string().c_str()); console::info("Deploying files to \"%s\"", this->base_.string().c_str());