lib/Epub/Epub.cpp

@@ -5,6 +5,7 @@
 #include <ZipFile.h>
 
 #include <map>
+#include <ratio>
 
 #include "Epub/FsHelpers.h"
 #include "Epub/parsers/ContainerParser.h"
@@ -126,6 +127,7 @@ bool Epub::parseTocNcxFile() {
 // load in the meta data for the epub file
 bool Epub::load() {
   Serial.printf("[%lu] [EBP] Loading ePub: %s\n", millis(), filepath.c_str());
+  ZipFile zip("/sd" + filepath);
 
   std::string contentOpfFilePath;
   if (!findContentOpfFile(&contentOpfFilePath)) {
@@ -153,21 +155,85 @@ bool Epub::load() {
   return true;
 }
 
-void Epub::initializeSpineItemSizes() {
-  Serial.printf("[%lu] [EBP] Calculating book size\n", millis());
+std::string normalisePath(const std::string& path) {
+  std::vector<std::string> components;
+  std::string component;
 
-  const size_t spineItemsCount = getSpineItemsCount();
-  size_t cumSpineItemSize = 0;
-  const ZipFile zip("/sd" + filepath);
-
-  for (size_t i = 0; i < spineItemsCount; i++) {
-    std::string spineItem = getSpineItem(i);
-    size_t s = 0;
-    getItemSize(zip, spineItem, &s);
-    cumSpineItemSize += s;
-    cumulativeSpineItemSize.emplace_back(cumSpineItemSize);
+  for (const auto c : path) {
+    if (c == '/') {
+      if (!component.empty()) {
+        if (component == "..") {
+          if (!components.empty()) {
+            components.pop_back();
+          }
+        } else {
+          components.push_back(component);
+        }
+        component.clear();
+      }
+    } else {
+      component += c;
+    }
   }
 
+  if (!component.empty()) {
+    components.push_back(component);
+  }
+
+  std::string result;
+  for (const auto& c : components) {
+    if (!result.empty()) {
+      result += "/";
+    }
+    result += c;
+  }
+
+  return result;
+}
+void Epub::initializeSpineItemSizes() {
+  setupCacheDir();
+
+  size_t spineItemsCount = getSpineItemsCount();
+  size_t cumSpineItemSize = 0;
+  if (SD.exists((getCachePath() + "/spine_size.bin").c_str())) {
+    File f = SD.open((getCachePath() + "/spine_size.bin").c_str());
+    uint8_t data[4];
+    for (size_t i = 0; i < spineItemsCount; i++) {
+      f.read(data, 4);
+      cumSpineItemSize = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
+      cumulativeSpineItemSize.emplace_back(cumSpineItemSize);
+      // 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
+    const ZipFile zip("/sd" + filepath);
+
+    for (size_t i = 0; i < spineItemsCount; i++) {
+      std::string spineItem = getSpineItem(i);
+      size_t s = 0;
+      unsigned long last = millis();
+      const std::string path = normalisePath(spineItem);
+      zip.getInflatedFileSize(path.c_str(), &s);
+      // getItemSize(spineItem, &s);
+      Serial.printf("[%lu] [EBP] Determining size %d of item %d took %lu ms\n", millis(), cumSpineItemSize, i,
+                    millis() - last);
+      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;
+      f.write(data, 4);
+    }
+
+    f.close();
+  }
   Serial.printf("[%lu] [EBP] Book size: %lu\n", millis(), cumSpineItemSize);
 }
 
@@ -208,42 +274,6 @@ const std::string& Epub::getTitle() const { return title; }
 
 const std::string& Epub::getCoverImageItem() const { return coverImageItem; }
 
-std::string normalisePath(const std::string& path) {
-  std::vector<std::string> components;
-  std::string component;
-
-  for (const auto c : path) {
-    if (c == '/') {
-      if (!component.empty()) {
-        if (component == "..") {
-          if (!components.empty()) {
-            components.pop_back();
-          }
-        } else {
-          components.push_back(component);
-        }
-        component.clear();
-      }
-    } else {
-      component += c;
-    }
-  }
-
-  if (!component.empty()) {
-    components.push_back(component);
-  }
-
-  std::string result;
-  for (const auto& c : components) {
-    if (!result.empty()) {
-      result += "/";
-    }
-    result += c;
-  }
-
-  return result;
-}
-
 uint8_t* Epub::readItemContentsToBytes(const std::string& itemHref, size_t* size, bool trailingNullByte) const {
   const ZipFile zip("/sd" + filepath);
   const std::string path = normalisePath(itemHref);
@@ -266,11 +296,8 @@ bool Epub::readItemContentsToStream(const std::string& itemHref, Print& out, con
 
 bool Epub::getItemSize(const std::string& itemHref, size_t* size) const {
   const ZipFile zip("/sd" + filepath);
-  return getItemSize(zip, itemHref, size);
-}
-
-bool Epub::getItemSize(const ZipFile& zip, const std::string& itemHref, size_t* size) {
   const std::string path = normalisePath(itemHref);
+
   return zip.getInflatedFileSize(path.c_str(), size);
 }
 

lib/Epub/Epub.h

@@ -33,7 +33,6 @@ class Epub {
   bool parseContentOpf(const std::string& contentOpfFilePath);
   bool parseTocNcxFile();
   void initializeSpineItemSizes();
-  static bool getItemSize(const ZipFile& zip, const std::string& itemHref, size_t* size);
 
  public:
   explicit Epub(std::string filepath, const std::string& cacheDir) : filepath(std::move(filepath)) {

lib/ZipFile/ZipFile.cpp

@@ -27,15 +27,6 @@ bool inflateOneShot(const uint8_t* inputBuf, const size_t deflatedSize, uint8_t*
   return true;
 }
 
-ZipFile::ZipFile(std::string filePath) : filePath(std::move(filePath)) {
-  const bool status = mz_zip_reader_init_file(&zipArchive, this->filePath.c_str(), 0);
-
-  if (!status) {
-    Serial.printf("[%lu] [ZIP] mz_zip_reader_init_file() failed for %s! Error: %s\n", millis(), this->filePath.c_str(),
-                  mz_zip_get_error_string(zipArchive.m_last_error));
-  }
-}
-
 bool ZipFile::loadFileStat(const char* filename, mz_zip_archive_file_stat* fileStat) const {
   // find the file
   mz_uint32 fileIndex = 0;

lib/ZipFile/ZipFile.h

@@ -1,6 +1,9 @@
 #pragma once
+#include <HardwareSerial.h>
 #include <Print.h>
 
+#include <cstddef>
+#include <functional>
 #include <string>
 
 #include "miniz.h"
@@ -12,7 +15,14 @@ class ZipFile {
   long getDataOffset(const mz_zip_archive_file_stat& fileStat) const;
 
  public:
-  explicit ZipFile(std::string filePath);
+  explicit ZipFile(std::string filePath) : filePath(std::move(filePath)) {
+    const bool status = mz_zip_reader_init_file(&zipArchive, this->filePath.c_str(), 0);
+
+    if (!status) {
+      Serial.printf("[%lu] [ZIP] mz_zip_reader_init_file() failed for %s! Error: %s\n", millis(),
+                    this->filePath.c_str(), mz_zip_get_error_string(zipArchive.m_last_error));
+    }
+  }
   ~ZipFile() { mz_zip_reader_end(&zipArchive); }
   bool getInflatedFileSize(const char* filename, size_t* size) const;
   uint8_t* readFileToMemory(const char* filename, size_t* size = nullptr, bool trailingNullByte = false) const;