Merge 111d4b8b16 into f67c544e16

src/RecentBooksStore.cpp

@@ -1,11 +1,15 @@
 #include "RecentBooksStore.h"
 
+#include <Epub.h>
 #include <HardwareSerial.h>
 #include <SDCardManager.h>
 #include <Serialization.h>
+#include <Xtc.h>
 
 #include <algorithm>
 
+#include "util/StringUtils.h"
+
 namespace {
 constexpr uint8_t RECENT_BOOKS_FILE_VERSION = 3;
 constexpr char RECENT_BOOKS_FILE[] = "/.crosspoint/recent.bin";
@@ -59,6 +63,34 @@ bool RecentBooksStore::saveToFile() const {
   return true;
 }
 
+RecentBook RecentBooksStore::getDataFromBook(std::string path) const {
+  std::string lastBookFileName = "";
+  const size_t lastSlash = path.find_last_of('/');
+  if (lastSlash != std::string::npos) {
+    lastBookFileName = path.substr(lastSlash + 1);
+  }
+
+  Serial.printf("Loading recent book: %s\n", path.c_str());
+
+  // If epub, try to load the metadata for title/author and cover
+  if (StringUtils::checkFileExtension(lastBookFileName, ".epub")) {
+    Epub epub(path, "/.crosspoint");
+    epub.load(false);
+    return RecentBook{path, epub.getTitle(), epub.getAuthor(), epub.getThumbBmpPath()};
+  } else if (StringUtils::checkFileExtension(lastBookFileName, ".xtch") ||
+             StringUtils::checkFileExtension(lastBookFileName, ".xtc")) {
+    // Handle XTC file
+    Xtc xtc(path, "/.crosspoint");
+    if (xtc.load()) {
+      return RecentBook{path, xtc.getTitle(), xtc.getAuthor(), xtc.getThumbBmpPath()};
+    }
+  } else if (StringUtils::checkFileExtension(lastBookFileName, ".txt") ||
+             StringUtils::checkFileExtension(lastBookFileName, ".md")) {
+    return RecentBook{path, lastBookFileName, "", ""};
+  }
+  return RecentBook{path, "", "", ""};
+}
+
 bool RecentBooksStore::loadFromFile() {
   FsFile inputFile;
   if (!SdMan.openFileForRead("RBS", RECENT_BOOKS_FILE, inputFile)) {
@@ -68,7 +100,7 @@ bool RecentBooksStore::loadFromFile() {
   uint8_t version;
   serialization::readPod(inputFile, version);
   if (version != RECENT_BOOKS_FILE_VERSION) {
-    if (version == 1) {
+    if (version == 1 || version == 2) {
       // Old version, just read paths
       uint8_t count;
       serialization::readPod(inputFile, count);
@@ -77,25 +109,18 @@ bool RecentBooksStore::loadFromFile() {
       for (uint8_t i = 0; i < count; i++) {
         std::string path;
         serialization::readString(inputFile, path);
-        // Title and author will be empty, they will be filled when the book is
-        // opened again
-        std::string fileName = path.substr(path.rfind('/') + 1);
-        recentBooks.push_back({path, fileName, "", "-"});
-      }
-    } else if (version == 2) {
-      // Old version, just read paths, titles and authors
-      uint8_t count;
-      serialization::readPod(inputFile, count);
-      recentBooks.clear();
-      recentBooks.reserve(count);
-      for (uint8_t i = 0; i < count; i++) {
-        std::string path, title, author;
-        serialization::readString(inputFile, path);
-        serialization::readString(inputFile, title);
-        serialization::readString(inputFile, author);
-        // Title and author will be empty, they will be filled when the book is
-        // opened again
-        recentBooks.push_back({path, title, author, "-"});
+
+        // load book to get missing data
+        RecentBook book = getDataFromBook(path);
+        if (book.title.empty() && book.author.empty() && version == 2) {
+          // Fall back to loading what we can from the store
+          std::string title, author;
+          serialization::readString(inputFile, title);
+          serialization::readString(inputFile, author);
+          recentBooks.push_back({path, title, author, ""});
+        } else {
+          recentBooks.push_back(book);
+        }
       }
     } else {
       Serial.printf("[%lu] [RBS] Deserialization failed: Unknown version %u\n", millis(), version);

src/RecentBooksStore.h

@@ -36,6 +36,7 @@ class RecentBooksStore {
   bool saveToFile() const;
 
   bool loadFromFile();
+  RecentBook getDataFromBook(std::string path) const;
 };
 
 // Helper macro to access recent books store

src/activities/home/HomeActivity.cpp

@@ -44,11 +44,8 @@ void HomeActivity::loadRecentBooks(int maxBooks, int coverHeight) {
   const auto& books = RECENT_BOOKS.getBooks();
   recentBooks.reserve(std::min(static_cast<int>(books.size()), maxBooks));
 
-  bool mustReloadRecents = false;  // We're migrating from an older version of recent books
   int progress = 0;
   for (const RecentBook& book : books) {
-    bool mustLoadCover = false;
-
     // Limit to maximum number of recent books
     if (recentBooks.size() >= maxBooks) {
       break;
@@ -59,70 +56,51 @@ void HomeActivity::loadRecentBooks(int maxBooks, int coverHeight) {
       continue;
     }
 
-    if (book.coverBmpPath == "-") {
-      mustReloadRecents = true;
-    } else {
+    if (!book.coverBmpPath.empty()) {
       std::string coverPath = UITheme::getCoverThumbPath(book.coverBmpPath, coverHeight);
       if (!SdMan.exists(coverPath.c_str())) {
-        mustLoadCover = true;
-      }
-    }
-
-    if (mustReloadRecents || mustLoadCover) {
-      std::string lastBookFileName = "";
-      const size_t lastSlash = book.path.find_last_of('/');
-      if (lastSlash != std::string::npos) {
-        lastBookFileName = book.path.substr(lastSlash + 1);
-      }
-
-      Serial.printf("Loading recent book: %s\n", book.path.c_str());
-
-      // If epub, try to load the metadata for title/author and cover
-      if (StringUtils::checkFileExtension(lastBookFileName, ".epub")) {
-        Epub epub(book.path, "/.crosspoint");
-        epub.load(false);
-
-        // Try to generate thumbnail image for Continue Reading card
-        if (!showingLoading) {
-          showingLoading = true;
-          popupRect = GUI.drawPopup(renderer, "Loading...");
+        std::string lastBookFileName = "";
+        const size_t lastSlash = book.path.find_last_of('/');
+        if (lastSlash != std::string::npos) {
+          lastBookFileName = book.path.substr(lastSlash + 1);
         }
-        GUI.fillPopupProgress(renderer, popupRect, progress * (100 / maxBooks));
-        epub.generateThumbBmp(coverHeight);
 
-        if (mustReloadRecents) {
-          // Update recent book entry with title/author/cover path
-          RECENT_BOOKS.addBook(book.path, epub.getTitle(), epub.getAuthor(), epub.getThumbBmpPath());
-          recentBooks.push_back({book.path, epub.getTitle(), epub.getAuthor(), epub.getThumbBmpPath()});
-        }
-      } else if (StringUtils::checkFileExtension(lastBookFileName, ".xtch") ||
-                 StringUtils::checkFileExtension(lastBookFileName, ".xtc")) {
-        // Handle XTC file
-        Xtc xtc(book.path, "/.crosspoint");
-        if (xtc.load()) {
+        Serial.printf("Loading recent book: %s\n", book.path.c_str());
+
+        // If epub, try to load the metadata for title/author and cover
+        if (StringUtils::checkFileExtension(lastBookFileName, ".epub")) {
+          Epub epub(book.path, "/.crosspoint");
+          epub.load(false);
+
           // Try to generate thumbnail image for Continue Reading card
           if (!showingLoading) {
             showingLoading = true;
             popupRect = GUI.drawPopup(renderer, "Loading...");
           }
-          GUI.fillPopupProgress(renderer, popupRect, progress * (100 / maxBooks));
-          xtc.generateThumbBmp(coverHeight);
-
-          if (mustReloadRecents) {
-            // Update recent book entry with title/author/cover path
-            RECENT_BOOKS.addBook(book.path, xtc.getTitle(), xtc.getAuthor(), xtc.getThumbBmpPath());
-            recentBooks.push_back({book.path, xtc.getTitle(), xtc.getAuthor(), xtc.getThumbBmpPath()});
+          GUI.fillPopupProgress(renderer, popupRect, progress * 30);
+          epub.generateThumbBmp(coverHeight);
+        } else if (StringUtils::checkFileExtension(lastBookFileName, ".xtch") ||
+                   StringUtils::checkFileExtension(lastBookFileName, ".xtc")) {
+          // Handle XTC file
+          Xtc xtc(book.path, "/.crosspoint");
+          if (xtc.load()) {
+            // Try to generate thumbnail image for Continue Reading card
+            if (!showingLoading) {
+              showingLoading = true;
+              popupRect = GUI.drawPopup(renderer, "Loading...");
+            }
+            GUI.fillPopupProgress(renderer, popupRect, progress * 30);
+            xtc.generateThumbBmp(coverHeight);
           }
         }
       }
     }
 
-    if (!mustReloadRecents) {
-      recentBooks.push_back(book);
-    }
+    recentBooks.push_back(book);
     progress++;
   }
 
+  Serial.printf("Recent books loaded: %d\n", recentBooks.size());
   recentsLoaded = true;
   recentsLoading = false;
   updateRequired = true;