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

[nostalgia/tools] Cleanup

Browse Source
This commit is contained in:
Gary Talent 2019-06-17 22:57:49 -05:00
parent b839af9207
commit eb8f292181
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,16 +40,16 @@ ox::Error toMetalClaw(std::vector<char>*) {
ox::Error transformClaw(ox::FileSystem32 *dest, std::string path) { ox::Error transformClaw(ox::FileSystem32 *dest, std::string path) {
// copy // copy
dest->ls(path.c_str(), [dest, path](const char *name, ox::InodeId_t) { dest->ls(path.c_str(), [dest, path](const char *name, ox::InodeId_t) {
auto stat = dest->stat(path.c_str()); auto [stat, err] = dest->stat(path.c_str());
oxReturnError(stat.error); oxReturnError(err);
if (stat.value.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));
} else { } else {
// do transforms // do transforms
if (endsWith(path, ".claw")) { if (endsWith(path, ".claw")) {
// load file // load file
std::vector<char> buff(stat.value.size); std::vector<char> buff(stat.size);
oxReturnError(dest->read(path.c_str(), buff.data(), buff.size())); oxReturnError(dest->read(path.c_str(), buff.data(), buff.size()));
// do transformations // do transformations
oxReturnError(pathToInode(&buff)); oxReturnError(pathToInode(&buff));
@ -66,9 +66,9 @@ ox::Error transformClaw(ox::FileSystem32 *dest, std::string path) {
ox::Error copy(ox::PassThroughFS *src, ox::FileSystem32 *dest, std::string path) { ox::Error copy(ox::PassThroughFS *src, ox::FileSystem32 *dest, std::string path) {
// copy // copy
src->ls(path.c_str(), [src, dest, path](const char *name, ox::InodeId_t) { src->ls(path.c_str(), [src, dest, path](const char *name, ox::InodeId_t) {
auto stat = src->stat(path.c_str()); auto [stat, err] = src->stat(path.c_str());
oxReturnError(stat.error); oxReturnError(err);
if (stat.value.fileType == ox::FileType_Directory) { if (stat.fileType == ox::FileType_Directory) {
const auto dir = path + name + '/'; const auto dir = path + name + '/';
oxReturnError(dest->mkdir(dir.c_str())); oxReturnError(dest->mkdir(dir.c_str()));
oxReturnError(copy(src, dest, dir)); oxReturnError(copy(src, dest, dir));
@ -84,7 +84,7 @@ ox::Error copy(ox::PassThroughFS *src, ox::FileSystem32 *dest, std::string path)
} }
} else { } else {
// load file // load file
buff.resize(stat.value.size); buff.resize(stat.size);
oxReturnError(src->read(path.c_str(), buff.data(), buff.size())); oxReturnError(src->read(path.c_str(), buff.data(), buff.size()));
} }
// write file to dest // write file to dest