0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

List all filenames that contribute to the case conflicts

Browse source
This commit is contained in:
Alexander van Gessel 2017-10-17 18:24:19 +02:00
parent 927fcb2084
commit 4bde2d8b65
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/addon/validation.cpp
View file

@ -112,14 +112,24 @@ bool check_names_legal_internal(const config& dir, std::string current_prefix, s
}
bool check_case_insensitive_duplicates_internal(const config& dir, std::string prefix, std::vector<std::string>* badlist){
std::set<std::string> filenames;
typedef std::pair<bool, std::string> printed_and_original;
std::map<std::string, printed_and_original> filenames;
bool inserted;
bool printed;
std::string original;
for (const config &path : dir.child_range("file")) {
const config::attribute_value &filename = path["name"];
std::tie(std::ignore, inserted) = filenames.insert(boost::algorithm::to_lower_copy(filename.str(), std::locale::classic()));
const std::string lowercase = boost::algorithm::to_lower_copy(filename.str(), std::locale::classic());
const std::string with_prefix = prefix + filename.str();
std::tie(std::ignore, inserted) = filenames.emplace(lowercase, std::make_pair(false, with_prefix));
if (!inserted){
if(badlist){
badlist->push_back(prefix + filename.str());
std::tie(printed, original) = filenames[lowercase];
if(!printed){
badlist->push_back(original);
filenames[lowercase] = make_pair(true, std::string());
}
badlist->push_back(with_prefix);
} else {
return false;
}
@ -127,10 +137,17 @@ bool check_case_insensitive_duplicates_internal(const config& dir, std::string p
}
for (const config &path : dir.child_range("dir")) {
const config::attribute_value &filename = path["name"];
std::tie(std::ignore, inserted) = filenames.insert(boost::algorithm::to_lower_copy(filename.str(), std::locale::classic()));
const std::string lowercase = boost::algorithm::to_lower_copy(filename.str(), std::locale::classic());
const std::string with_prefix = prefix + filename.str();
std::tie(std::ignore, inserted) = filenames.emplace(lowercase, std::make_pair(false, with_prefix));
if (!inserted) {
if(badlist){
badlist->push_back(prefix + filename.str());
std::tie(printed, original) = filenames[lowercase];
if(!printed){
badlist->push_back(original);
filenames[lowercase] = make_pair(true, std::string());
}
badlist->push_back(with_prefix);
} else {
return false;
}