eliminat molt de ruido de la consola de log
This commit is contained in:
@@ -5,11 +5,12 @@
|
||||
#include <algorithm> // Para __sort_fn, sort
|
||||
#include <array> // Para array
|
||||
#include <functional> // Para identity
|
||||
#include <iomanip> // Para std::setw, std::setfill
|
||||
#include <iostream> // Para std::cout
|
||||
#include <iterator> // Para distance
|
||||
#include <ranges> // Para __find_if_fn, find_if
|
||||
#include <utility> // Para move
|
||||
|
||||
#include "ui/logger.hpp" // Para info
|
||||
#include "utils.hpp" // Para getFileName
|
||||
|
||||
// Resetea la tabla a los valores por defecto
|
||||
@@ -105,7 +106,7 @@ auto ManageHiScoreTable::loadFromFile(const std::string& file_path) -> bool {
|
||||
auto* file = SDL_IOFromFile(file_path.c_str(), "rb");
|
||||
|
||||
if (file == nullptr) {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: Unable to load %s file! %s", getFileName(file_path).c_str(), SDL_GetError());
|
||||
std::cout << "Error: Unable to load " << getFileName(file_path) << " file! " << SDL_GetError() << '\n';
|
||||
clear();
|
||||
return false;
|
||||
}
|
||||
@@ -152,9 +153,8 @@ auto ManageHiScoreTable::loadFromFile(const std::string& file_path) -> bool {
|
||||
// Si todo fue bien, actualizar la tabla; si no, usar valores por defecto
|
||||
if (success) {
|
||||
table_ = std::move(temp_table);
|
||||
SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "\nReading file: %s (loaded %d entries successfully)", getFileName(file_path).c_str(), table_size);
|
||||
} else {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "File %s is corrupted - loading default values", getFileName(file_path).c_str());
|
||||
std::cout << "File " << getFileName(file_path) << " is corrupted - loading default values" << '\n';
|
||||
clear();
|
||||
}
|
||||
|
||||
@@ -166,7 +166,7 @@ auto ManageHiScoreTable::loadFromFile(const std::string& file_path) -> bool {
|
||||
auto ManageHiScoreTable::validateMagicNumber(SDL_IOStream* file, const std::string& file_path) -> bool {
|
||||
std::array<char, 4> magic;
|
||||
if (SDL_ReadIO(file, magic.data(), 4) != 4 || magic[0] != 'C' || magic[1] != 'C' || magic[2] != 'A' || magic[3] != 'E') {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: Invalid magic number in %s - file may be corrupted or old format", getFileName(file_path).c_str());
|
||||
std::cout << "Error: Invalid magic number in " << getFileName(file_path) << " - file may be corrupted or old format" << '\n';
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -175,12 +175,12 @@ auto ManageHiScoreTable::validateMagicNumber(SDL_IOStream* file, const std::stri
|
||||
auto ManageHiScoreTable::validateVersion(SDL_IOStream* file, const std::string& file_path) -> bool {
|
||||
int version = 0;
|
||||
if (SDL_ReadIO(file, &version, sizeof(int)) != sizeof(int)) {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: Cannot read version in %s", getFileName(file_path).c_str());
|
||||
std::cout << "Error: Cannot read version in " << getFileName(file_path) << '\n';
|
||||
return false;
|
||||
}
|
||||
|
||||
if (version != FILE_VERSION) {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: Unsupported file version %d in %s (expected %d)", version, getFileName(file_path).c_str(), FILE_VERSION);
|
||||
std::cout << "Error: Unsupported file version " << version << " in " << getFileName(file_path) << " (expected " << FILE_VERSION << ")" << '\n';
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -188,12 +188,12 @@ auto ManageHiScoreTable::validateVersion(SDL_IOStream* file, const std::string&
|
||||
|
||||
auto ManageHiScoreTable::readTableSize(SDL_IOStream* file, const std::string& file_path, int& table_size) -> bool {
|
||||
if (SDL_ReadIO(file, &table_size, sizeof(int)) != sizeof(int)) {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: Cannot read table size in %s", getFileName(file_path).c_str());
|
||||
std::cout << "Error: Cannot read table size in " << getFileName(file_path) << '\n';
|
||||
return false;
|
||||
}
|
||||
|
||||
if (table_size < 0 || table_size > MAX_TABLE_SIZE) {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: Invalid table size %d in %s (expected 0-%d)", table_size, getFileName(file_path).c_str(), MAX_TABLE_SIZE);
|
||||
std::cout << "Error: Invalid table size " << table_size << " in " << getFileName(file_path) << " (expected 0-" << MAX_TABLE_SIZE << ")" << '\n';
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -202,31 +202,31 @@ auto ManageHiScoreTable::readTableSize(SDL_IOStream* file, const std::string& fi
|
||||
auto ManageHiScoreTable::readEntry(SDL_IOStream* file, const std::string& file_path, int index, HiScoreEntry& entry) -> bool {
|
||||
// Leer y validar puntuación
|
||||
if (SDL_ReadIO(file, &entry.score, sizeof(int)) != sizeof(int)) {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: Cannot read score for entry %d in %s", index, getFileName(file_path).c_str());
|
||||
std::cout << "Error: Cannot read score for entry " << index << " in " << getFileName(file_path) << '\n';
|
||||
return false;
|
||||
}
|
||||
|
||||
if (entry.score < 0 || entry.score > MAX_SCORE) {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: Invalid score %d for entry %d in %s", entry.score, index, getFileName(file_path).c_str());
|
||||
std::cout << "Error: Invalid score " << entry.score << " for entry " << index << " in " << getFileName(file_path) << '\n';
|
||||
return false;
|
||||
}
|
||||
|
||||
// Leer y validar tamaño del nombre
|
||||
int name_size = 0;
|
||||
if (SDL_ReadIO(file, &name_size, sizeof(int)) != sizeof(int)) {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: Cannot read name size for entry %d in %s", index, getFileName(file_path).c_str());
|
||||
std::cout << "Error: Cannot read name size for entry " << index << " in " << getFileName(file_path) << '\n';
|
||||
return false;
|
||||
}
|
||||
|
||||
if (name_size < 0 || name_size > MAX_NAME_SIZE) {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: Invalid name size %d for entry %d in %s", name_size, index, getFileName(file_path).c_str());
|
||||
std::cout << "Error: Invalid name size " << name_size << " for entry " << index << " in " << getFileName(file_path) << '\n';
|
||||
return false;
|
||||
}
|
||||
|
||||
// Leer el nombre
|
||||
std::vector<char> name_buffer(name_size + 1);
|
||||
if (SDL_ReadIO(file, name_buffer.data(), name_size) != static_cast<size_t>(name_size)) {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: Cannot read name for entry %d in %s", index, getFileName(file_path).c_str());
|
||||
std::cout << "Error: Cannot read name for entry " << index << " in " << getFileName(file_path) << '\n';
|
||||
return false;
|
||||
}
|
||||
name_buffer[name_size] = '\0';
|
||||
@@ -235,7 +235,7 @@ auto ManageHiScoreTable::readEntry(SDL_IOStream* file, const std::string& file_p
|
||||
// Leer one_credit_complete
|
||||
int occ_value = 0;
|
||||
if (SDL_ReadIO(file, &occ_value, sizeof(int)) != sizeof(int)) {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: Cannot read one_credit_complete for entry %d in %s", index, getFileName(file_path).c_str());
|
||||
std::cout << "Error: Cannot read one_credit_complete for entry " << index << " in " << getFileName(file_path) << '\n';
|
||||
return false;
|
||||
}
|
||||
entry.one_credit_complete = (occ_value != 0);
|
||||
@@ -246,13 +246,13 @@ auto ManageHiScoreTable::readEntry(SDL_IOStream* file, const std::string& file_p
|
||||
auto ManageHiScoreTable::verifyChecksum(SDL_IOStream* file, const std::string& file_path, const Table& temp_table) -> bool {
|
||||
unsigned int stored_checksum = 0;
|
||||
if (SDL_ReadIO(file, &stored_checksum, sizeof(unsigned int)) != sizeof(unsigned int)) {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: Cannot read checksum in %s", getFileName(file_path).c_str());
|
||||
std::cout << "Error: Cannot read checksum in " << getFileName(file_path) << '\n';
|
||||
return false;
|
||||
}
|
||||
|
||||
unsigned int calculated_checksum = calculateChecksum(temp_table);
|
||||
if (stored_checksum != calculated_checksum) {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: Checksum mismatch in %s (stored: 0x%08X, calculated: 0x%08X) - file is corrupted", getFileName(file_path).c_str(), stored_checksum, calculated_checksum);
|
||||
std::cout << "Error: Checksum mismatch in " << getFileName(file_path) << " (stored: 0x" << std::hex << std::setw(8) << std::setfill('0') << stored_checksum << ", calculated: 0x" << std::setw(8) << std::setfill('0') << calculated_checksum << std::dec << ") - file is corrupted" << '\n';
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@@ -317,11 +317,9 @@ auto ManageHiScoreTable::saveToFile(const std::string& file_path) -> bool {
|
||||
unsigned int checksum = calculateChecksum(table_);
|
||||
SDL_WriteIO(file, &checksum, sizeof(unsigned int));
|
||||
|
||||
// SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION, "Writing file: %s", getFileName(file_path).c_str());
|
||||
Logger::info("Writing file: " + getFileName(file_path));
|
||||
SDL_CloseIO(file);
|
||||
} else {
|
||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Error: Unable to save %s file! %s", getFileName(file_path).c_str(), SDL_GetError());
|
||||
std::cout << "Error: Unable to save " << getFileName(file_path) << " file! " << SDL_GetError() << '\n';
|
||||
success = false;
|
||||
}
|
||||
return success;
|
||||
|
||||
Reference in New Issue
Block a user