mirror
/
openmw
mirror of https://github.com/OpenMW/openmw.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Avoid missusing of CompressedBSAFile with private inheritance

Browse Source
ccache_for_windows
Cédric Mocquillon 3 years ago
parent fe13fa850e
commit ff7ad93bac
5 changed files with 107 additions and 79 deletions
Show Stats Download Patch File Download Diff File

117
apps/bsatool/bsatool.cpp
Unescape Escape View File

@ -151,62 +151,11 @@ bool parseOptions (int argc, char** argv, Arguments &info)
return true;
}
int list(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info);
int extract(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info);
int extractAll(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info);
int add(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info);
int main(int argc, char** argv)
{
try
{
Arguments info;
if(!parseOptions (argc, argv, info))
return 1;
// Open file
std::unique_ptr<Bsa::BSAFile> bsa;
Bsa::BsaVersion bsaVersion = Bsa::CompressedBSAFile::detectVersion(info.filename);
if (bsaVersion == Bsa::BSAVER_COMPRESSED)
bsa = std::make_unique<Bsa::CompressedBSAFile>(Bsa::CompressedBSAFile());
else
bsa = std::make_unique<Bsa::BSAFile>(Bsa::BSAFile());
if (info.mode == "create")
{
bsa->open(info.filename);
return 0;
}
bsa->open(info.filename);
if (info.mode == "list")
return list(bsa, info);
else if (info.mode == "extract")
return extract(bsa, info);
else if (info.mode == "extractall")
return extractAll(bsa, info);
else if (info.mode == "add")
return add(bsa, info);
else
{
std::cout << "Unsupported mode. That is not supposed to happen." << std::endl;
return 1;
}
}
catch (std::exception& e)
{
std::cerr << "ERROR reading BSA archive\nDetails:\n" << e.what() << std::endl;
return 2;
}
}
int list(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
template<typename File>
int list(std::unique_ptr<File>& bsa, Arguments& info)
{
// List all files
const Bsa::BSAFile::FileList &files = bsa->getList();
const auto &files = bsa->getList();
for (const auto& file : files)
{
if(info.longformat)
@ -225,7 +174,8 @@ int list(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
return 0;
}
int extract(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
template<typename File>
int extract(std::unique_ptr<File>& bsa, Arguments& info)
{
std::string archivePath = info.extractfile;
Misc::StringUtils::replaceAll(archivePath, "/", "\\");
@ -281,7 +231,8 @@ int extract(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
return 0;
}
int extractAll(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
template<typename File>
int extractAll(std::unique_ptr<File>& bsa, Arguments& info)
{
for (const auto &file : bsa->getList())
{
@ -315,10 +266,62 @@ int extractAll(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
return 0;
}
int add(std::unique_ptr<Bsa::BSAFile>& bsa, Arguments& info)
template<typename File>
int add(std::unique_ptr<File>& bsa, Arguments& info)
{
boost::filesystem::fstream stream(info.addfile, std::ios_base::binary | std::ios_base::out | std::ios_base::in);
bsa->addFile(info.addfile, stream);
return 0;
}
template<typename File>
int call(Arguments& info)
{
std::unique_ptr<File> bsa = std::make_unique<File>();
if (info.mode == "create")
{
bsa->open(info.filename);
return 0;
}
bsa->open(info.filename);
if (info.mode == "list")
return list(bsa, info);
else if (info.mode == "extract")
return extract(bsa, info);
else if (info.mode == "extractall")
return extractAll(bsa, info);
else if (info.mode == "add")
return add(bsa, info);
else
{
std::cout << "Unsupported mode. That is not supposed to happen." << std::endl;
return 1;
}
}
int main(int argc, char** argv)
{
try
{
Arguments info;
if (!parseOptions(argc, argv, info))
return 1;
// Open file
Bsa::BsaVersion bsaVersion = Bsa::CompressedBSAFile::detectVersion(info.filename);
if (bsaVersion == Bsa::BSAVER_COMPRESSED)
return call<Bsa::CompressedBSAFile>(info);
else
return call<Bsa::BSAFile>(info);
}
catch (std::exception& e)
{
std::cerr << "ERROR reading BSA archive\nDetails:\n" << e.what() << std::endl;
return 2;
}
}

2
components/bsa/bsa_file.hpp
Unescape Escape View File

@ -128,7 +128,7 @@ public:
return Files::openConstrainedFileStream (mFilename.c_str (), file->offset, file->fileSize);
}
virtual void addFile(const std::string& filename, std::istream& file);
void addFile(const std::string& filename, std::istream& file);
/// Get a list of all files
/// @note Thread safe.

8
components/bsa/compressedbsafile.hpp
Unescape Escape View File

@ -39,7 +39,7 @@ namespace Bsa
BSAVER_COMPRESSED = 0x415342 //B, S, A
};
class CompressedBSAFile : public BSAFile
class CompressedBSAFile : private BSAFile
{
private:
//special marker for invalid records,
@ -85,6 +85,10 @@ namespace Bsa
static std::uint64_t generateHash(std::string stem, std::string extension) ;
Files::IStreamPtr getFile(const FileRecord& fileRecord);
public:
using BSAFile::open;
using BSAFile::getList;
using BSAFile::getFilename;
CompressedBSAFile();
virtual ~CompressedBSAFile();
@ -96,7 +100,7 @@ namespace Bsa
Files::IStreamPtr getFile(const char* filePath);
Files::IStreamPtr getFile(const FileStruct* fileStruct);
void addFile(const std::string& filename, std::istream& file) override;
void addFile(const std::string& filename, std::istream& file);
};
}

49
components/vfs/bsaarchive.cpp
Unescape Escape View File

@ -8,7 +8,7 @@ namespace VFS
BsaArchive::BsaArchive(const std::string &filename)
{
mFile = std::make_unique<Bsa::BSAFile>(Bsa::BSAFile());
mFile = std::make_unique<Bsa::BSAFile>();
mFile->open(filename);
const Bsa::BSAFile::FileList &filelist = mFile->getList();
@ -53,17 +53,30 @@ std::string BsaArchive::getDescription() const
return std::string{"BSA: "} + mFile->getFilename();
}
// ------------------------------------------------------------------------------
BsaArchiveFile::BsaArchiveFile(const Bsa::BSAFile::FileStruct *info, Bsa::BSAFile* bsa)
: mInfo(info)
, mFile(bsa)
{
}
Files::IStreamPtr BsaArchiveFile::open()
{
return mFile->getFile(mInfo);
}
CompressedBsaArchive::CompressedBsaArchive(const std::string &filename)
: BsaArchive()
: Archive()
{
mFile = std::make_unique<Bsa::BSAFile>(Bsa::CompressedBSAFile());
mFile->open(filename);
mCompressedFile = std::make_unique<Bsa::CompressedBSAFile>();
mCompressedFile->open(filename);
const Bsa::BSAFile::FileList &filelist = mFile->getList();
const Bsa::BSAFile::FileList &filelist = mCompressedFile->getList();
for(Bsa::BSAFile::FileList::const_iterator it = filelist.begin();it != filelist.end();++it)
{
mResources.emplace_back(&*it, mFile.get());
mCompressedResources.emplace_back(&*it, static_cast<Bsa::CompressedBSAFile*>(mFile.get()));
mCompressedResources.emplace_back(&*it, mCompressedFile.get());
}
}
@ -78,22 +91,26 @@ void CompressedBsaArchive::listResources(std::map<std::string, File *> &out, cha
}
}
// ------------------------------------------------------------------------------
BsaArchiveFile::BsaArchiveFile(const Bsa::BSAFile::FileStruct *info, Bsa::BSAFile* bsa)
: mInfo(info)
, mFile(bsa)
bool CompressedBsaArchive::contains(const std::string& file, char (*normalize_function)(char)) const
{
for (const auto& it : mCompressedResources)
{
std::string ent = it.mInfo->name();
std::transform(ent.begin(), ent.end(), ent.begin(), normalize_function);
if(file == ent)
return true;
}
return false;
}
Files::IStreamPtr BsaArchiveFile::open()
std::string CompressedBsaArchive::getDescription() const
{
return mFile->getFile(mInfo);
return std::string{"BSA: "} + mCompressedFile->getFilename();
}
CompressedBsaArchiveFile::CompressedBsaArchiveFile(const Bsa::BSAFile::FileStruct *info, Bsa::CompressedBSAFile* bsa)
: BsaArchiveFile(info, bsa)
: mInfo(info)
, mCompressedFile(bsa)
{

10
components/vfs/bsaarchive.hpp
Unescape Escape View File

@ -19,12 +19,14 @@ namespace VFS
Bsa::BSAFile* mFile;
};
class CompressedBsaArchiveFile : public BsaArchiveFile
class CompressedBsaArchiveFile : public File
{
public:
CompressedBsaArchiveFile(const Bsa::BSAFile::FileStruct* info, Bsa::CompressedBSAFile* bsa);
Files::IStreamPtr open() override;
const Bsa::BSAFile::FileStruct* mInfo;
Bsa::CompressedBSAFile* mCompressedFile;
};
@ -44,12 +46,14 @@ namespace VFS
std::vector<BsaArchiveFile> mResources;
};
class CompressedBsaArchive : public BsaArchive
class CompressedBsaArchive : public Archive
{
public:
CompressedBsaArchive(const std::string& filename);
void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char)) override;
virtual ~CompressedBsaArchive() {}
void listResources(std::map<std::string, File*>& out, char (*normalize_function) (char)) override;
bool contains(const std::string& file, char (*normalize_function) (char)) const override;
std::string getDescription() const override;
private:
std::unique_ptr<Bsa::CompressedBSAFile> mCompressedFile;

Write Preview
Loading…
Cancel
Save