mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 12:49:56 +00:00
Code Issues Releases Wiki Activity

Have niftest handle directories as well

Browse source 
Note:  BSA files within the directory must be passed manually.
This commit is contained in:
Arthur Moore 2015-08-07 20:20:31 -04:00 committed by cc9cii
parent 7dc81c664a
commit 8cecfe4e17
1 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
apps/niftest/niftest.cpp
View file

@ -8,11 +8,14 @@
#include <components/files/constrainedfilestream.hpp> #include <components/files/constrainedfilestream.hpp>
#include <components/vfs/manager.hpp> #include <components/vfs/manager.hpp>
#include <components/vfs/bsaarchive.hpp> #include <components/vfs/bsaarchive.hpp>
#include <components/vfs/filesystemarchive.hpp>
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include <boost/filesystem.hpp>
// Create local aliases for brevity // Create local aliases for brevity
namespace bpo = boost::program_options; namespace bpo = boost::program_options;
namespace bfs = boost::filesystem;
///See if the file has the named extension ///See if the file has the named extension
bool hasExtension(std::string filename, std::string extensionToFind) bool hasExtension(std::string filename, std::string extensionToFind)
@ -40,22 +43,30 @@ bool isBSA(std::string filename)
return hasExtension(filename,"bsa"); return hasExtension(filename,"bsa");
} }
///Check all the nif files in the given BSA archive /// Check all the nif files in a given VFS::Archive
void readBSA(std::string filename) /// \note Takes ownership!
void readVFS(VFS::Archive* anArchive)
{ {
VFS::Manager myManager(false); VFS::Manager myManager(false);
myManager.addArchive(new VFS::BsaArchive(filename)); myManager.addArchive(anArchive);
myManager.buildIndex(); myManager.buildIndex();
std::map<std::string, VFS::File*> files=myManager.getIndex(); std::map<std::string, VFS::File*> files=myManager.getIndex();
for(std::map<std::string, VFS::File*>::const_iterator it=files.begin(); it!=files.end(); ++it) for(std::map<std::string, VFS::File*>::const_iterator it=files.begin(); it!=files.end(); ++it)
{ {
std::string name = it->first; std::string name = it->first;
if(isNIF(name))
{ try{
// std::cout << "Decoding: " << name << std::endl; if(isNIF(name))
Nif::NIFFile temp_nif(myManager.get(name),name); {
} // std::cout << "Decoding: " << name << std::endl;
Nif::NIFFile temp_nif(myManager.get(name),name);
}
}
catch (std::exception& e)
{
std::cerr << "ERROR, an exception has occurred: " << e.what() << std::endl;
}
} }
} }
@ -97,15 +108,7 @@ std::vector<std::string> parseOptions (int argc, char** argv)
} }
if (variables.count("input-file")) if (variables.count("input-file"))
{ {
std::vector<std::string> files = variables["input-file"].as< std::vector<std::string> >(); return variables["input-file"].as< std::vector<std::string> >();
std::cout << "Input files are:";
for(std::vector<std::string>::const_iterator it=files.begin(); it!=files.end(); ++it)
{
std::cout <<" "<< *it;
}
std::cout << std::endl;
return files;
} }
std::cout << "No input files or directories specified!" << std::endl; std::cout << "No input files or directories specified!" << std::endl;
@ -131,11 +134,16 @@ int main(int argc, char **argv)
else if(isBSA(name)) else if(isBSA(name))
{ {
std::cout << "Reading BSA File: " << name << std::endl; std::cout << "Reading BSA File: " << name << std::endl;
readBSA(name); readVFS(new VFS::BsaArchive(name));
}
else if(bfs::is_directory(bfs::path(name)))
{
std::cout << "Reading All Files in: " << name << std::endl;
readVFS(new VFS::FileSystemArchive(name));
} }
else else
{ {
std::cerr << "ERROR: \"" << name << "\" is not a nif or bsa file!" << std::endl; std::cerr << "ERROR: \"" << name << "\" is not a nif file, bsa file, or directory!" << std::endl;
} }
} }
catch (std::exception& e) catch (std::exception& e)