mirror of
https://github.com/daveallie/crosspoint-reader.git
synced 2026-02-04 14:47:37 +03:00
## Summary * **What is the goal of this PR?** Improve reliability and user experience during chapter indexing by adding retry logic for SD card operations and a visual progress bar. * **What changes are included?** - **Retry logic**: Add 3 retry attempts with 50ms delay for ZIP to SD card streaming to handle timing issues after display refresh - **Progress bar**: Display a visual progress bar (0-100%) during chapter indexing based on file read progress, updating every 10% to balance responsiveness with e-ink display limitations ## Additional Context * **Problem observed**: When navigating quickly through books with many chapters (before chapter titles finish rendering), the "Indexing..." screen would appear frozen. Checking the serial log revealed the operation had silently failed, but the UI showed no indication of this. Users would likely assume the device had crashed. Pressing the next button again would resume operation, but this behavior was confusing and unexpected. * **Solution**: - Retry logic handles transient SD card timing failures automatically, so users don't need to manually retry - Progress bar provides visual feedback so users know indexing is actively working (not frozen) * **Why timing issues occur**: After display refresh operations, there can be timing conflicts when immediately starting SD card write operations. This is more likely to happen when rapidly navigating through chapters. * **Progress bar design**: Updates every 10% to avoid excessive e-ink refreshes while still providing meaningful feedback during long indexing operations (especially for large chapters with CJK characters). * **Performance**: Minimal overhead - progress calculation is simple byte counting, and display updates use `FAST_REFRESH` mode.
196 lines
6.6 KiB
C++
196 lines
6.6 KiB
C++
#include "ParsedText.h"
|
|
|
|
#include <GfxRenderer.h>
|
|
|
|
#include <algorithm>
|
|
#include <cmath>
|
|
#include <functional>
|
|
#include <limits>
|
|
#include <vector>
|
|
|
|
constexpr int MAX_COST = std::numeric_limits<int>::max();
|
|
|
|
void ParsedText::addWord(std::string word, const EpdFontStyle fontStyle) {
|
|
if (word.empty()) return;
|
|
|
|
words.push_back(std::move(word));
|
|
wordStyles.push_back(fontStyle);
|
|
}
|
|
|
|
// Consumes data to minimize memory usage
|
|
void ParsedText::layoutAndExtractLines(const GfxRenderer& renderer, const int fontId, const int horizontalMargin,
|
|
const std::function<void(std::shared_ptr<TextBlock>)>& processLine,
|
|
const bool includeLastLine) {
|
|
if (words.empty()) {
|
|
return;
|
|
}
|
|
|
|
const int pageWidth = renderer.getScreenWidth() - horizontalMargin;
|
|
const int spaceWidth = renderer.getSpaceWidth(fontId);
|
|
const auto wordWidths = calculateWordWidths(renderer, fontId);
|
|
const auto lineBreakIndices = computeLineBreaks(pageWidth, spaceWidth, wordWidths);
|
|
const size_t lineCount = includeLastLine ? lineBreakIndices.size() : lineBreakIndices.size() - 1;
|
|
|
|
for (size_t i = 0; i < lineCount; ++i) {
|
|
extractLine(i, pageWidth, spaceWidth, wordWidths, lineBreakIndices, processLine);
|
|
}
|
|
}
|
|
|
|
std::vector<uint16_t> ParsedText::calculateWordWidths(const GfxRenderer& renderer, const int fontId) {
|
|
const size_t totalWordCount = words.size();
|
|
|
|
std::vector<uint16_t> wordWidths;
|
|
wordWidths.reserve(totalWordCount);
|
|
|
|
// add em-space at the beginning of first word in paragraph to indent
|
|
if (!extraParagraphSpacing) {
|
|
std::string& first_word = words.front();
|
|
first_word.insert(0, "\xe2\x80\x83");
|
|
}
|
|
|
|
auto wordsIt = words.begin();
|
|
auto wordStylesIt = wordStyles.begin();
|
|
|
|
while (wordsIt != words.end()) {
|
|
wordWidths.push_back(renderer.getTextWidth(fontId, wordsIt->c_str(), *wordStylesIt));
|
|
|
|
std::advance(wordsIt, 1);
|
|
std::advance(wordStylesIt, 1);
|
|
}
|
|
|
|
return wordWidths;
|
|
}
|
|
|
|
std::vector<size_t> ParsedText::computeLineBreaks(const int pageWidth, const int spaceWidth,
|
|
const std::vector<uint16_t>& wordWidths) const {
|
|
const size_t totalWordCount = words.size();
|
|
|
|
// DP table to store the minimum badness (cost) of lines starting at index i
|
|
std::vector<int> dp(totalWordCount);
|
|
// 'ans[i]' stores the index 'j' of the *last word* in the optimal line starting at 'i'
|
|
std::vector<size_t> ans(totalWordCount);
|
|
|
|
// Base Case
|
|
dp[totalWordCount - 1] = 0;
|
|
ans[totalWordCount - 1] = totalWordCount - 1;
|
|
|
|
for (int i = totalWordCount - 2; i >= 0; --i) {
|
|
int currlen = -spaceWidth;
|
|
dp[i] = MAX_COST;
|
|
|
|
for (size_t j = i; j < totalWordCount; ++j) {
|
|
// Current line length: previous width + space + current word width
|
|
currlen += wordWidths[j] + spaceWidth;
|
|
|
|
if (currlen > pageWidth) {
|
|
break;
|
|
}
|
|
|
|
int cost;
|
|
if (j == totalWordCount - 1) {
|
|
cost = 0; // Last line
|
|
} else {
|
|
const int remainingSpace = pageWidth - currlen;
|
|
// Use long long for the square to prevent overflow
|
|
const long long cost_ll = static_cast<long long>(remainingSpace) * remainingSpace + dp[j + 1];
|
|
|
|
if (cost_ll > MAX_COST) {
|
|
cost = MAX_COST;
|
|
} else {
|
|
cost = static_cast<int>(cost_ll);
|
|
}
|
|
}
|
|
|
|
if (cost < dp[i]) {
|
|
dp[i] = cost;
|
|
ans[i] = j; // j is the index of the last word in this optimal line
|
|
}
|
|
}
|
|
|
|
// Handle oversized word: if no valid configuration found, force single-word line
|
|
// This prevents cascade failure where one oversized word breaks all preceding words
|
|
if (dp[i] == MAX_COST) {
|
|
ans[i] = i; // Just this word on its own line
|
|
// Inherit cost from next word to allow subsequent words to find valid configurations
|
|
if (i + 1 < static_cast<int>(totalWordCount)) {
|
|
dp[i] = dp[i + 1];
|
|
} else {
|
|
dp[i] = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Stores the index of the word that starts the next line (last_word_index + 1)
|
|
std::vector<size_t> lineBreakIndices;
|
|
size_t currentWordIndex = 0;
|
|
|
|
while (currentWordIndex < totalWordCount) {
|
|
size_t nextBreakIndex = ans[currentWordIndex] + 1;
|
|
|
|
// Safety check: prevent infinite loop if nextBreakIndex doesn't advance
|
|
if (nextBreakIndex <= currentWordIndex) {
|
|
// Force advance by at least one word to avoid infinite loop
|
|
nextBreakIndex = currentWordIndex + 1;
|
|
}
|
|
|
|
lineBreakIndices.push_back(nextBreakIndex);
|
|
currentWordIndex = nextBreakIndex;
|
|
}
|
|
|
|
return lineBreakIndices;
|
|
}
|
|
|
|
void ParsedText::extractLine(const size_t breakIndex, const int pageWidth, const int spaceWidth,
|
|
const std::vector<uint16_t>& wordWidths, const std::vector<size_t>& lineBreakIndices,
|
|
const std::function<void(std::shared_ptr<TextBlock>)>& processLine) {
|
|
const size_t lineBreak = lineBreakIndices[breakIndex];
|
|
const size_t lastBreakAt = breakIndex > 0 ? lineBreakIndices[breakIndex - 1] : 0;
|
|
const size_t lineWordCount = lineBreak - lastBreakAt;
|
|
|
|
// Calculate total word width for this line
|
|
int lineWordWidthSum = 0;
|
|
for (size_t i = lastBreakAt; i < lineBreak; i++) {
|
|
lineWordWidthSum += wordWidths[i];
|
|
}
|
|
|
|
// Calculate spacing
|
|
const int spareSpace = pageWidth - lineWordWidthSum;
|
|
|
|
int spacing = spaceWidth;
|
|
const bool isLastLine = breakIndex == lineBreakIndices.size() - 1;
|
|
|
|
if (style == TextBlock::JUSTIFIED && !isLastLine && lineWordCount >= 2) {
|
|
spacing = spareSpace / (lineWordCount - 1);
|
|
}
|
|
|
|
// Calculate initial x position
|
|
uint16_t xpos = 0;
|
|
if (style == TextBlock::RIGHT_ALIGN) {
|
|
xpos = spareSpace - (lineWordCount - 1) * spaceWidth;
|
|
} else if (style == TextBlock::CENTER_ALIGN) {
|
|
xpos = (spareSpace - (lineWordCount - 1) * spaceWidth) / 2;
|
|
}
|
|
|
|
// Pre-calculate X positions for words
|
|
std::list<uint16_t> lineXPos;
|
|
for (size_t i = lastBreakAt; i < lineBreak; i++) {
|
|
const uint16_t currentWordWidth = wordWidths[i];
|
|
lineXPos.push_back(xpos);
|
|
xpos += currentWordWidth + spacing;
|
|
}
|
|
|
|
// Iterators always start at the beginning as we are moving content with splice below
|
|
auto wordEndIt = words.begin();
|
|
auto wordStyleEndIt = wordStyles.begin();
|
|
std::advance(wordEndIt, lineWordCount);
|
|
std::advance(wordStyleEndIt, lineWordCount);
|
|
|
|
// *** CRITICAL STEP: CONSUME DATA USING SPLICE ***
|
|
std::list<std::string> lineWords;
|
|
lineWords.splice(lineWords.begin(), words, words.begin(), wordEndIt);
|
|
std::list<EpdFontStyle> lineWordStyles;
|
|
lineWordStyles.splice(lineWordStyles.begin(), wordStyles, wordStyles.begin(), wordStyleEndIt);
|
|
|
|
processLine(std::make_shared<TextBlock>(std::move(lineWords), std::move(lineXPos), std::move(lineWordStyles), style));
|
|
}
|