Revert "Fix pagelist retrieval oom"

This reverts commit 2f9d052060.

lib/Epub/Epub/parsers/PageListSink.cpp

@@ -1,50 +0,0 @@
-#include "PageListSink.h"
-
-#include <Logging.h>
-#include <Serialization.h>
-
-PageListSink::PageListSink(const std::string& cachePath) : path(cachePath + "/pagelist.bin") {
-  if (!Storage.openFileForWrite("EBP", path, file)) {
-    LOG_ERR("EBP", "PageListSink: could not open pagelist.bin for writing");
-    return;
-  }
-  // Placeholder count; patched in finalize().
-  serialization::writePod(file, static_cast<uint16_t>(0));
-}
-
-PageListSink::~PageListSink() {
-  if (!finalized) {
-    finalize();
-  }
-}
-
-void PageListSink::addEntry(const std::string& href, const std::string& anchor, const std::string& label) {
-  if (!file.isOpen() || finalized) return;
-  serialization::writeString(file, href);
-  serialization::writeString(file, anchor);
-  serialization::writeString(file, label);
-  count++;
-}
-
-void PageListSink::finalize() {
-  if (finalized) return;
-  finalized = true;
-  if (!file.isOpen()) return;
-
-  if (count == 0) {
-    file.close();
-    Storage.remove(path.c_str());
-    return;
-  }
-
-  file.flush();
-  if (!file.seek(0)) {
-    LOG_ERR("EBP", "PageListSink: could not seek to patch count");
-    file.close();
-    return;
-  }
-  serialization::writePod(file, count);
-  file.flush();
-  file.close();
-  LOG_DBG("EBP", "Wrote pagelist.bin with %u entries", static_cast<unsigned>(count));
-}

lib/Epub/Epub/parsers/PageListSink.h

@@ -1,52 +0,0 @@
-#pragma once
-
-#include <HalStorage.h>
-
-#include <string>
-
-// Streams printed-page entries (href, anchor, label) directly to pagelist.bin
-// instead of buffering them in a std::vector. Buffering blows the X3 heap on
-// books with long EPUB 3 <nav epub:type="page-list"> sections (a few hundred
-// entries × 3 std::string each is enough to throw std::bad_alloc).
-//
-// File format matches the legacy writePageListBin() in Epub.cpp so the reader
-// side (Epub::loadPrintedPageList) is unchanged: u16 count, then per entry
-// writeString(href), writeString(anchor), writeString(label).
-//
-// Lifecycle: construct (opens the file and writes a placeholder count of 0),
-// addEntry(...) for each parsed entry, then finalize() to seek back and patch
-// the real count. If no entries were added, finalize() removes the file —
-// matching the legacy writer's "remove on empty" behaviour so subsequent
-// fallback parsers (NCX after nav, page-map after both) see no stale file.
-//
-// Not copyable; not thread-safe (each book parse is single-threaded).
-class PageListSink {
- public:
-  explicit PageListSink(const std::string& cachePath);
-  ~PageListSink();
-
-  PageListSink(const PageListSink&) = delete;
-  PageListSink& operator=(const PageListSink&) = delete;
-
-  // True if the file was opened successfully. When false, addEntry() and
-  // finalize() are no-ops; callers don't need to check before each push.
-  bool isOpen() const { return file.isOpen(); }
-
-  // Number of entries successfully streamed so far. Callers (e.g. Epub.cpp
-  // orchestrator deciding whether the NCX fallback should run) read this
-  // instead of inspecting the file.
-  uint16_t entryCount() const { return count; }
-
-  void addEntry(const std::string& href, const std::string& anchor, const std::string& label);
-
-  // Patches the placeholder count at offset 0 with the real entry count and
-  // closes the file. If no entries were added, the file is removed instead.
-  // Safe to call multiple times — subsequent calls are no-ops.
-  void finalize();
-
- private:
-  std::string path;
-  FsFile file;
-  uint16_t count = 0;
-  bool finalized = false;
-};

lib/Epub/Epub/parsers/PageMapParser.cpp

@@ -3,8 +3,6 @@
 #include <FsHelpers.h>
 #include <Logging.h>
 
