summaryrefslogtreecommitdiff
path: root/src/Companion.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/Companion.cpp')
-rw-r--r--src/Companion.cpp49
1 files changed, 26 insertions, 23 deletions
diff --git a/src/Companion.cpp b/src/Companion.cpp
index 1f865af..73e1923 100644
--- a/src/Companion.cpp
+++ b/src/Companion.cpp
@@ -210,8 +210,9 @@ void Companion::Init(const ExportType type) {
this->RegisterFactory("NAUDIO:V1:ADPCM_BOOK", std::make_shared<ADPCMBookFactory>());
this->RegisterFactory("NAUDIO:V1:SEQUENCE", std::make_shared<NSequenceFactory>());
#endif
-
+#ifndef __EMSCRIPTEN__ // We call this manually
this->Process();
+#else
}
void Companion::ParseEnums(std::string& header) {
@@ -1038,7 +1039,7 @@ void Companion::Process() {
auto hash = this->gCartridge->GetHash();
- SPDLOG_INFO("ROM decompressed to {}", hash);
+ SPDLOG_CRITICAL("ROM decompressed to {}", hash);
if (hash != target) {
throw std::runtime_error("Hash mismatch");
@@ -1204,23 +1205,25 @@ void Companion::Process() {
this->ParseHash();
- SPDLOG_INFO("------------------------------------------------");
+ SPDLOG_CRITICAL("------------------------------------------------");
spdlog::set_pattern(line);
- SPDLOG_INFO("Starting Torch...");
+ SPDLOG_CRITICAL("Starting Torch...");
if(this->gConfig.parseMode == ParseMode::Default) {
- SPDLOG_INFO("Game: {}", this->gCartridge->GetGameTitle());
- SPDLOG_INFO("CRC: {}", this->gCartridge->GetCRC());
- SPDLOG_INFO("Version: {}", this->gCartridge->GetVersion());
- SPDLOG_INFO("Country: [{}]", this->gCartridge->GetCountryCode());
- SPDLOG_INFO("Hash: {}", this->gCartridge->GetHash());
- SPDLOG_INFO("Assets: {}", this->gAssetPath);
+ SPDLOG_CRITICAL("Game: {}", this->gCartridge->GetGameTitle());
+ SPDLOG_CRITICAL("CRC: {}", this->gCartridge->GetCRC());
+ SPDLOG_CRITICAL("Version: {}", this->gCartridge->GetVersion());
+ SPDLOG_CRITICAL("Country: [{}]", this->gCartridge->GetCountryCode());
+ SPDLOG_CRITICAL("Hash: {}", this->gCartridge->GetHash());
+ SPDLOG_CRITICAL("Assets: {}", this->gAssetPath);
} else {
- SPDLOG_INFO("Mode: Directory");
- SPDLOG_INFO("Directory: {}", rom["folder"].as<std::string>());
+ SPDLOG_CRITICAL("Mode: Directory");
+ SPDLOG_CRITICAL("Directory: {}", rom["folder"].as<std::string>());
}
+ SPDLOG_CRITICAL("------------------------------------------------");
+
AudioManager::Instance = new AudioManager();
BinaryWrapper* wrapper = nullptr;
@@ -1278,7 +1281,7 @@ void Companion::Process() {
}
if(wrapper != nullptr) {
- SPDLOG_INFO("Writing version file");
+ SPDLOG_CRITICAL("Writing version file");
wrapper->AddFile("version", vWriter.ToVector());
vWriter.Close();
wrapper->Close();
@@ -1292,10 +1295,10 @@ void Companion::Process() {
auto end = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
auto level = spdlog::get_level();
spdlog::set_level(spdlog::level::info);
- SPDLOG_INFO("Done! Took {}ms", end.count() - start.count());
+ SPDLOG_CRITICAL("Done! Took {}ms", end.count() - start.count());
+ SPDLOG_CRITICAL("------------------------------------------------");
spdlog::set_level(level);
spdlog::set_pattern(regular);
- SPDLOG_INFO("------------------------------------------------");
Decompressor::ClearCache();
this->gCartridge = nullptr;
@@ -1307,10 +1310,10 @@ void Companion::Pack(const std::string& folder, const std::string& output, const
spdlog::set_level(spdlog::level::debug);
spdlog::set_pattern("[%Y-%m-%d %H:%M:%S.%e] [%l] %v");
- SPDLOG_INFO("------------------------------------------------");
+ SPDLOG_CRITICAL("------------------------------------------------");
- SPDLOG_INFO("Starting Torch...");
- SPDLOG_INFO("Scanning {}", folder);
+ SPDLOG_CRITICAL("Starting Torch...");
+ SPDLOG_CRITICAL("Scanning {}", folder);
auto start = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
std::unordered_map<std::string, std::vector<char>> files;
@@ -1345,14 +1348,14 @@ void Companion::Pack(const std::string& folder, const std::string& output, const
// Remove parent folder
normalized = normalized.substr(folder.length() + 1);
wrapper->AddFile(normalized, data);
- SPDLOG_INFO("> Added {}", normalized);
+ SPDLOG_CRITICAL("> Added {}", normalized);
}
auto end = duration_cast<milliseconds>(system_clock::now().time_since_epoch());
- SPDLOG_INFO("Done! Took {}ms", end.count() - start.count());
- SPDLOG_INFO("Exported to {}", output);
+ SPDLOG_CRITICAL("Done! Took {}ms", end.count() - start.count());
+ SPDLOG_CRITICAL("Exported to {}", output);
spdlog::set_pattern("[%Y-%m-%d %H:%M:%S.%e] [%l] %v");
- SPDLOG_INFO("------------------------------------------------");
+ SPDLOG_CRITICAL("------------------------------------------------");
wrapper->Close();
}
@@ -1380,7 +1383,7 @@ std::optional<std::tuple<std::string, YAML::Node>> Companion::RegisterAsset(cons
void Companion::RegisterFactory(const std::string& type, const std::shared_ptr<BaseFactory>& factory) {
this->gFactories[type] = factory;
- SPDLOG_DEBUG("Registered factory for {}", type);
+ SPDLOG_INFO("Registered factory for {}", type);
}
std::optional<std::shared_ptr<BaseFactory>> Companion::GetFactory(const std::string &type) {