4cf395aee9
Ports upstream PR #1342 (feat: Add Book Info screen, richer metadata, and safer file-browser controls) with mod-specific adaptations: - Parse and cache series, seriesIndex, description from EPUB OPF - Bump book.bin cache version to 6 for new metadata fields - Add BookInfoActivity (new screen) accessible via Right button in FileBrowser - Add ManageBook menu via Left button in FileBrowser (replaces upstream hidden delete) - Guard all delete/archive actions with ConfirmationActivity (10 call sites) - Add inputArmed gating to ConfirmationActivity to prevent accidental confirmation - Safe deserialization: readString now returns bool with MAX_STRING_LENGTH guard - Add series field to RecentBooksStore with JSON and binary serialization - Add i18n keys: STR_BOOK_INFO, STR_AUTHOR, STR_SERIES, STR_FILE_SIZE, etc. Made-with: Cursor
86 lines
2.1 KiB
C++
86 lines
2.1 KiB
C++
#include "CrossPointState.h"
|
|
|
|
#include <HalStorage.h>
|
|
#include <JsonSettingsIO.h>
|
|
#include <Logging.h>
|
|
#include <Serialization.h>
|
|
|
|
namespace {
|
|
constexpr uint8_t STATE_FILE_VERSION = 4;
|
|
constexpr char STATE_FILE_BIN[] = "/.crosspoint/state.bin";
|
|
constexpr char STATE_FILE_JSON[] = "/.crosspoint/state.json";
|
|
constexpr char STATE_FILE_BAK[] = "/.crosspoint/state.bin.bak";
|
|
} // namespace
|
|
|
|
CrossPointState CrossPointState::instance;
|
|
|
|
bool CrossPointState::saveToFile() const {
|
|
Storage.mkdir("/.crosspoint");
|
|
return JsonSettingsIO::saveState(*this, STATE_FILE_JSON);
|
|
}
|
|
|
|
bool CrossPointState::loadFromFile() {
|
|
// Try JSON first
|
|
if (Storage.exists(STATE_FILE_JSON)) {
|
|
String json = Storage.readFile(STATE_FILE_JSON);
|
|
if (!json.isEmpty()) {
|
|
return JsonSettingsIO::loadState(*this, json.c_str());
|
|
}
|
|
}
|
|
|
|
// Fall back to binary migration
|
|
if (Storage.exists(STATE_FILE_BIN)) {
|
|
if (loadFromBinaryFile()) {
|
|
if (saveToFile()) {
|
|
Storage.rename(STATE_FILE_BIN, STATE_FILE_BAK);
|
|
LOG_DBG("CPS", "Migrated state.bin to state.json");
|
|
return true;
|
|
} else {
|
|
LOG_ERR("CPS", "Failed to save state during migration");
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
bool CrossPointState::loadFromBinaryFile() {
|
|
FsFile inputFile;
|
|
if (!Storage.openFileForRead("CPS", STATE_FILE_BIN, inputFile)) {
|
|
return false;
|
|
}
|
|
|
|
uint8_t version;
|
|
serialization::readPod(inputFile, version);
|
|
if (version > STATE_FILE_VERSION) {
|
|
LOG_ERR("CPS", "Deserialization failed: Unknown version %u", version);
|
|
inputFile.close();
|
|
return false;
|
|
}
|
|
|
|
if (!serialization::readString(inputFile, openEpubPath)) {
|
|
LOG_ERR("CPS", "Failed to read openEpubPath");
|
|
inputFile.close();
|
|
return false;
|
|
}
|
|
if (version >= 2) {
|
|
serialization::readPod(inputFile, lastSleepImage);
|
|
} else {
|
|
lastSleepImage = 0;
|
|
}
|
|
|
|
if (version >= 3) {
|
|
serialization::readPod(inputFile, readerActivityLoadCount);
|
|
}
|
|
|
|
if (version >= 4) {
|
|
serialization::readPod(inputFile, lastSleepFromReader);
|
|
} else {
|
|
lastSleepFromReader = false;
|
|
}
|
|
|
|
inputFile.close();
|
|
return true;
|
|
}
|