izzy/Torch
0
0
Fork 0
mirror of https://github.com/izzy2lost/Torch.git synced 2026-07-06 00:18:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

make external file processing first priority

Browse Source
This commit is contained in:
AltoXorg
2024-04-22 22:19:52 -06:00
committed by Lywx
parent 6fd59e84ee
commit c90e106087
1 changed files with 43 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Companion.cpp
+43 -47
View File
@@ -255,6 +255,49 @@ void Companion::ParseModdingConfig() {
void Companion::ParseCurrentFileConfig(YAML::Node node) {
if (node["external_files"]) {
auto externalFiles = node["external_files"];
if (externalFiles.IsSequence() && externalFiles.size()) {
for(size_t i = 0; i < externalFiles.size(); i++) {
auto externalFile = externalFiles[i];
if (externalFile.size() == 0) {
this->gCurrentExternalFiles.push_back(externalFile.as<std::string>());
} else {
SPDLOG_INFO("External File size {}", externalFile.size());
throw std::runtime_error("Incorrect yaml syntax for external files.\n\nThe yaml expects:\n:config:\n external_files:\n - <external_files>\n\ne.g.:\nexternal_files:\n - actors/actor1.yaml");
}
auto externalFileName = externalFile.as<std::string>();
if (std::filesystem::relative(externalFileName, this->gAssetPath).string().starts_with("../")) {
throw std::runtime_error("External File " + externalFileName + " Not In Asset Directory " + this->gAssetPath);
} else if (std::filesystem::relative(externalFileName, this->gAssetPath).string() == "") {
throw std::runtime_error("External File " + externalFileName + " Not In Asset Directory " + this->gAssetPath);
}
if (!this->gAddrMap.contains(externalFileName)) {
SPDLOG_INFO("Dependency on external file {}. Now processing {}", externalFileName, externalFileName);
auto currentFile = this->gCurrentFile;
auto currentDirectory = this->gCurrentDirectory;
auto currentExternalFiles = this->gCurrentExternalFiles;
this->gCurrentFile = externalFileName;
this->gCurrentDirectory = std::filesystem::relative(externalFileName, this->gAssetPath).replace_extension("");
YAML::Node root = YAML::LoadFile(externalFileName);
ProcessFile(root);
SPDLOG_INFO("Finishing processing of file: {}", currentFile);
this->gCurrentFile = currentFile;
this->gCurrentDirectory = currentDirectory;
this->gCurrentExternalFiles = currentExternalFiles;
this->gFileHeader.clear();
}
}
}
}
if(node["segments"]) {
auto segments = node["segments"];
@@ -326,53 +369,6 @@ void Companion::ParseCurrentFileConfig(YAML::Node node) {
this->gCurrentVram = { addr, offset };
}
if (node["external_files"]) {
auto externalFiles = node["external_files"];
if (externalFiles.IsSequence() && externalFiles.size()) {
for(size_t i = 0; i < externalFiles.size(); i++) {
auto externalFile = externalFiles[i];
if (externalFile.size() == 0) {
this->gCurrentExternalFiles.push_back(externalFile.as<std::string>());
} else {
SPDLOG_INFO("External File size {}", externalFile.size());
throw std::runtime_error("Incorrect yaml syntax for external files.\n\nThe yaml expects:\n:config:\n external_files:\n - <external_files>\n\ne.g.:\nexternal_files:\n - actors/actor1.yaml");
}
auto externalFileName = externalFile.as<std::string>();
if (std::filesystem::relative(externalFileName, this->gAssetPath).string().starts_with("../")) {
throw std::runtime_error("External File " + externalFileName + " Not In Asset Directory " + this->gAssetPath);
} else if (std::filesystem::relative(externalFileName, this->gAssetPath).string() == "") {
throw std::runtime_error("External File " + externalFileName + " Not In Asset Directory " + this->gAssetPath);
}
if (!this->gAddrMap.contains(externalFileName)) {
SPDLOG_INFO("Dependency on external file {}. Now processing {}", externalFileName, externalFileName);
auto currentFile = this->gCurrentFile;
auto currentDirectory = this->gCurrentDirectory;
auto currentSegmentNumber = gCurrentSegmentNumber;
auto currentFileOffset = gCurrentFileOffset;
auto currentCompressionType = gCurrentCompressionType;
this->gCurrentFile = externalFileName;
this->gCurrentDirectory = std::filesystem::relative(externalFileName, this->gAssetPath).replace_extension("");
YAML::Node root = YAML::LoadFile(externalFileName);
ProcessFile(root);
SPDLOG_INFO("Finishing processing of file: {}", currentFile);
this->gCurrentFile = currentFile;
this->gCurrentDirectory = currentDirectory;
gCurrentSegmentNumber = currentSegmentNumber;
gCurrentFileOffset = currentFileOffset;
gCurrentCompressionType = currentCompressionType;
}
}
}
}
this->gEnablePadGen = GetSafeNode<bool>(node, "autopads", true);
this->gNodeForceProcessing = GetSafeNode<bool>(node, "force", false);
this->gIndividualIncludes = GetSafeNode<bool>(node, "individual_data_incs", false);