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

[nostalgia/pack] Cleanup error handling and file I/O

Browse Source
This commit is contained in:
Gary Talent 2020-01-24 22:29:35 -06:00
parent e38cf01f07
commit 70925cbde4
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,7 @@
#include <stdio.h> #include <stdio.h>
#include <fstream>
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <ox/clargs/clargs.hpp> #include <ox/clargs/clargs.hpp>
@ -19,46 +20,46 @@
using namespace std; using namespace std;
using namespace ox; using namespace ox;
[[nodiscard]] static ox::Error writeFileBuff(const std::string &path, const std::vector<uint8_t> &buff) { static void writeFileBuff(const std::string &path, std::vector<uint8_t> &buff) {
auto file = fopen(path.c_str(), "wb"); try {
if (!file) { std::ofstream f(path, std::ios::binary);
return OxError(1); f.write(reinterpret_cast<char*>(buff.data()), buff.size());
} catch (const std::fstream::failure&) {
throw OxError(2);
} }
oxReturnError(OxError(fwrite(buff.data(), buff.size(), 1, file) != 1));
oxReturnError(OxError(fclose(file)));
return OxError(0);
} }
[[nodiscard]] ox::Error run(ClArgs args) { void run(ClArgs args) {
std::string argSrc = args.getString("src").c_str(); std::string argSrc = args.getString("src").c_str();
std::string argDst = args.getString("dst").c_str(); std::string argDst = args.getString("dst").c_str();
if (argSrc == "") { if (argSrc == "") {
std::cerr << "error: must specify a source directory\n"; std::cerr << "error: must specify a source directory\n";
return OxError(1); throw OxError(1);
} }
if (argDst == "") { if (argDst == "") {
std::cerr << "error: must specify a destination ROM file\n"; std::cerr << "error: must specify a destination ROM file\n";
return OxError(1); throw OxError(1);
} }
std::vector<uint8_t> buff(32 * ox::units::MB); std::vector<uint8_t> buff(32 * ox::units::MB);
oxReturnError(ox::FileSystem32::format(buff.data(), buff.size())); oxThrowError(ox::FileSystem32::format(buff.data(), buff.size()));
ox::PassThroughFS src(argSrc.c_str()); ox::PassThroughFS src(argSrc.c_str());
ox::FileSystem32 dst(ox::FileStore32(buff.data(), buff.size())); ox::FileSystem32 dst(ox::FileStore32(buff.data(), buff.size()));
oxReturnError(nostalgia::pack(&src, &dst)); oxThrowError(nostalgia::pack(&src, &dst));
oxReturnError(dst.resize()); oxThrowError(dst.resize());
std::cout << "new size: " << dst.size() << '\n'; std::cout << "new size: " << dst.size() << '\n';
buff.resize(dst.size()); buff.resize(dst.size());
oxReturnError(writeFileBuff(argDst, buff)); writeFileBuff(argDst, buff);
return OxError(0);
} }
int main(int argc, const char **args) { int main(int argc, const char **args) {
auto err = run(ClArgs(argc, args)); try {
oxAssert(err, "pack failed"); run(ClArgs(argc, args));
if (err) { } catch (const ox::Error &err) {
oxAssert(err, "pack failed");
std::cerr << "pack failed...\n"; std::cerr << "pack failed...\n";
return static_cast<int>(err);
} }
return static_cast<int>(err); return 0;
} }