-#include "PageListSink.h"
-
 bool PageMapParser::setup() {
   parser = XML_ParserCreate(nullptr);
   if (!parser) {
@@ -90,7 +88,7 @@ void XMLCALL PageMapParser::startElement(void* userData, const XML_Char* name, c
     }
   }
 
-  if (!self->pageListSink || label.empty() || rawHref.empty()) {
+  if (label.empty() || rawHref.empty()) {
     return;
   }
 
@@ -101,5 +99,5 @@ void XMLCALL PageMapParser::startElement(void* userData, const XML_Char* name, c
     anchor = href.substr(pos + 1);
     href = href.substr(0, pos);
   }
-  self->pageListSink->addEntry(href, anchor, label);
+  self->pageList.push_back({std::move(href), std::move(anchor), std::move(label)});
 }

lib/Epub/Epub/parsers/PageMapParser.h

@@ -3,30 +3,36 @@
 #include <expat.h>
 
 #include <string>
-
+#include <vector>
-class PageListSink;
 
 // Parser for EPUB 2.01 page-map.xml. Each <page name="X" href="...#anchor"/> element
 // maps a printed page number to a spine location. Same output shape as TocNcxParser
 // and TocNavParser so all three feed the shared pagelist.bin writer.
 class PageMapParser final : public Print {
+ public:
+  struct PageListEntry {
+    std::string href;
+    std::string anchor;
+    std::string label;
+  };
+
  private:
   const std::string& baseContentPath;
   size_t remainingSize;
   XML_Parser parser = nullptr;
-  // Page-list entries are streamed straight to disk via this sink. Owned by
+  std::vector<PageListEntry> pageList;
-  // the caller (Epub.cpp); may be null when no page-list output is wanted.
-  PageListSink* pageListSink;
 
   static void startElement(void* userData, const XML_Char* name, const XML_Char** atts);
 
  public:
-  explicit PageMapParser(const std::string& baseContentPath, const size_t xmlSize, PageListSink* pageListSink)
+  explicit PageMapParser(const std::string& baseContentPath, const size_t xmlSize)
-      : baseContentPath(baseContentPath), remainingSize(xmlSize), pageListSink(pageListSink) {}
+      : baseContentPath(baseContentPath), remainingSize(xmlSize) {}
   ~PageMapParser() override;
 
   bool setup();
 
   size_t write(uint8_t) override;
   size_t write(const uint8_t* buffer, size_t size) override;
+
+  const std::vector<PageListEntry>& getPageList() const { return pageList; }
 };

lib/Epub/Epub/parsers/TocNavParser.cpp

@@ -4,7 +4,6 @@
 #include <Logging.h>
 
 #include "../BookMetadataCache.h"
-#include "PageListSink.h"
 
 bool TocNavParser::setup() {
   parser = XML_ParserCreate(nullptr);
@@ -179,7 +178,7 @@ void XMLCALL TocNavParser::endElement(void* userData, const XML_Char* name) {
   // ---- Page-list nav close handlers (checked before TOC handlers because IN_PL_* states
   // sort after IN_NAV_TOC, but we want exact-state matching either way).
   if (strcmp(name, "a") == 0 && self->state == IN_PL_ANCHOR) {
-    if (self->pageListSink && !self->currentPageLabel.empty() && !self->currentPageHref.empty()) {
+    if (!self->currentPageLabel.empty() && !self->currentPageHref.empty()) {
       std::string href = FsHelpers::normalisePath(self->baseContentPath + self->currentPageHref);
       std::string anchor;
       const size_t pos = href.find('#');
@@ -187,10 +186,10 @@ void XMLCALL TocNavParser::endElement(void* userData, const XML_Char* name) {
         anchor = href.substr(pos + 1);
         href = href.substr(0, pos);
       }
-      self->pageListSink->addEntry(href, anchor, self->currentPageLabel);
+      self->pageList.push_back({std::move(href), std::move(anchor), std::move(self->currentPageLabel)});
+      self->currentPageLabel.clear();
+      self->currentPageHref.clear();
     }
-    self->currentPageLabel.clear();
-    self->currentPageHref.clear();
     self->state = IN_PL_LI;
     return;
   }

lib/Epub/Epub/parsers/TocNavParser.h

@@ -3,9 +3,9 @@
 #include <expat.h>
 
 #include <string>
+#include <vector>
 
 class BookMetadataCache;
-class PageListSink;
 
 // Parser for EPUB 3 nav.xhtml navigation documents
 // Parses HTML5 nav elements with epub:type="toc" (table of contents) and
@@ -25,15 +25,22 @@ class TocNavParser final : public Print {
     IN_PL_ANCHOR,      // Inside <a> (within page-list nav)
   };
 
+ public:
+  // One printed-page entry from <nav epub:type="page-list">: file href (normalised),
+  // anchor fragment, and visible label. Matches TocNcxParser::PageListEntry in shape so
+  // both parsers can feed the same pagelist.bin writer.
+  struct PageListEntry {
+    std::string href;
+    std::string anchor;
+    std::string label;
+  };
+
  private:
   const std::string& baseContentPath;
   size_t remainingSize;
   XML_Parser parser = nullptr;
   ParserState state = START;
   BookMetadataCache* cache;
-  // Page-list entries are streamed straight to disk via this sink. Owned by
-  // the caller (Epub.cpp); may be null when no page-list output is wanted.
-  PageListSink* pageListSink;
 
   // Track nesting depth for <ol> elements to determine TOC depth
   uint8_t olDepth = 0;
@@ -46,19 +53,21 @@ class TocNavParser final : public Print {
   uint8_t plOlDepth = 0;
   std::string currentPageLabel;
   std::string currentPageHref;
+  std::vector<PageListEntry> pageList;
 
   static void startElement(void* userData, const XML_Char* name, const XML_Char** atts);
   static void characterData(void* userData, const XML_Char* s, int len);
   static void endElement(void* userData, const XML_Char* name);
 
  public:
-  explicit TocNavParser(const std::string& baseContentPath, const size_t xmlSize, BookMetadataCache* cache,
+  explicit TocNavParser(const std::string& baseContentPath, const size_t xmlSize, BookMetadataCache* cache)
-                        PageListSink* pageListSink)
+      : baseContentPath(baseContentPath), remainingSize(xmlSize), cache(cache) {}
-      : baseContentPath(baseContentPath), remainingSize(xmlSize), cache(cache), pageListSink(pageListSink) {}
   ~TocNavParser() override;
 
   bool setup();
 
   size_t write(uint8_t) override;
   size_t write(const uint8_t* buffer, size_t size) override;
+
+  const std::vector<PageListEntry>& getPageList() const { return pageList; }
 };

lib/Epub/Epub/parsers/TocNcxParser.cpp

@@ -4,7 +4,6 @@
 #include <Logging.h>
 
 #include "../BookMetadataCache.h"
-#include "PageListSink.h"
 
 bool TocNcxParser::setup() {
   parser = XML_ParserCreate(nullptr);
@@ -229,7 +228,7 @@ void XMLCALL TocNcxParser::endElement(void* userData, const XML_Char* name) {
   }
 
   if (self->state == IN_PAGE_TARGET && strcmp(name, "pageTarget") == 0) {
-    if (self->pageListSink && !self->currentPageLabel.empty() && !self->currentPageSrc.empty()) {
+    if (!self->currentPageLabel.empty() && !self->currentPageSrc.empty()) {
       std::string href = FsHelpers::normalisePath(self->baseContentPath + self->currentPageSrc);
       std::string anchor;
       const size_t pos = href.find('#');
@@ -237,7 +236,7 @@ void XMLCALL TocNcxParser::endElement(void* userData, const XML_Char* name) {
         anchor = href.substr(pos + 1);
         href = href.substr(0, pos);
       }
-      self->pageListSink->addEntry(href, anchor, self->currentPageLabel);
+      self->pageList.push_back({std::move(href), std::move(anchor), self->currentPageLabel});
     }
     self->currentPageLabel.clear();
     self->currentPageSrc.clear();

lib/Epub/Epub/parsers/TocNcxParser.h

@@ -3,9 +3,9 @@
 #include <expat.h>
 
 #include <string>
+#include <vector>
 
 class BookMetadataCache;
-class PageListSink;
 
 class TocNcxParser final : public Print {
   enum ParserState {
@@ -22,15 +22,20 @@ class TocNcxParser final : public Print {
     IN_PAGE_TARGET_LABEL_TEXT,
   };
 
+ public:
+  // One printed-page reference from <pageList>: file href (normalised) + anchor fragment + visible label.
+  struct PageListEntry {
+    std::string href;    // normalised path to spine item
+    std::string anchor;  // fragment (empty = top of file)
+    std::string label;   // value shown to the reader (e.g. "1", "iv")
+  };
+
  private:
   const std::string& baseContentPath;
   size_t remainingSize;
   XML_Parser parser = nullptr;
   ParserState state = START;
   BookMetadataCache* cache;
-  // Page-list entries are streamed straight to disk via this sink. Owned by
-  // the caller (Epub.cpp); may be null when no page-list output is wanted.
-  PageListSink* pageListSink;
 
   std::string currentLabel;
   std::string currentSrc;
@@ -39,19 +44,21 @@ class TocNcxParser final : public Print {
   // <pageList> collection state
   std::string currentPageLabel;
   std::string currentPageSrc;
+  std::vector<PageListEntry> pageList;
 
   static void startElement(void* userData, const XML_Char* name, const XML_Char** atts);
   static void characterData(void* userData, const XML_Char* s, int len);
   static void endElement(void* userData, const XML_Char* name);
 
  public:
-  explicit TocNcxParser(const std::string& baseContentPath, const size_t xmlSize, BookMetadataCache* cache,
+  explicit TocNcxParser(const std::string& baseContentPath, const size_t xmlSize, BookMetadataCache* cache)
-                        PageListSink* pageListSink)
+      : baseContentPath(baseContentPath), remainingSize(xmlSize), cache(cache) {}
-      : baseContentPath(baseContentPath), remainingSize(xmlSize), cache(cache), pageListSink(pageListSink) {}
   ~TocNcxParser() override;
 
   bool setup();
 
   size_t write(uint8_t) override;
   size_t write(const uint8_t* buffer, size_t size) override;
+
+  const std::vector<PageListEntry>& getPageList() const { return pageList; }
 };