Rim/t7x
Rim/t7x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix cleanup

Browse Source
This commit is contained in:
Maurice Heumann 2023-02-23 19:23:24 +01:00
parent 4b0e45fb6a
commit 56d7869a21
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/client/updater/file_updater.cpp
View File

@ -335,11 +335,11 @@ namespace updater
return; return;
} }
this->cleanup_root_directory(); this->cleanup_root_directory(files);
this->cleanup_data_directory(files); this->cleanup_data_directory(files);
} }
void file_updater::cleanup_root_directory() const void file_updater::cleanup_root_directory(const std::vector<file_info>& files) const
{ {
const auto existing_files = utils::io::list_files(this->base_); const auto existing_files = utils::io::list_files(this->base_);
for (const auto& file : existing_files) for (const auto& file : existing_files)
@ -350,10 +350,23 @@ namespace updater
continue; continue;
} }
bool found = false;
for (const auto& wantedFile : files)
{
if (wantedFile.name == entry)
{
found = true;
break;
}
}
if (!found)
{
std::error_code code{}; std::error_code code{};
std::filesystem::remove_all(file, code); std::filesystem::remove_all(file, code);
} }
} }
}
void file_updater::cleanup_data_directory(const std::vector<file_info>& files) const void file_updater::cleanup_data_directory(const std::vector<file_info>& files) const
{ {

2
src/client/updater/file_updater.hpp
View File

@ -34,7 +34,7 @@ namespace updater
void delete_old_process_file() const; void delete_old_process_file() const;
void cleanup_directories(const std::vector<file_info>& files) const; void cleanup_directories(const std::vector<file_info>& files) const;
void cleanup_root_directory() const; void cleanup_root_directory(const std::vector<file_info>& files) const;
void cleanup_data_directory(const std::vector<file_info>& files) const; void cleanup_data_directory(const std::vector<file_info>& files) const;
}; };
} }