izzy/Torch
0
0
Fork 0
mirror of https://github.com/izzy2lost/Torch.git synced 2026-07-06 00:18:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

SWrapper error handling improvements. (#16)

Browse Source
This commit is contained in:
Kenix3
2023-11-17 08:40:10 -06:00
committed by GitHub
parent a71c9b187f
commit cfdbdb4ef1
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/storm/SWrapper.cpp
+7 -10
View File
@@ -14,8 +14,7 @@ SWrapper::SWrapper(const std::string& path) {
}
if(!SFileCreateArchive(path.c_str(), MPQ_CREATE_LISTFILE | MPQ_CREATE_ATTRIBUTES | MPQ_CREATE_ARCHIVE_V2, 4096, &this->hMpq)){
std::cout << "Failed to create archive: " << path << std::endl;
std::cout << GetLastError() << std::endl;
SPDLOG_ERROR("Failed to create archive {} with error code {}", path, GetLastError());
return;
}
}
@@ -48,30 +47,28 @@ bool SWrapper::CreateFile(const std::string& path, std::vector<char> data) {
size_t size = data.size();
if(size == 0){
SPDLOG_ERROR("File at path {} is empty", path);
std::cout << "File empty: " << path << std::endl;
return false;
}
if(size >> 32){
std::cout << "File too large: " << path << std::endl;
SPDLOG_ERROR("File at path {} is too large with size {}", path, size);
return false;
}
if(!SFileCreateFile(this->hMpq, path.c_str(), theTime, size, 0, MPQ_FILE_COMPRESS, &hFile)){
std::cout << "Failed to create file: " << path << std::endl;
std::cout << GetLastError() << std::endl;
SPDLOG_ERROR("Failed to create file at path {} with error {}", path, GetLastError());
return false;
}
if(!SFileWriteFile(hFile, (void*) raw, size, MPQ_COMPRESSION_ZLIB)){
std::cout << "Failed to write file: " << path << std::endl;
std::cout << GetLastError() << std::endl;
SPDLOG_ERROR("Failed to write file at path {} with error {}", path, GetLastError());
return false;
}
if(!SFileCloseFile(hFile)){
std::cout << "Failed to close file: " << path << std::endl;
std::cout << GetLastError() << std::endl;
SPDLOG_ERROR("Failed to close file at path {} with error {}", path, GetLastError());
return false;
}
@@ -80,7 +77,7 @@ bool SWrapper::CreateFile(const std::string& path, std::vector<char> data) {
void SWrapper::Close() {
if(this->hMpq == nullptr) {
std::cout << "Archive already closed" << std::endl;
SPDLOG_ERROR("Archive already closed");
return;
}
SFileCloseArchive(this->hMpq);