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

[nostalgia/tools/pack] Replace cout and cerr with oxOut and oxErr

Browse Source
This commit is contained in:
Gary Talent 2021-04-16 21:19:10 -05:00
parent 86a38c7197
commit be09c60f5d
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,6 @@
*/ */
#include <fstream> #include <fstream>
#include <iostream>
#include <vector> #include <vector>
#include <ox/clargs/clargs.hpp> #include <ox/clargs/clargs.hpp>
#include <ox/fs/fs.hpp> #include <ox/fs/fs.hpp>
@ -29,11 +28,11 @@ static ox::Error run(const ox::ClArgs &args) {
auto argSrc = args.getString("src", ""); auto argSrc = args.getString("src", "");
auto argDst = args.getString("dst", ""); auto argDst = args.getString("dst", "");
if (argSrc == "") { if (argSrc == "") {
std::cerr << "error: must specify a source directory\n"; oxErr("\033[31;1;1merror:\033[0m must specify a source directory\n");
return OxError(1, "must specify a source directory"); return OxError(1, "must specify a source directory");
} }
if (argDst == "") { if (argDst == "") {
std::cerr << "error: must specify a destination ROM file\n"; oxErr("\033[31;1;1merror:\033[0m must specify a destination ROM file\n");
return OxError(1, "must specify a destination ROM file"); return OxError(1, "must specify a destination ROM file");
} }
ox::Vector<char> buff(32 * ox::units::MB); ox::Vector<char> buff(32 * ox::units::MB);
@ -44,7 +43,7 @@ static ox::Error run(const ox::ClArgs &args) {
oxReturnError(dst.resize()); oxReturnError(dst.resize());
oxRequire(dstSize, dst.size()); oxRequire(dstSize, dst.size());
std::cout << "new size: " << dstSize << '\n'; oxOutf("new size: {}\n", dstSize);
buff.resize(dstSize); buff.resize(dstSize);
oxReturnError(writeFileBuff(argDst.c_str(), buff)); oxReturnError(writeFileBuff(argDst.c_str(), buff));

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

@ -6,7 +6,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
#include <iostream>
#include <string_view> #include <string_view>
#include <ox/claw/read.hpp> #include <ox/claw/read.hpp>
@ -86,7 +85,7 @@ struct VerificationPair {
}; };
ox::Error copy(ox::PassThroughFS *src, ox::FileSystem32 *dest, ox::String path) { ox::Error copy(ox::PassThroughFS *src, ox::FileSystem32 *dest, ox::String path) {
std::cout << "copying directory: " << path.c_str() << '\n'; oxOutf("copying directory: {}\n", path);
ox::Vector<VerificationPair> verificationPairs; ox::Vector<VerificationPair> verificationPairs;
// copy // copy
oxReturnError(src->ls(path.c_str(), [&verificationPairs, src, dest, path](ox::String name, ox::InodeId_t) { oxReturnError(src->ls(path.c_str(), [&verificationPairs, src, dest, path](ox::String name, ox::InodeId_t) {
@ -94,7 +93,7 @@ ox::Error copy(ox::PassThroughFS *src, ox::FileSystem32 *dest, ox::String path)
if (currentFile == "/.nostalgia") { if (currentFile == "/.nostalgia") {
return OxError(0); return OxError(0);
} }
std::cout << "reading " << name.c_str() << '\n'; oxOutf("reading {}\n", name);
auto [stat, err] = src->stat((currentFile).c_str()); auto [stat, err] = src->stat((currentFile).c_str());
oxReturnError(err); oxReturnError(err);
if (stat.fileType == ox::FileType_Directory) { if (stat.fileType == ox::FileType_Directory) {
@ -106,7 +105,7 @@ ox::Error copy(ox::PassThroughFS *src, ox::FileSystem32 *dest, ox::String path)
buff.resize(stat.size); buff.resize(stat.size);
oxReturnError(src->read(currentFile.c_str(), buff.data(), buff.size())); oxReturnError(src->read(currentFile.c_str(), buff.data(), buff.size()));
// write file to dest // write file to dest
std::cout << "writing " << currentFile.c_str() << '\n'; 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.push_back({currentFile, buff}); verificationPairs.push_back({currentFile, buff});