mirror of
https://github.com/open-goal/jak-project
synced 2026-05-23 15:02:01 -04:00
logs: replace every fmt::print with a lg call instead (#1368)
Favors the `lg` namespace over `fmt` directly, as this will output the logs to a file / has log levels. I also made assertion errors go to a file, this unfortunately means importing `lg` and hence `fmt` which was attempted to be avoided before. But I'm not sure how else to do this aspect without re-inventing the file logging. We have a lot of commented out prints as well that we should probably cleanup at some point / switch them to trace level and default to `info` level. I noticed the pattern of disabling debug logs behind some boolean, something to consider cleaning up in the future -- if our logs were more structured (knowing where they are coming from) then a lot this boilerplate could be eliminated. Closes #1358
This commit is contained in:
@@ -150,7 +150,7 @@ ObjectFileDB::ObjectFileDB(const std::vector<fs::path>& _dgos,
|
||||
auto name = obj_filename_to_name(obj.string());
|
||||
if (auto it = config.object_patches.find(name); it != config.object_patches.end()) {
|
||||
// print the file CRC
|
||||
fmt::print("CRC for {} is: 0x{:X}\n", name, crc32(data.data(), data.size()));
|
||||
lg::print("CRC for {} is: 0x{:X}\n", name, crc32(data.data(), data.size()));
|
||||
// write patch file if necessary
|
||||
if (config.write_patches) {
|
||||
// this is the "target" file we want to patch to
|
||||
@@ -219,7 +219,7 @@ ObjectFileDB::ObjectFileDB(const std::vector<fs::path>& _dgos,
|
||||
}
|
||||
}
|
||||
|
||||
lg::info("ObjectFileDB Initialized\n");
|
||||
lg::info("ObjectFileDB Initialized");
|
||||
if (obj_files_by_name.empty()) {
|
||||
lg::error(
|
||||
"No object files have been added. Check that there are input files and the allowed_objects "
|
||||
@@ -496,7 +496,7 @@ void ObjectFileDB::process_link_data(const Config& config) {
|
||||
});
|
||||
|
||||
lg::info("Processed Link Data");
|
||||
lg::info(" Total {:.2f} ms\n", process_link_timer.getMs());
|
||||
lg::info(" Total {:.2f} ms", process_link_timer.getMs());
|
||||
// printf("\n");
|
||||
}
|
||||
|
||||
@@ -511,7 +511,7 @@ void ObjectFileDB::process_labels() {
|
||||
|
||||
lg::info("Processed Labels:");
|
||||
lg::info(" Total {} labels", total);
|
||||
lg::info(" Total {:.2f} ms\n", process_label_timer.getMs());
|
||||
lg::info(" Total {:.2f} ms", process_label_timer.getMs());
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -617,7 +617,7 @@ void ObjectFileDB::find_code(const Config& config) {
|
||||
auto total_ops = combined_stats.code_bytes / 4;
|
||||
lg::info(" Decoded {} / {} ({:.3f} %)", combined_stats.decoded_ops, total_ops,
|
||||
100.f * (float)combined_stats.decoded_ops / total_ops);
|
||||
lg::info(" Total {:.3f} ms\n", timer.getMs());
|
||||
lg::info(" Total {:.3f} ms", timer.getMs());
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -643,7 +643,7 @@ void ObjectFileDB::find_and_write_scripts(const fs::path& output_dir) {
|
||||
file_util::write_text_file(file_name, all_scripts);
|
||||
|
||||
lg::info("Found scripts:");
|
||||
lg::info(" Total {:.3f} ms\n", timer.getMs());
|
||||
lg::info(" Total {:.3f} ms", timer.getMs());
|
||||
}
|
||||
|
||||
std::string ObjectFileDB::process_tpages(TextureDB& tex_db, const fs::path& output_path) {
|
||||
@@ -741,10 +741,10 @@ void get_art_info(ObjectFileDB& db, ObjectFileData& obj) {
|
||||
const auto& words = obj.linked_data.words_by_seg.at(MAIN_SEGMENT);
|
||||
if (words.at(0).kind() == LinkedWord::Kind::TYPE_PTR &&
|
||||
words.at(0).symbol_name() == "art-group") {
|
||||
// fmt::print("art-group {}:\n", obj.to_unique_name());
|
||||
// lg::print("art-group {}:\n", obj.to_unique_name());
|
||||
auto name = obj.linked_data.get_goal_string_by_label(words.at(2).label_id());
|
||||
int length = words.at(3).data;
|
||||
// fmt::print(" length: {}\n", length);
|
||||
// lg::print(" length: {}\n", length);
|
||||
std::unordered_map<int, std::string> art_group_elts;
|
||||
for (int i = 0; i < length; ++i) {
|
||||
const auto& word = words.at(8 + i);
|
||||
@@ -772,7 +772,7 @@ void get_art_info(ObjectFileDB& db, ObjectFileData& obj) {
|
||||
fmt::format("unknown art elt type {} in {}", elt_type, obj.to_unique_name()));
|
||||
}
|
||||
art_group_elts[i] = unique_name;
|
||||
// fmt::print(" {}: {} ({}) -> {}\n", i, elt_name, elt_type, unique_name);
|
||||
// lg::print(" {}: {} ({}) -> {}\n", i, elt_name, elt_type, unique_name);
|
||||
}
|
||||
db.dts.art_group_info[obj.to_unique_name()] = art_group_elts;
|
||||
}
|
||||
@@ -795,7 +795,7 @@ void ObjectFileDB::extract_art_info() {
|
||||
}
|
||||
});
|
||||
|
||||
lg::info("Processed art groups: in {:.2f} ms\n", timer.getMs());
|
||||
lg::info("Processed art groups: in {:.2f} ms", timer.getMs());
|
||||
}
|
||||
|
||||
/*!
|
||||
@@ -822,7 +822,7 @@ void ObjectFileDB::dump_art_info(const fs::path& output_dir) {
|
||||
file_util::write_text_file(filename, result);
|
||||
}
|
||||
|
||||
lg::info("Written art group info: in {:.2f} ms\n", timer.getMs());
|
||||
lg::info("Written art group info: in {:.2f} ms", timer.getMs());
|
||||
}
|
||||
|
||||
void ObjectFileDB::dump_raw_objects(const fs::path& output_dir) {
|
||||
|
||||
Reference in New Issue
Block a user