You've already forked crosspoint-reader
mirror of
https://github.com/crosspoint-reader/crosspoint-reader.git
synced 2026-04-29 10:26:52 -07:00
Zach Nelson
23aad213fc
## Summary **What is the goal of this PR?** (e.g., Implements the new feature for file uploading.) `DESTRUCTOR_CLOSES_FILE=1` is set in platformio.ini, which makes SdFat's FsBaseFile destructor call close() automatically when a file goes out of scope. Three categories of file close calls remain untouched: 1. Close before Storage.remove() on the same path: ScreenshotUtil.cpp closes the file before deleting it on write error. The remove might fail if the file is still open. 2. Close before reopening the same variable: Epub.cpp writes a temp NCX/nav file, closes it, then reopens it for reading. The RecentBooksStore.cpp close before saveToFile() is the same pattern, it rewrites the same file. 3. Close on member variables: BookMetadataCache.cpp (bookFile, spineFile, tocFile), Section.cpp (file), XtcParser.cpp (m_file), ZipFile.cpp (file). These persist beyond any single function scope, so the destructor timing doesn't match the intended close point. --- ### AI Usage While CrossPoint doesn't have restrictions on AI tools in contributing, please be transparent about their usage as it helps set the right context for reviewers. Did you use AI tools to help write this code? _**PARTIALLY**_
94 lines
2.4 KiB
C++
94 lines
2.4 KiB
C++
#include "I18n.h"
|
|
|
|
#include <HalStorage.h>
|
|
#include <HardwareSerial.h>
|
|
#include <Serialization.h>
|
|
|
|
#include "I18nStrings.h"
|
|
|
|
using namespace i18n_strings;
|
|
|
|
// Settings file path
|
|
static constexpr const char* SETTINGS_FILE = "/.crosspoint/language.bin";
|
|
static constexpr uint8_t SETTINGS_VERSION = 1;
|
|
|
|
I18n& I18n::getInstance() {
|
|
static I18n instance;
|
|
return instance;
|
|
}
|
|
|
|
const char* I18n::get(StrId id) const {
|
|
const auto index = static_cast<size_t>(id);
|
|
if (index >= static_cast<size_t>(StrId::_COUNT)) {
|
|
return "???";
|
|
}
|
|
|
|
// Use generated helper function - no hardcoded switch needed!
|
|
const char* const* strings = getStringArray(_language);
|
|
return strings[index];
|
|
}
|
|
|
|
void I18n::setLanguage(Language lang) {
|
|
if (lang >= Language::_COUNT) {
|
|
return;
|
|
}
|
|
_language = lang;
|
|
saveSettings();
|
|
}
|
|
|
|
const char* I18n::getLanguageName(Language lang) const {
|
|
const auto index = static_cast<size_t>(lang);
|
|
if (index >= static_cast<size_t>(Language::_COUNT)) {
|
|
return "???";
|
|
}
|
|
return LANGUAGE_NAMES[index];
|
|
}
|
|
|
|
void I18n::saveSettings() {
|
|
Storage.mkdir("/.crosspoint");
|
|
|
|
FsFile file;
|
|
if (!Storage.openFileForWrite("I18N", SETTINGS_FILE, file)) {
|
|
Serial.printf("[I18N] Failed to save settings\n");
|
|
return;
|
|
}
|
|
|
|
serialization::writePod(file, SETTINGS_VERSION);
|
|
serialization::writePod(file, static_cast<uint8_t>(_language));
|
|
|
|
file.close();
|
|
Serial.printf("[I18N] Settings saved: language=%d\n", static_cast<int>(_language));
|
|
}
|
|
|
|
void I18n::loadSettings() {
|
|
FsFile file;
|
|
if (!Storage.openFileForRead("I18N", SETTINGS_FILE, file)) {
|
|
Serial.printf("[I18N] No settings file, using default (English)\n");
|
|
return;
|
|
}
|
|
|
|
uint8_t version;
|
|
serialization::readPod(file, version);
|
|
if (version != SETTINGS_VERSION) {
|
|
Serial.printf("[I18N] Settings version mismatch\n");
|
|
return;
|
|
}
|
|
|
|
uint8_t lang;
|
|
serialization::readPod(file, lang);
|
|
if (lang < static_cast<size_t>(Language::_COUNT)) {
|
|
_language = static_cast<Language>(lang);
|
|
Serial.printf("[I18N] Loaded language: %d\n", static_cast<int>(_language));
|
|
}
|
|
}
|
|
|
|
// Generate character set for a specific language
|
|
const char* I18n::getCharacterSet(Language lang) {
|
|
const auto langIndex = static_cast<size_t>(lang);
|
|
if (langIndex >= static_cast<size_t>(Language::_COUNT)) {
|
|
lang = Language::EN; // Fallback to first language
|
|
}
|
|
|
|
return CHARACTER_SETS[static_cast<size_t>(lang)];
|
|
}
|