-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
support LUS archivemanager refactor (#14)
- Loading branch information
1 parent
44adc47
commit d8f3c4d
Showing
5 changed files
with
191 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,152 @@ | ||
| #include "ExporterArchive.h" | ||
| #include "Utils/StringHelper.h" | ||
| #include <StrHash64/StrHash64.h> | ||
| #include <filesystem> | ||
|
|
||
| ExporterArchive::ExporterArchive(const std::string& path, bool enableWriting) : mPath(path) { | ||
| mMpq = nullptr; | ||
| Load(enableWriting); | ||
| } | ||
|
|
||
| ExporterArchive::~ExporterArchive() { | ||
| Unload(); | ||
| } | ||
|
|
||
| bool ExporterArchive::Load(bool enableWriting) { | ||
| HANDLE mpqHandle = NULL; | ||
|
|
||
| bool baseLoaded = false; | ||
| std::string fullPath = std::filesystem::absolute(mPath).string(); | ||
|
|
||
| bool openArchiveSuccess; | ||
| { | ||
| const std::lock_guard<std::mutex> lock(mMutex); | ||
| openArchiveSuccess = | ||
| SFileOpenArchive(fullPath.c_str(), 0, enableWriting ? 0 : MPQ_OPEN_READ_ONLY, &mpqHandle); | ||
| } | ||
| if (openArchiveSuccess) { | ||
| printf("Opened mpq file "); | ||
| printf(fullPath.c_str()); | ||
| printf("\n"); | ||
| mMpq = mpqHandle; | ||
| mPath = fullPath; | ||
|
|
||
|
|
||
| baseLoaded = true; | ||
| } | ||
|
|
||
| if (!baseLoaded) { | ||
| printf("No valid OTR file was provided."); | ||
| return false; | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| bool ExporterArchive::Unload() { | ||
| bool success = true; | ||
|
|
||
| bool closeArchiveSuccess; | ||
| { | ||
| const std::lock_guard<std::mutex> lock(mMutex); | ||
| closeArchiveSuccess = SFileCloseArchive(mMpq); | ||
| } | ||
| if (!closeArchiveSuccess) { | ||
| printf("Failed to close mpq\n"); | ||
| success = false; | ||
| } | ||
|
|
||
| mMpq = nullptr; | ||
|
|
||
| return success; | ||
| } | ||
|
|
||
| std::shared_ptr<ExporterArchive> ExporterArchive::CreateArchive(const std::string& archivePath, size_t fileCapacity) { | ||
| auto archive = std::make_shared<ExporterArchive>(archivePath, true); | ||
|
|
||
| bool success; | ||
| { | ||
| const std::lock_guard<std::mutex> lock(archive->mMutex); | ||
| success = SFileCreateArchive(archivePath.c_str(), MPQ_CREATE_LISTFILE | MPQ_CREATE_ATTRIBUTES | MPQ_CREATE_ARCHIVE_V2, | ||
| fileCapacity, &archive->mMpq); | ||
| } | ||
| int32_t error = GetLastError(); | ||
|
|
||
| if (success) { | ||
| return archive; | ||
| } else { | ||
| printf("We tried to create an archive, but it has fallen and cannot get up.\n"); | ||
| return nullptr; | ||
| } | ||
| } | ||
|
|
||
| bool ExporterArchive::AddFile(const std::string& filePath, uintptr_t fileData, DWORD fileSize) { | ||
| HANDLE hFile; | ||
| #ifdef _WIN32 | ||
| SYSTEMTIME sysTime; | ||
| GetSystemTime(&sysTime); | ||
| FILETIME t; | ||
| SystemTimeToFileTime(&sysTime, &t); | ||
| ULONGLONG theTime = static_cast<uint64_t>(t.dwHighDateTime) << (sizeof(t.dwHighDateTime) * 8) | t.dwLowDateTime; | ||
| #else | ||
| time_t theTime; | ||
| time(&theTime); | ||
| #endif | ||
|
|
||
| std::string updatedPath = filePath; | ||
|
|
||
| StringHelper::ReplaceOriginal(updatedPath, "\\", "/"); | ||
|
|
||
| bool createFileSuccess; | ||
| { | ||
| const std::lock_guard<std::mutex> lock(mMutex); | ||
| createFileSuccess = | ||
| SFileCreateFile(mMpq, updatedPath.c_str(), theTime, fileSize, 0, MPQ_FILE_COMPRESS, &hFile); | ||
| } | ||
| if (!createFileSuccess) { | ||
| printf("Failed to create file.\n"); | ||
| return false; | ||
| } | ||
|
|
||
| bool writeFileSuccess; | ||
| { | ||
| const std::lock_guard<std::mutex> lock(mMutex); | ||
| writeFileSuccess = SFileWriteFile(hFile, (void*)fileData, fileSize, MPQ_COMPRESSION_ZLIB); | ||
| } | ||
| if (!writeFileSuccess) { | ||
| printf("Failed to write.\n"); | ||
| bool closeFileSuccess; | ||
| { | ||
| const std::lock_guard<std::mutex> lock(mMutex); | ||
| closeFileSuccess = SFileCloseFile(hFile); | ||
| } | ||
| if (!closeFileSuccess) { | ||
| printf("Failed to close.\n"); | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| bool finishFileSuccess; | ||
| { | ||
| const std::lock_guard<std::mutex> lock(mMutex); | ||
| finishFileSuccess = SFileFinishFile(hFile); | ||
| } | ||
| if (!finishFileSuccess) { | ||
| printf("Failed to finish file.\n"); | ||
| bool closeFileSuccess; | ||
| { | ||
| const std::lock_guard<std::mutex> lock(mMutex); | ||
| closeFileSuccess = SFileCloseFile(hFile); | ||
| } | ||
| if (!closeFileSuccess) { | ||
| printf("Failed to close after finish failure.\n"); | ||
| } | ||
| return false; | ||
| } | ||
| // SFileFinishFile already frees the handle, so no need to close it again. | ||
|
|
||
| mAddedFiles.push_back(updatedPath); | ||
| mHashes[CRC64(updatedPath.c_str())] = updatedPath; | ||
|
|
||
| return true; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| #pragma once | ||
|
|
||
| #undef _DLL | ||
|
|
||
| #include <string> | ||
| #include <vector> | ||
| #include <unordered_map> | ||
| #include <memory> | ||
| #include <mutex> | ||
| #include <StormLib.h> | ||
|
|
||
| class ExporterArchive : public std::enable_shared_from_this<ExporterArchive> { | ||
| public: | ||
| ExporterArchive(const std::string& path, bool enableWriting); | ||
| ~ExporterArchive(); | ||
|
|
||
| static std::shared_ptr<ExporterArchive> CreateArchive(const std::string& archivePath, size_t fileCapacity); | ||
| bool AddFile(const std::string& filePath, uintptr_t fileData, DWORD fileSize); | ||
|
|
||
| private: | ||
| std::string mPath; | ||
| HANDLE mMpq; | ||
| std::mutex mMutex; | ||
| std::vector<std::string> mAddedFiles; | ||
| std::unordered_map<uint64_t, std::string> mHashes; | ||
|
|
||
| bool Load(bool enableWriting); | ||
| bool Unload(); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,9 @@ | ||
| #pragma once | ||
|
|
||
| #include <libultraship/bridge.h> | ||
| #include "ExporterArchive.h" | ||
|
|
||
| extern std::shared_ptr<LUS::Archive> otrArchive; | ||
| extern std::shared_ptr<ExporterArchive> otrArchive; | ||
| extern std::map<std::string, std::vector<char>> files; | ||
|
|
||
| void AddFile(std::string fName, std::vector<char> data); | ||
| void AddFile(std::string fName, std::vector<char> data); |