eric/Crosspoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #185 from jpirnay/feat-pr1775

Browse Source 
feat: Add and refactor carousel theme (Upstream 1775 by zgredex)
This commit is contained in:
jpirnay
2026-05-09 00:10:00 +02:00
committed by GitHub
parent 9cd732bfd8 fe96dfa7a5
commit 1f1a80581d
25 changed files with 1307 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Epub/Epub.cpp
+76
View File
@@ -810,6 +810,9 @@ bool Epub::generateCoverBmp(bool cropped) const {
std::string Epub::getThumbBmpPath() const { return cachePath + "/thumb_[HEIGHT].bmp"; }
std::string Epub::getThumbBmpPath(int height) const { return cachePath + "/thumb_" + std::to_string(height) + ".bmp"; }
std::string Epub::getThumbBmpPath(int width, int height) const {
return cachePath + "/thumb_" + std::to_string(width) + "x" + std::to_string(height) + ".bmp";
}
bool Epub::generateThumbBmp(int height) const {
// Already generated, return true
@@ -902,6 +905,79 @@ bool Epub::generateThumbBmp(int height) const {
return false;
}
bool Epub::generateThumbBmp(int width, int height) const {
if (Storage.exists(getThumbBmpPath(width, height).c_str())) return true;
if (!bookMetadataCache || !bookMetadataCache->isLoaded()) {
LOG_ERR("EBP", "Cannot generate thumb BMP, cache not loaded");
return false;
}
const auto coverImageHref = bookMetadataCache->coreMetadata.coverItemHref;
if (coverImageHref.empty()) {
LOG_DBG("EBP", "No known cover image for thumbnail");
} else {
const auto coverTempPath = getCachePath() + "/.cover";
FsFile coverTemp;
if (!Storage.openFileForWrite("EBP", coverTempPath, coverTemp)) return false;
if (!readItemContentsToStream(coverImageHref, coverTemp, 1024)) {
coverTemp.close();
Storage.remove(coverTempPath.c_str());
return false;
}
coverTemp.close();
if (!Storage.openFileForRead("EBP", coverTempPath, coverTemp)) {
Storage.remove(coverTempPath.c_str());
return false;
}
const auto detectedFormat = detectCoverImageFormat(coverTemp);
bool success = false;
FsFile thumbBmp;
if (!Storage.openFileForWrite("EBP", getThumbBmpPath(width, height), thumbBmp)) {
coverTemp.close();
Storage.remove(coverTempPath.c_str());
return false;
}
if (detectedFormat == CoverImageFormat::Jpeg) {
LOG_DBG("EBP", "Generating %dx%d thumb BMP from JPEG cover image", width, height);
success = JpegToBmpConverter::jpegFileTo1BitBmpStreamWithSize(coverTemp, thumbBmp, width, height);
} else if (detectedFormat == CoverImageFormat::Png) {
LOG_DBG("EBP", "Generating %dx%d thumb BMP from PNG cover image", width, height);
success = PngToBmpConverter::pngFileTo1BitBmpStreamWithSize(coverTemp, thumbBmp, width, height);
} else {
LOG_DBG("EBP", "Cover image format unknown, attempting JPEG then PNG: %s", coverImageHref.c_str());
success = JpegToBmpConverter::jpegFileTo1BitBmpStreamWithSize(coverTemp, thumbBmp, width, height);
if (!success) {
thumbBmp.close();
Storage.remove(getThumbBmpPath(width, height).c_str());
if (!Storage.openFileForWrite("EBP", getThumbBmpPath(width, height), thumbBmp)) {
coverTemp.close();
Storage.remove(coverTempPath.c_str());
return false;
}
coverTemp.seek(0);
success = PngToBmpConverter::pngFileTo1BitBmpStreamWithSize(coverTemp, thumbBmp, width, height);
}
}
coverTemp.close();
thumbBmp.close();
Storage.remove(coverTempPath.c_str());
if (!success) Storage.remove(getThumbBmpPath(width, height).c_str());
LOG_DBG("EBP", "Generated %dx%d thumb BMP from cover image, success: %s", width, height, success ? "yes" : "no");
return success;
}
// Write empty sentinel to avoid repeated generation attempts
FsFile thumbBmp;
Storage.openFileForWrite("EBP", getThumbBmpPath(width, height), thumbBmp);
thumbBmp.close();
return false;
}
uint8_t* Epub::readItemContentsToBytes(const std::string& itemHref, size_t* size, const bool trailingNullByte) const {
if (itemHref.empty()) {
LOG_DBG("EBP", "Failed to read item, empty href");
lib/Epub/Epub.h
+2
View File
@@ -62,7 +62,9 @@ class Epub {
bool generateCoverBmp(bool cropped = false) const;
std::string getThumbBmpPath() const;
std::string getThumbBmpPath(int height) const;
std::string getThumbBmpPath(int width, int height) const;
bool generateThumbBmp(int height) const;
bool generateThumbBmp(int width, int height) const;
uint8_t* readItemContentsToBytes(const std::string& itemHref, size_t* size = nullptr,
bool trailingNullByte = false) const;
bool readItemContentsToStream(const std::string& itemHref, Print& out, size_t chunkSize) const;