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

[nostalgia/tools/pack] Cleanup

Browse Source
This commit is contained in:
Gary Talent 2021-06-25 21:00:12 -05:00
parent 90ed515842
commit ecc049c35b
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,15 +19,25 @@ namespace nostalgia {
* @return error * @return error
* stub for now * stub for now
*/ */
static ox::Error pathToInode(ox::Buffer*) noexcept { static ox::Result<ox::Buffer> pathToInode(const ox::Buffer &buff) noexcept {
return OxError(0); return ox::move(buff);
} }
// just strip header for now... // just strip header for now...
static ox::Error toMetalClaw(ox::Buffer *buff) noexcept { static ox::Result<ox::Buffer> toMetalClaw(const ox::Buffer &buff) noexcept {
oxRequire(mc, ox::stripClawHeader(ox::bit_cast<char*>(buff->data()), buff->size())); return ox::stripClawHeader(buff.data(), buff.size());
buff->resize(mc.size()); }
memcpy(buff->data(), mc.data(), mc.size());
static ox::Error doTransformations(ox::FileSystem *dest, const ox::String &filePath) noexcept {
if (filePath.endsWith(".ng") || filePath.endsWith(".npal")) {
// load file
oxRequireM(buff, dest->read(filePath.c_str()));
// do transformations
oxReturnError(pathToInode(buff).moveTo(&buff));
oxReturnError(toMetalClaw(buff).moveTo(&buff));
// write file to dest
oxReturnError(dest->write(filePath.c_str(), buff.data(), buff.size()));
}
return OxError(0); return OxError(0);
} }
@ -44,17 +54,7 @@ static ox::Error transformClaw(ox::FileSystem *dest, const ox::String &path) noe
const auto dir = path + name + '/'; const auto dir = path + name + '/';
oxReturnError(transformClaw(dest, dir)); oxReturnError(transformClaw(dest, dir));
} else { } else {
// do transforms oxReturnError(doTransformations(dest, filePath));
if (name.endsWith(".ng") || name.endsWith(".npal")) {
// load file
ox::Buffer buff(stat.size);
oxReturnError(dest->read(filePath.c_str(), buff.data(), buff.size()));
// do transformations
oxReturnError(pathToInode(&buff));
oxReturnError(toMetalClaw(&buff));
// write file to dest
oxReturnError(dest->write(filePath.c_str(), buff.data(), buff.size()));
}
} }
} }
return OxError(0); return OxError(0);
@ -87,14 +87,13 @@ static ox::Error copy(ox::FileSystem *src, ox::FileSystem *dest, const ox::Strin
oxReturnError(dest->mkdir(currentFile.c_str(), true)); oxReturnError(dest->mkdir(currentFile.c_str(), true));
oxReturnError(copy(src, dest, currentFile + '/')); oxReturnError(copy(src, dest, currentFile + '/'));
} else { } else {
ox::Buffer buff(stat.size);
// load file // load file
oxReturnError(src->read(currentFile.c_str(), buff.data(), buff.size())); oxRequireM(buff, src->read(currentFile.c_str()));
// write file to dest // write file to dest
oxOutf("writing {}\n", currentFile); oxOutf("writing {}\n", currentFile);
oxReturnError(dest->write(currentFile.c_str(), buff.data(), buff.size())); oxReturnError(dest->write(currentFile.c_str(), buff.data(), buff.size()));
oxReturnError(verifyFile(dest, currentFile, buff)); oxReturnError(verifyFile(dest, currentFile, buff));
verificationPairs.emplace_back(currentFile, buff); verificationPairs.emplace_back(currentFile, ox::move(buff));
} }
} }
// verify all at once in addition to right after the files are written // verify all at once in addition to right after the files are written