cemu-project/vcpkg
1
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2024-12-03 16:52:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

get_installed_files() now filters out the directories

Browse Source
This commit is contained in:
Alexander Karatarakis 2016-12-01 20:39:28 -08:00
parent a8c189c3f2
commit a195dedf52
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolsrc/src/commands_installation.cpp
View File

@ -170,7 +170,7 @@ namespace vcpkg
std::vector<std::string> installed_files = extract_files_in_triplet(pgh_and_files, triplet);
const size_t installed_remove_char_count = triplet.canonical_name().size() + 1; // +1 for the slash
remove_first_n_chars(&installed_files, installed_remove_char_count);
std::sort(installed_files.begin(), installed_files.end());
std::sort(installed_files.begin(), installed_files.end()); // Should already be sorted
std::vector<std::string> intersection;
std::set_intersection(package_files.cbegin(), package_files.cend(),

26
toolsrc/src/vcpkg.cpp
View File

@ -111,6 +111,8 @@ void vcpkg::write_update(const vcpkg_paths& paths, const StatusParagraph& p)
std::vector<StatusParagraph_and_associated_files> vcpkg::get_installed_files(const vcpkg_paths& paths, const StatusParagraphs& status_db)
{
static const std::string MARK_FOR_REMOVAL = "";
std::vector<StatusParagraph_and_associated_files> installed_files;
std::string line;
@ -135,6 +137,30 @@ std::vector<StatusParagraph_and_associated_files> vcpkg::get_installed_files(con
installed_files_of_current_pgh.push_back(line);
}
// Should already be sorted
std::sort(installed_files_of_current_pgh.begin(), installed_files_of_current_pgh.end());
// Since the files are sorted, we can detect the entries that represent directories
// by comparing every element with the next one and checking if the next has a slash immediately after the current one's length
for (int i = 1; i < installed_files_of_current_pgh.size(); i++)
{
std::string& current_string = installed_files_of_current_pgh.at(i - 1);
const std::string& next_string = installed_files_of_current_pgh.at(i);
const size_t potential_slash_char_index = current_string.length();
// Make sure the index exists first
if (next_string.size() > potential_slash_char_index && next_string.at(potential_slash_char_index) == '/')
{
current_string = MARK_FOR_REMOVAL;
}
}
installed_files_of_current_pgh.erase(std::remove_if(installed_files_of_current_pgh.begin(), installed_files_of_current_pgh.end(), [](const std::string& file)
{
return file == MARK_FOR_REMOVAL;
}),
installed_files_of_current_pgh.end());
const StatusParagraph_and_associated_files pgh_and_files = {*pgh, std::move(installed_files_of_current_pgh)};
installed_files.push_back(pgh_and_files);
}