drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[nostalgia/tools/pack] Cleanup

Browse Source
This commit is contained in:
Gary Talent 2021-04-17 17:55:47 -05:00
parent c007b5b874
commit 96a2e86a35
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/nostalgia/tools/pack/pack.cpp
View File

@ -12,8 +12,6 @@
namespace nostalgia { namespace nostalgia {
namespace {
/** /**
* Convert path references to inodes to save space * Convert path references to inodes to save space
* @param buff buffer holding file * @param buff buffer holding file
@ -26,8 +24,7 @@ static ox::Error pathToInode(ox::Vector<uint8_t>*) noexcept {
// just strip header for now... // just strip header for now...
static ox::Error toMetalClaw(ox::Vector<uint8_t> *buff) noexcept { static ox::Error toMetalClaw(ox::Vector<uint8_t> *buff) noexcept {
auto [mc, err] = ox::stripClawHeader(ox::bit_cast<char*>(buff->data()), buff->size()); oxRequire(mc, ox::stripClawHeader(ox::bit_cast<char*>(buff->data()), buff->size()));
oxReturnError(err);
buff->resize(mc.size()); buff->resize(mc.size());
ox_memcpy(buff->data(), mc.data(), mc.size()); ox_memcpy(buff->data(), mc.data(), mc.size());
return OxError(0); return OxError(0);
@ -42,8 +39,7 @@ static ox::Error transformClaw(ox::FileSystem *dest, const ox::String &path) noe
for (auto i = 0u; i < fileList.size(); ++i) { for (auto i = 0u; i < fileList.size(); ++i) {
auto &name = fileList[i]; auto &name = fileList[i];
auto filePath = path + name; auto filePath = path + name;
auto [stat, err] = dest->stat(filePath.c_str()); oxRequire(stat, dest->stat(filePath.c_str()));
oxReturnError(err);
if (stat.fileType == ox::FileType_Directory) { if (stat.fileType == ox::FileType_Directory) {
const auto dir = path + name + '/'; const auto dir = path + name + '/';
oxReturnError(transformClaw(dest, dir)); oxReturnError(transformClaw(dest, dir));
@ -87,8 +83,7 @@ static ox::Error copy(ox::FileSystem *src, ox::FileSystem *dest, const ox::Strin
continue; continue;
} }
oxOutf("reading {}\n", name); oxOutf("reading {}\n", name);
auto [stat, err] = src->stat((currentFile).c_str()); oxRequire(stat, src->stat(currentFile.c_str()));
oxReturnError(err);
if (stat.fileType == ox::FileType_Directory) { if (stat.fileType == ox::FileType_Directory) {
oxReturnError(dest->mkdir(currentFile.c_str(), true)); oxReturnError(dest->mkdir(currentFile.c_str(), true));
oxReturnError(copy(src, dest, currentFile + '/')); oxReturnError(copy(src, dest, currentFile + '/'));
@ -112,8 +107,6 @@ static ox::Error copy(ox::FileSystem *src, ox::FileSystem *dest, const ox::Strin
return OxError(0); return OxError(0);
} }
}
ox::Error pack(ox::FileSystem *src, ox::FileSystem *dest) noexcept { ox::Error pack(ox::FileSystem *src, ox::FileSystem *dest) noexcept {
oxReturnError(copy(src, dest, "/")); oxReturnError(copy(src, dest, "/"));
oxReturnError(transformClaw(dest, "/")); oxReturnError(transformClaw(dest, "/"));