Remove "FS" view option from CciProcess as it was never going to be used.

This commit is contained in:
jakcron
2022-03-14 17:12:46 +08:00
parent d3343000f4
commit f08c3a11a0
2 changed files with 2 additions and 21 deletions
+1 -18
View File
@@ -14,7 +14,6 @@ ctrtool::CciProcess::CciProcess() :
mInputStream(), mInputStream(),
mKeyBag(), mKeyBag(),
mShowHeaderInfo(false), mShowHeaderInfo(false),
mShowFs(false),
mVerbose(false), mVerbose(false),
mVerify(false), mVerify(false),
mExtractPath(), mExtractPath(),
@@ -41,10 +40,9 @@ void ctrtool::CciProcess::setKeyBag(const ctrtool::KeyBag& key_bag)
mNcchProcess.setKeyBag(key_bag); mNcchProcess.setKeyBag(key_bag);
} }
void ctrtool::CciProcess::setCliOutputMode(bool show_header_info, bool show_fs) void ctrtool::CciProcess::setCliOutputMode(bool show_header_info)
{ {
mShowHeaderInfo = show_header_info; mShowHeaderInfo = show_header_info;
mShowFs = show_fs;
} }
void ctrtool::CciProcess::setVerboseMode(bool verbose) void ctrtool::CciProcess::setVerboseMode(bool verbose)
@@ -96,8 +94,6 @@ void ctrtool::CciProcess::process()
verifyHeader(); verifyHeader();
if (mShowHeaderInfo) if (mShowHeaderInfo)
printHeader(); printHeader();
if (mShowFs)
printFs();
if (mExtractPath.isSet()) if (mExtractPath.isSet())
extractFs(); extractFs();
processContent(); processContent();
@@ -330,19 +326,6 @@ void ctrtool::CciProcess::printHeader()
fmt::print(" TitleKey: {}\n", tc::cli::FormatUtil::formatBytesAsString(mHeader.card_device_info.title_key.data(), mHeader.card_device_info.title_key.size(), true, "")); fmt::print(" TitleKey: {}\n", tc::cli::FormatUtil::formatBytesAsString(mHeader.card_device_info.title_key.data(), mHeader.card_device_info.title_key.size(), true, ""));
} }
void ctrtool::CciProcess::printFs()
{
tc::io::sDirectoryListing dir;
mFsReader->getDirectoryListing(tc::io::Path("/"), dir);
fmt::print("[CCI Filesystem]\n");
fmt::print(" CCI:/\n");
for (auto itr = dir.file_list.begin(); itr != dir.file_list.end(); itr++)
{
fmt::print(" {}\n", *itr);
}
}
void ctrtool::CciProcess::extractFs() void ctrtool::CciProcess::extractFs()
{ {
tc::io::LocalFileSystem local_fs; tc::io::LocalFileSystem local_fs;
+1 -3
View File
@@ -15,7 +15,7 @@ public:
void setInputStream(const std::shared_ptr<tc::io::IStream>& input_stream); void setInputStream(const std::shared_ptr<tc::io::IStream>& input_stream);
void setKeyBag(const ctrtool::KeyBag& key_bag); void setKeyBag(const ctrtool::KeyBag& key_bag);
void setCliOutputMode(bool show_header_info, bool show_fs); void setCliOutputMode(bool show_header_info);
void setVerboseMode(bool verbose); void setVerboseMode(bool verbose);
void setVerifyMode(bool verify); void setVerifyMode(bool verify);
void setExtractPath(const tc::io::Path& extract_path); void setExtractPath(const tc::io::Path& extract_path);
@@ -34,7 +34,6 @@ private:
std::shared_ptr<tc::io::IStream> mInputStream; std::shared_ptr<tc::io::IStream> mInputStream;
ctrtool::KeyBag mKeyBag; ctrtool::KeyBag mKeyBag;
bool mShowHeaderInfo; bool mShowHeaderInfo;
bool mShowFs;
bool mVerbose; bool mVerbose;
bool mVerify; bool mVerify;
tc::Optional<tc::io::Path> mExtractPath; tc::Optional<tc::io::Path> mExtractPath;
@@ -52,7 +51,6 @@ private:
void importHeader(); void importHeader();
void verifyHeader(); void verifyHeader();
void printHeader(); void printHeader();
void printFs();
void extractFs(); void extractFs();
void processContent(); void processContent();