snark13/Xteink-X4-crosspoint-reader
1
0
Fork 0
mirror of https://github.com/daveallie/crosspoint-reader.git synced 2025-12-18 15:17:42 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

revert

Browse Source
This commit is contained in:
Arthur Tazhitdinov 2025-12-15 21:15:27 +03:00
parent 3550577275
commit 9e678a1b50
5 changed files with 26 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Epub/Epub.cpp
View File

@ -70,16 +70,18 @@ bool Epub::parseContentOpf(const std::string& contentOpfFilePath) {
// Grab data from opfParser into epub
title = opfParser.title;
if (!opfParser.coverItemId.empty() && opfParser.items.count(opfParser.coverItemId) > 0) {
coverImageItem = opfParser.items.at(opfParser.coverItemId).href;
coverImageItem = opfParser.items.at(opfParser.coverItemId);
}
if (!opfParser.tocNcxPath.empty()) {
tocNcxItem = opfParser.tocNcxPath;
if (opfParser.items.count("ncx")) {
tocNcxItem = opfParser.items.at("ncx");
} else if (opfParser.items.count("ncxtoc")) {
tocNcxItem = opfParser.items.at("ncxtoc");
}
for (auto& spineRef : opfParser.spineRefs) {
if (opfParser.items.count(spineRef)) {
spine.emplace_back(spineRef, opfParser.items.at(spineRef).href);
spine.emplace_back(spineRef, opfParser.items.at(spineRef));
}
}

13
lib/Epub/Epub/parsers/ContentOpfParser.cpp
View File

@ -110,24 +110,17 @@ void XMLCALL ContentOpfParser::startElement(void* userData, const XML_Char* name
if (self->state == IN_MANIFEST && (strcmp(name, "item") == 0 || strcmp(name, "opf:item") == 0)) {
std::string itemId;
ManifestItem item;
std::string href;
for (int i = 0; atts[i]; i += 2) {
if (strcmp(atts[i], "id") == 0) {
itemId = atts[i + 1];
} else if (strcmp(atts[i], "href") == 0) {
item.href = self->baseContentPath + atts[i + 1];
} else if (strcmp(atts[i], "media-type") == 0) {
item.mediaType = atts[i + 1];
href = self->baseContentPath + atts[i + 1];
}
}
if (!itemId.empty()) {
self->items[itemId] = item;
if (item.mediaType == "application/x-dtbncx+xml" && self->tocNcxPath.empty()) {
self->tocNcxPath = item.href;
}
}
self->items[itemId] = href;
return;
}

9
lib/Epub/Epub/parsers/ContentOpfParser.h
View File

@ -2,8 +2,6 @@
#include <Print.h>
#include <map>
#include <string>
#include <vector>
#include "Epub.h"
#include "expat.h"
@ -28,15 +26,10 @@ class ContentOpfParser final : public Print {
static void endElement(void* userData, const XML_Char* name);
public:
struct ManifestItem {
std::string href;
std::string mediaType;
};
std::string title;
std::string tocNcxPath;
std::string coverItemId;
std::map<std::string, ManifestItem> items;
std::map<std::string, std::string> items;
std::vector<std::string> spineRefs;
explicit ContentOpfParser(const std::string& baseContentPath, const size_t xmlSize)

103
src/screens/EpubReaderChapterSelectionScreen.cpp
View File

@ -13,41 +13,13 @@ void EpubReaderChapterSelectionScreen::taskTrampoline(void* param) {
self->displayTaskLoop();
}
void EpubReaderChapterSelectionScreen::rebuildVisibleSpineIndices() {
visibleSpineIndices.clear();
if (!epub) {
return;
}
const int spineCount = epub->getSpineItemsCount();
visibleSpineIndices.reserve(spineCount);
for (int i = 0; i < spineCount; i++) {
if (epub->getTocIndexForSpineIndex(i) != -1) {
visibleSpineIndices.push_back(i);
}
}
}
void EpubReaderChapterSelectionScreen::onEnter() {
if (!epub) {
return;
}
renderingMutex = xSemaphoreCreateMutex();
rebuildVisibleSpineIndices();
selectorIndex = 0;
if (!visibleSpineIndices.empty()) {
for (size_t i = 0; i < visibleSpineIndices.size(); i++) {
if (visibleSpineIndices[i] == currentSpineIndex) {
selectorIndex = static_cast<int>(i);
break;
}
}
if (selectorIndex >= static_cast<int>(visibleSpineIndices.size())) {
selectorIndex = static_cast<int>(visibleSpineIndices.size()) - 1;
}
}
selectorIndex = currentSpineIndex;
// Trigger first update
updateRequired = true;
@ -68,7 +40,6 @@ void EpubReaderChapterSelectionScreen::onExit() {
}
vSemaphoreDelete(renderingMutex);
renderingMutex = nullptr;
visibleSpineIndices.clear();
}
void EpubReaderChapterSelectionScreen::handleInput() {
@ -80,53 +51,22 @@ void EpubReaderChapterSelectionScreen::handleInput() {
const bool skipPage = inputManager.getHeldTime() > SKIP_PAGE_MS;
if (inputManager.wasPressed(InputManager::BTN_CONFIRM)) {
if (!visibleSpineIndices.empty()) {
if (selectorIndex >= static_cast<int>(visibleSpineIndices.size())) {
selectorIndex = static_cast<int>(visibleSpineIndices.size()) - 1;
}
onSelectSpineIndex(visibleSpineIndices[selectorIndex]);
}
return;
}
if (inputManager.wasPressed(InputManager::BTN_BACK)) {
onSelectSpineIndex(selectorIndex);
} else if (inputManager.wasPressed(InputManager::BTN_BACK)) {
onGoBack();
return;
}
const int chapterCount = static_cast<int>(visibleSpineIndices.size());
if (chapterCount == 0) {
return;
}
if (selectorIndex >= chapterCount) {
selectorIndex = chapterCount - 1;
}
if (prevReleased) {
} else if (prevReleased) {
if (skipPage) {
const int totalPages = (chapterCount + PAGE_ITEMS - 1) / PAGE_ITEMS;
int currentPage = selectorIndex / PAGE_ITEMS;
currentPage = (currentPage + totalPages - 1) % totalPages;
selectorIndex = currentPage * PAGE_ITEMS;
if (selectorIndex >= chapterCount) {
selectorIndex = chapterCount - 1;
}
selectorIndex =
((selectorIndex / PAGE_ITEMS - 1) * PAGE_ITEMS + epub->getSpineItemsCount()) % epub->getSpineItemsCount();
} else {
selectorIndex = (selectorIndex + chapterCount - 1) % chapterCount;
selectorIndex = (selectorIndex + epub->getSpineItemsCount() - 1) % epub->getSpineItemsCount();
}
updateRequired = true;
} else if (nextReleased) {
if (skipPage) {
const int totalPages = (chapterCount + PAGE_ITEMS - 1) / PAGE_ITEMS;
int currentPage = selectorIndex / PAGE_ITEMS;
currentPage = (currentPage + 1) % totalPages;
selectorIndex = currentPage * PAGE_ITEMS;
if (selectorIndex >= chapterCount) {
selectorIndex = chapterCount - 1;
}
selectorIndex = ((selectorIndex / PAGE_ITEMS + 1) * PAGE_ITEMS) % epub->getSpineItemsCount();
} else {
selectorIndex = (selectorIndex + 1) % chapterCount;
selectorIndex = (selectorIndex + 1) % epub->getSpineItemsCount();
}
updateRequired = true;
}
@ -150,28 +90,17 @@ void EpubReaderChapterSelectionScreen::renderScreen() {
const auto pageWidth = renderer.getScreenWidth();
renderer.drawCenteredText(READER_FONT_ID, 10, "Select Chapter", true, BOLD);
const int chapterCount = static_cast<int>(visibleSpineIndices.size());
if (chapterCount == 0) {
renderer.drawText(UI_FONT_ID, 20, 60, "No chapters available");
renderer.displayBuffer();
return;
}
if (selectorIndex >= chapterCount) {
selectorIndex = chapterCount - 1;
}
const auto pageStartIndex = selectorIndex / PAGE_ITEMS * PAGE_ITEMS;
renderer.fillRect(0, 60 + (selectorIndex % PAGE_ITEMS) * 30 + 2, pageWidth - 1, 30);
for (int i = pageStartIndex; i < chapterCount && i < pageStartIndex + PAGE_ITEMS; i++) {
const int spineIndex = visibleSpineIndices[i];
const int tocIndex = epub->getTocIndexForSpineIndex(spineIndex);
for (int i = pageStartIndex; i < epub->getSpineItemsCount() && i < pageStartIndex + PAGE_ITEMS; i++) {
const int tocIndex = epub->getTocIndexForSpineIndex(i);
if (tocIndex == -1) {
continue; // Filtered chapters should not reach here, but skip defensively.
renderer.drawText(UI_FONT_ID, 20, 60 + (i % PAGE_ITEMS) * 30, "Unnamed", i != selectorIndex);
} else {
auto item = epub->getTocItem(tocIndex);
renderer.drawText(UI_FONT_ID, 20 + (item.level - 1) * 15, 60 + (i % PAGE_ITEMS) * 30, item.title.c_str(),
i != selectorIndex);
}
auto item = epub->getTocItem(tocIndex);
renderer.drawText(UI_FONT_ID, 20 + (item.level - 1) * 15, 60 + (i % PAGE_ITEMS) * 30, item.title.c_str(),
i != selectorIndex);
}
renderer.displayBuffer();

3
src/screens/EpubReaderChapterSelectionScreen.h
View File

@ -5,7 +5,6 @@
#include <freertos/task.h>
#include <memory>
#include <vector>
#include "Screen.h"
@ -16,13 +15,11 @@ class EpubReaderChapterSelectionScreen final : public Screen {
int currentSpineIndex = 0;
int selectorIndex = 0;
bool updateRequired = false;
std::vector<int> visibleSpineIndices;
const std::function<void()> onGoBack;
const std::function<void(int newSpineIndex)> onSelectSpineIndex;
static void taskTrampoline(void* param);
[[noreturn]] void displayTaskLoop();
void rebuildVisibleSpineIndices();
void renderScreen();
public: