Fix formatting.

This commit is contained in:
Jonas Diemer 2025-12-18 12:30:39 +01:00
parent 1a14b371fe
commit dbf8ce00d7
2 changed files with 39 additions and 40 deletions

View File

@ -154,47 +154,46 @@ bool Epub::load() {
return true; return true;
} }
void Epub::initializeSpineItemSizes(){ void Epub::initializeSpineItemSizes() {
setupCacheDir();
setupCacheDir(); size_t spineItemsCount = getSpineItemsCount();
size_t cumSpineItemSize = 0;
size_t spineItemsCount = getSpineItemsCount(); if (SD.exists((getCachePath() + "/spine_size.bin").c_str())) {
size_t cumSpineItemSize = 0; File f = SD.open((getCachePath() + "/spine_size.bin").c_str());
if (SD.exists((getCachePath() + "/spine_size.bin").c_str())) { uint8_t data[4];
File f = SD.open((getCachePath() + "/spine_size.bin").c_str()); for (size_t i = 0; i < spineItemsCount; i++) {
uint8_t data[4]; f.read(data, 4);
for (size_t i = 0; i < spineItemsCount; i++) { cumSpineItemSize = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
f.read(data, 4); cumulativeSpineItemSize.emplace_back(cumSpineItemSize);
cumSpineItemSize = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24); // Serial.printf("[%lu] [EBP] Loading item %d size %u to %u %u\n", millis(),
cumulativeSpineItemSize.emplace_back(cumSpineItemSize); // i, cumSpineItemSize, data[1], data[0]);
// Serial.printf("[%lu] [EBP] Loading item %d size %u to %u %u\n", millis(),
// i, cumSpineItemSize, data[1], data[0]);
}
f.close();
} else {
File f = SD.open((getCachePath() + "/spine_size.bin").c_str(), FILE_WRITE);
uint8_t data[4];
// determine size of spine items
for (size_t i = 0; i < spineItemsCount; i++) {
std::string spineItem = getSpineItem(i);
size_t s = 0;
getItemSize(spineItem, &s);
cumSpineItemSize += s;
cumulativeSpineItemSize.emplace_back(cumSpineItemSize);
// and persist to cache
data[0] = cumSpineItemSize & 0xFF;
data[1] = (cumSpineItemSize >> 8) & 0xFF;
data[2] = (cumSpineItemSize >> 16) & 0xFF;
data[3] = (cumSpineItemSize >> 24) & 0xFF;
// Serial.printf("[%lu] [EBP] Persisting item %d size %u to %u %u\n", millis(),
// i, cumSpineItemSize, data[1], data[0]);
f.write(data, 4);
}
f.close();
} }
Serial.printf("[%lu] [EBP] Book size: %lu\n", millis(), cumSpineItemSize); f.close();
} else {
File f = SD.open((getCachePath() + "/spine_size.bin").c_str(), FILE_WRITE);
uint8_t data[4];
// determine size of spine items
for (size_t i = 0; i < spineItemsCount; i++) {
std::string spineItem = getSpineItem(i);
size_t s = 0;
getItemSize(spineItem, &s);
cumSpineItemSize += s;
cumulativeSpineItemSize.emplace_back(cumSpineItemSize);
// and persist to cache
data[0] = cumSpineItemSize & 0xFF;
data[1] = (cumSpineItemSize >> 8) & 0xFF;
data[2] = (cumSpineItemSize >> 16) & 0xFF;
data[3] = (cumSpineItemSize >> 24) & 0xFF;
// Serial.printf("[%lu] [EBP] Persisting item %d size %u to %u %u\n", millis(),
// i, cumSpineItemSize, data[1], data[0]);
f.write(data, 4);
}
f.close();
}
Serial.printf("[%lu] [EBP] Book size: %lu\n", millis(), cumSpineItemSize);
} }
bool Epub::clearCache() const { bool Epub::clearCache() const {

View File

@ -216,7 +216,7 @@ void loop() {
return; return;
} }
if (inputManager.wasReleased(InputManager::BTN_POWER) && inputManager.getHeldTime() > POWER_BUTTON_WAKEUP_MS) { if (inputManager.wasReleased(InputManager::BTN_POWER) && inputManager.getHeldTime() > POWER_BUTTON_SLEEP_MS) {
enterDeepSleep(); enterDeepSleep();
// This should never be hit as `enterDeepSleep` calls esp_deep_sleep_start // This should never be hit as `enterDeepSleep` calls esp_deep_sleep_start
return; return;