summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-10-03 07:35:38 +0200
committerLioncash <mathew1800@gmail.com>2018-10-03 07:35:41 +0200
commitfd312abedd437bc22b34da65eb1ff42dadce7388 (patch)
tree5c7b92dc3d81f4ae4857fef5bb3f988d3148a742
parentsubmission_package: Move ticket key setting to its own function (diff)
downloadyuzu-fd312abedd437bc22b34da65eb1ff42dadce7388.tar
yuzu-fd312abedd437bc22b34da65eb1ff42dadce7388.tar.gz
yuzu-fd312abedd437bc22b34da65eb1ff42dadce7388.tar.bz2
yuzu-fd312abedd437bc22b34da65eb1ff42dadce7388.tar.lz
yuzu-fd312abedd437bc22b34da65eb1ff42dadce7388.tar.xz
yuzu-fd312abedd437bc22b34da65eb1ff42dadce7388.tar.zst
yuzu-fd312abedd437bc22b34da65eb1ff42dadce7388.zip
-rw-r--r--src/core/file_sys/submission_package.cpp89
-rw-r--r--src/core/file_sys/submission_package.h2
2 files changed, 48 insertions, 43 deletions
diff --git a/src/core/file_sys/submission_package.cpp b/src/core/file_sys/submission_package.cpp
index b1ebab17f..b4d738d94 100644
--- a/src/core/file_sys/submission_package.cpp
+++ b/src/core/file_sys/submission_package.cpp
@@ -71,49 +71,7 @@ NSP::NSP(VirtualFile file_)
const auto files = pfs->GetFiles();
SetTicketKeys(files);
-
- for (const auto& outer_file : files) {
- if (outer_file->GetName().substr(outer_file->GetName().size() - 9) != ".cnmt.nca") {
- continue;
- }
-
- const auto nca = std::make_shared<NCA>(outer_file);
- if (nca->GetStatus() != Loader::ResultStatus::Success) {
- program_status[nca->GetTitleId()] = nca->GetStatus();
- continue;
- }
-
- const auto section0 = nca->GetSubdirectories()[0];
-
- for (const auto& inner_file : section0->GetFiles()) {
- if (inner_file->GetExtension() != "cnmt")
- continue;
-
- const CNMT cnmt(inner_file);
- auto& ncas_title = ncas[cnmt.GetTitleID()];
-
- ncas_title[ContentRecordType::Meta] = nca;
- for (const auto& rec : cnmt.GetContentRecords()) {
- const auto id_string = Common::HexArrayToString(rec.nca_id, false);
- const auto next_file = pfs->GetFile(fmt::format("{}.nca", id_string));
- if (next_file == nullptr) {
- LOG_WARNING(Service_FS,
- "NCA with ID {}.nca is listed in content metadata, but cannot "
- "be found in PFS. NSP appears to be corrupted.",
- id_string);
- continue;
- }
-
- auto next_nca = std::make_shared<NCA>(next_file);
- if (next_nca->GetType() == NCAContentType::Program)
- program_status[cnmt.GetTitleID()] = next_nca->GetStatus();
- if (next_nca->GetStatus() == Loader::ResultStatus::Success)
- ncas_title[rec.type] = std::move(next_nca);
- }
-
- break;
- }
- }
+ ReadNCAs(files);
}
NSP::~NSP() = default;
@@ -253,4 +211,49 @@ VirtualDir NSP::GetParentDirectory() const {
bool NSP::ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) {
return false;
}
+
+void NSP::ReadNCAs(const std::vector<VirtualFile>& files) {
+ for (const auto& outer_file : files) {
+ if (outer_file->GetName().substr(outer_file->GetName().size() - 9) != ".cnmt.nca") {
+ continue;
+ }
+
+ const auto nca = std::make_shared<NCA>(outer_file);
+ if (nca->GetStatus() != Loader::ResultStatus::Success) {
+ program_status[nca->GetTitleId()] = nca->GetStatus();
+ continue;
+ }
+
+ const auto section0 = nca->GetSubdirectories()[0];
+
+ for (const auto& inner_file : section0->GetFiles()) {
+ if (inner_file->GetExtension() != "cnmt")
+ continue;
+
+ const CNMT cnmt(inner_file);
+ auto& ncas_title = ncas[cnmt.GetTitleID()];
+
+ ncas_title[ContentRecordType::Meta] = nca;
+ for (const auto& rec : cnmt.GetContentRecords()) {
+ const auto id_string = Common::HexArrayToString(rec.nca_id, false);
+ const auto next_file = pfs->GetFile(fmt::format("{}.nca", id_string));
+ if (next_file == nullptr) {
+ LOG_WARNING(Service_FS,
+ "NCA with ID {}.nca is listed in content metadata, but cannot "
+ "be found in PFS. NSP appears to be corrupted.",
+ id_string);
+ continue;
+ }
+
+ auto next_nca = std::make_shared<NCA>(next_file);
+ if (next_nca->GetType() == NCAContentType::Program)
+ program_status[cnmt.GetTitleID()] = next_nca->GetStatus();
+ if (next_nca->GetStatus() == Loader::ResultStatus::Success)
+ ncas_title[rec.type] = std::move(next_nca);
+ }
+
+ break;
+ }
+ }
+}
} // namespace FileSys
diff --git a/src/core/file_sys/submission_package.h b/src/core/file_sys/submission_package.h
index e85a2b76e..7c7cebf33 100644
--- a/src/core/file_sys/submission_package.h
+++ b/src/core/file_sys/submission_package.h
@@ -59,6 +59,8 @@ protected:
bool ReplaceFileWithSubdirectory(VirtualFile file, VirtualDir dir) override;
private:
+ void ReadNCAs(const std::vector<VirtualFile>& files);
+
VirtualFile file;
bool extracted;