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

Add more content type traits

Browse Source
This commit is contained in:
Pengfei
2021-08-09 10:41:49 +08:00
parent d0da439731
commit 09f3f46515
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/importer.cpp
+3 -5
View File
@@ -498,7 +498,7 @@ static std::string FindTMD(const std::string& path) {
}
bool SDMCImporter::LoadTMD(ContentType type, u64 id, TitleMetadata& out) const {
const bool is_nand = type == ContentType::SystemTitle || type == ContentType::SystemApplet;
const bool is_nand = IsNandTitle(type);
auto& title_db = is_nand ? nand_title_db : sdmc_title_db;
const auto physical_path =
@@ -708,8 +708,7 @@ bool SDMCImporter::BuildCIA(CIABuildType build_type, const ContentSpecifier& spe
return false;
}
const bool is_nand =
specifier.type == ContentType::SystemTitle || specifier.type == ContentType::SystemApplet;
const bool is_nand = IsNandTitle(specifier.type);
const auto physical_path =
is_nand ? fmt::format("{}{:08x}/{:08x}/content/", config.system_titles_path,
(specifier.id >> 32), (specifier.id & 0xFFFFFFFF))
@@ -827,8 +826,7 @@ bool SDMCImporter::CheckTitleContents(const ContentSpecifier& specifier,
Common::ProgressCallbackWrapper wrapper{specifier.maximum_size};
const bool is_nand =
specifier.type == ContentType::SystemTitle || specifier.type == ContentType::SystemApplet;
const bool is_nand = IsNandTitle(specifier.type);
const auto physical_path =
is_nand ? fmt::format("{}{:08x}/{:08x}/content/", config.system_titles_path,
(specifier.id >> 32), (specifier.id & 0xFFFFFFFF))
src/core/importer.h
+3
View File
@@ -42,6 +42,9 @@ constexpr bool IsTitle(ContentType type) {
type == ContentType::DLC || type == ContentType::SystemTitle ||
type == ContentType::SystemApplet;
}
constexpr bool IsNandTitle(ContentType type) {
return type == ContentType::SystemTitle || type == ContentType::SystemApplet;
}
/**
* Encryption type of an importable content.
src/frontend/import_dialog.cpp
+4 -7
View File
@@ -768,8 +768,7 @@ void ImportDialog::StartBatchDumpingCXI() {
void ImportDialog::StartBuildingCIASingle(const Core::ContentSpecifier& specifier) {
CIABuildDialog dialog(this,
/*is_dir*/ false,
/*is_nand*/ specifier.type == Core::ContentType::SystemTitle ||
specifier.type == Core::ContentType::SystemApplet,
/*is_nand*/ Core::IsNandTitle(specifier.type),
/*enable_legit*/ importer->CanBuildLegitCIA(specifier),
last_build_cia_path);
if (dialog.exec() != QDialog::Accepted) {
@@ -813,11 +812,9 @@ void ImportDialog::StartBatchBuildingCIA() {
to_import.erase(removed_iter, to_import.end());
const bool is_nand = std::all_of(to_import.begin(), to_import.end(),
[](const Core::ContentSpecifier& specifier) {
return specifier.type == Core::ContentType::SystemTitle ||
specifier.type == Core::ContentType::SystemApplet;
});
const bool is_nand = std::all_of(
to_import.begin(), to_import.end(),
[](const Core::ContentSpecifier& specifier) { return Core::IsNandTitle(specifier.type); });
const bool enable_legit = std::all_of(to_import.begin(), to_import.end(),
[this](const Core::ContentSpecifier& specifier) {
return importer->CanBuildLegitCIA(specifier);