Dark98/threeSD
1
0
Fork 0
mirror of https://github.com/Dark98/threeSD.git synced 2026-07-03 16:49:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use GodMode9 naming scheme

Browse Source
This commit is contained in:
Pengfei
2021-07-01 15:22:38 +08:00
parent e2bef4d705
commit 19bc9d0210
7 changed files with 112 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/importer.cpp
+72 -4
View File
@@ -561,8 +561,53 @@ TitleData LoadTitleData(NCCHContainer& ncch) {
encryption, seed_crypto, smdh.GetIcon(false)};
}
bool SDMCImporter::DumpCXI(const ContentSpecifier& specifier, const std::string& destination,
const Common::ProgressCallback& callback) {
static std::string NormalizeFilename(std::string filename) {
static constexpr std::array<char, 8> IllegalCharacters{
{':', '/', '\\', '"', '*', '?', '\n', '\r'}};
const auto pred = [](char c) {
return std::ranges::find(IllegalCharacters, c) != IllegalCharacters.end();
};
std::ranges::replace_if(filename, pred, ' ');
std::string result;
for (std::size_t i = 0; i < filename.size(); ++i) {
if (i < filename.size() - 1 && filename[i] == ' ' && filename[i + 1] == ' ') {
continue;
}
result.push_back(filename[i]);
}
return result;
}
static std::string GetTitleFileName(NCCHContainer& ncch) {
std::string codeset_name;
ncch.ReadCodesetName(codeset_name);
std::string product_code;
ncch.ReadProductCode(product_code);
u64 program_id{};
ncch.ReadProgramId(program_id);
std::vector<u8> smdh_buffer;
if (ncch.LoadSectionExeFS("icon", smdh_buffer) != ResultStatus::Success ||
smdh_buffer.size() != sizeof(SMDH)) {
LOG_WARNING(Core, "Failed to load icon in ExeFS or size incorrect");
return NormalizeFilename(
fmt::format("{:016x} {} ({})", program_id, codeset_name, product_code));
} else {
SMDH smdh;
std::memcpy(&smdh, smdh_buffer.data(), smdh_buffer.size());
const auto short_title =
Common::UTF16BufferToUTF8(smdh.GetShortTitle(SMDH::TitleLanguage::English));
return NormalizeFilename(fmt::format("{:016x} {} ({}) ({})", program_id, short_title,
product_code, smdh.GetRegionString()));
}
}
bool SDMCImporter::DumpCXI(const ContentSpecifier& specifier, std::string destination,
const Common::ProgressCallback& callback, bool auto_filename) {
if (specifier.type != ContentType::Application) {
LOG_ERROR(Core, "Unsupported specifier type {}", static_cast<int>(specifier.type));
@@ -580,6 +625,13 @@ bool SDMCImporter::DumpCXI(const ContentSpecifier& specifier, const std::string&
dump_cxi_ncch = std::make_unique<NCCHContainer>(
std::make_shared<SDMCFile>(config.sdmc_path, boot_content_path, "rb"));
if (auto_filename) {
if (destination.back() != '/' && destination.back() != '\\') {
destination.push_back('/');
}
destination.append(GetTitleFileName(*dump_cxi_ncch)).append(".cxi");
}
if (!FileUtil::CreateFullPath(destination)) {
LOG_ERROR(Core, "Failed to create path {}", destination);
return false;
@@ -593,8 +645,8 @@ void SDMCImporter::AbortDumpCXI() {
dump_cxi_ncch->AbortDecryptToFile();
}
bool SDMCImporter::BuildCIA(const ContentSpecifier& specifier, const std::string& destination,
const Common::ProgressCallback& callback) {
bool SDMCImporter::BuildCIA(const ContentSpecifier& specifier, std::string destination,
const Common::ProgressCallback& callback, bool auto_filename) {
if (config.certs_db_path.empty()) {
LOG_ERROR(Core, "Missing certs.db");
@@ -621,6 +673,22 @@ bool SDMCImporter::BuildCIA(const ContentSpecifier& specifier, const std::string
: fmt::format("{}title/{:08x}/{:08x}/content/", config.sdmc_path,
(specifier.id >> 32), (specifier.id & 0xFFFFFFFF));
if (auto_filename) {
if (destination.back() != '/' && destination.back() != '\\') {
destination.push_back('/');
}
const auto boot_content_path =
fmt::format("{}{:08x}.app", physical_path, tmd.GetBootContentID());
if (is_nand) {
NCCHContainer ncch(std::make_shared<FileUtil::IOFile>(boot_content_path, "rb"));
destination.append(GetTitleFileName(ncch)).append(".cia");
} else {
const auto relative_path = boot_content_path.substr(config.sdmc_path.size() - 1);
NCCHContainer ncch(std::make_shared<SDMCFile>(config.sdmc_path, relative_path, "rb"));
destination.append(GetTitleFileName(ncch)).append(".cia");
}
}
bool ret = cia_builder->Init(destination, tmd, config.certs_db_path,
FileUtil::GetDirectoryTreeSize(physical_path), callback);
if (!ret) {
src/core/importer.h
+4 -6
View File
@@ -127,9 +127,8 @@ public:
* Blocks, but can be aborted on another thread.
* @return true on success, false otherwise
*/
bool DumpCXI(
const ContentSpecifier& specifier, const std::string& destination,
const Common::ProgressCallback& callback = [](std::size_t, std::size_t) {});
bool DumpCXI(const ContentSpecifier& specifier, std::string destination,
const Common::ProgressCallback& callback, bool auto_filename = false);
/**
* Aborts current CXI dumping.
@@ -141,9 +140,8 @@ public:
* Blocks, but can be aborted on another thread.
* @return true on success, false otherwise
*/
bool BuildCIA(
const ContentSpecifier& specifier, const std::string& destination,
const Common::ProgressCallback& callback = [](std::size_t, std::size_t) {});
bool BuildCIA(const ContentSpecifier& specifier, std::string destination,
const Common::ProgressCallback& callback, bool auto_filename = false);
/**
* Aborts current CIA building
src/core/ncch/ncch_container.cpp
+11
View File
@@ -371,6 +371,17 @@ ResultStatus NCCHContainer::ReadCodesetName(std::string& name) {
return ResultStatus::Success;
}
ResultStatus NCCHContainer::ReadProductCode(std::string& product_code) {
ResultStatus result = Load();
if (result != ResultStatus::Success)
return result;
std::array<char, 17> data{};
std::memcpy(data.data(), ncch_header.product_code, 16);
product_code = data.data();
return ResultStatus::Success;
}
ResultStatus NCCHContainer::ReadEncryptionType(EncryptionType& encryption) {
ResultStatus result = Load();
if (result != ResultStatus::Success)
src/core/ncch/ncch_container.h
+6
View File
@@ -257,6 +257,12 @@ public:
*/
ResultStatus ReadCodesetName(std::string& name);
/**
* Reads the product code.
* @return ResultStatus result of function.
*/
ResultStatus ReadProductCode(std::string& name);
/**
* Gets encryption type (which key is used).
* @return ResultStatus result of function.
src/core/ncch/smdh.cpp
+13 -8
View File
@@ -88,20 +88,25 @@ std::array<u16, 0x40> SMDH::GetShortTitle(Core::SMDH::TitleLanguage language) co
return titles[static_cast<int>(language)].short_title;
}
std::vector<SMDH::GameRegion> SMDH::GetRegions() const {
if (region_lockout == 0x7fffffff) {
return std::vector<GameRegion>{GameRegion::RegionFree};
}
std::string SMDH::GetRegionString() const {
constexpr u32 REGION_COUNT = 7;
std::vector<GameRegion> result;
// JPN/USA/EUR/Australia/CHN/KOR/TWN
// Australia does not have a symbol because it's practically the same as Europe
static const std::array<std::string, REGION_COUNT> RegionSymbols{
{"J", "U", "E", "", "C", "K", "T"}};
std::string region_string;
for (u32 region = 0; region < REGION_COUNT; ++region) {
if (region_lockout & (1 << region)) {
result.push_back(static_cast<GameRegion>(region));
region_string.append(RegionSymbols[region]);
}
}
return result;
if (region_string == "JUECKT") {
return "W";
}
return region_string;
}
} // namespace Core
src/core/ncch/smdh.h
+2 -12
View File
@@ -62,17 +62,6 @@ struct SMDH {
TraditionalChinese = 11
};
enum class GameRegion {
Japan = 0,
NorthAmerica = 1,
Europe = 2,
Australia = 3,
China = 4,
Korea = 5,
Taiwan = 6,
RegionFree = 7,
};
/**
* Gets game icon from SMDH
* @param large If true, returns large icon (48x48), otherwise returns small icon (24x24)
@@ -87,7 +76,8 @@ struct SMDH {
*/
std::array<u16, 0x40> GetShortTitle(Core::SMDH::TitleLanguage language) const;
std::vector<GameRegion> GetRegions() const;
/// Gets a string representing the supported regions.
std::string GetRegionString() const;
};
static_assert(sizeof(SMDH) == 0x36C0, "SMDH structure size is wrong");