Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Display an error if adding more than once the same filename in BNP

Browse source
This commit is contained in:
kervala 2016-01-23 18:49:10 +01:00
parent ddb001cf05
commit b539670eac
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
code/nel/tools/misc/bnp_make/main.cpp
View file

@ -92,22 +92,32 @@ void packSubRecurse(const std::string &srcDirectory)
printf ("Treating directory: %s\n", srcDirectory.c_str()); printf ("Treating directory: %s\n", srcDirectory.c_str());
CPath::getPathContent(srcDirectory, true, false, true, pathContent); CPath::getPathContent(srcDirectory, true, false, true, pathContent);
// TODO: remove duplicate files if (pathContent.empty()) return;
// Sort filename // Sort filename
sort (pathContent.begin(), pathContent.end(), i_comp); sort (pathContent.begin(), pathContent.end(), i_comp);
// check for files with same name
for(uint i = 1, len = pathContent.size(); i < len; ++i)
{
if (toLower(CFile::getFilename(pathContent[i-1])) == toLower(CFile::getFilename(pathContent[i])))
{
nlerror("File %s is not unique in BNP!", CFile::getFilename(pathContent[i]).c_str());
return;
}
}
for (uint i=0; i<pathContent.size(); ++i) for (uint i=0; i<pathContent.size(); ++i)
{ {
if (keepFile(pathContent[i])) if (keepFile(pathContent[i]))
{ {
if (gBNPHeader.appendFile(pathContent[i])) if (gBNPHeader.appendFile(pathContent[i]))
{ {
printf("adding %s\n", pathContent[i].c_str()); printf("Adding %s\n", pathContent[i].c_str());
} }
else else
{ {
printf("error cannot open %s\n", pathContent[i].c_str()); printf("Error: cannot open %s\n", pathContent[i].c_str());
} }
} }
} }