## Summary * **What is the goal of this PR?** (e.g., Implements the new feature for file uploading.) Implements new feature for viewing .bmp files directly from the "Browse Files" menu. * **What changes are included?** You can now view .bmp files when browsing. You can click the select button to open the file, and then click back to close it and continue browsing in the same location. Once open a file will display on the screen with no additional options to interact outside of exiting with the back button. The attached video shows this feature in action: https://github.com/user-attachments/assets/9659b6da-abf7-4458-b158-e11c248c8bef ## Additional Context * Add any other information that might be helpful for the reviewer (e.g., performance implications, potential risks, specific areas to focus on). The changes implemented in #884 are also present here as this feature is actually what led to me noticing this issue. I figured I would add that PR as a separate request in case that one could be more easily merged given this feature is significantly more complicated and will likely be subject to more intense review. --- ### AI Usage While CrossPoint doesn't have restrictions on AI tools in contributing, please be transparent about their usage as it helps set the right context for reviewers. Did you use AI tools to help write this code? **YES** --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
149 lines
4.4 KiB
C++
149 lines
4.4 KiB
C++
#include "ReaderActivity.h"
|
|
|
|
#include <HalStorage.h>
|
|
|
|
#include "CrossPointSettings.h"
|
|
#include "Epub.h"
|
|
#include "EpubReaderActivity.h"
|
|
#include "Txt.h"
|
|
#include "TxtReaderActivity.h"
|
|
#include "Xtc.h"
|
|
#include "XtcReaderActivity.h"
|
|
#include "activities/util/BmpViewerActivity.h"
|
|
#include "activities/util/FullScreenMessageActivity.h"
|
|
#include "util/StringUtils.h"
|
|
|
|
std::string ReaderActivity::extractFolderPath(const std::string& filePath) {
|
|
const auto lastSlash = filePath.find_last_of('/');
|
|
if (lastSlash == std::string::npos || lastSlash == 0) {
|
|
return "/";
|
|
}
|
|
return filePath.substr(0, lastSlash);
|
|
}
|
|
|
|
bool ReaderActivity::isXtcFile(const std::string& path) {
|
|
return StringUtils::checkFileExtension(path, ".xtc") || StringUtils::checkFileExtension(path, ".xtch");
|
|
}
|
|
|
|
bool ReaderActivity::isTxtFile(const std::string& path) {
|
|
return StringUtils::checkFileExtension(path, ".txt") ||
|
|
StringUtils::checkFileExtension(path, ".md"); // Treat .md as txt files (until we have a markdown reader)
|
|
}
|
|
|
|
bool ReaderActivity::isBmpFile(const std::string& path) { return StringUtils::checkFileExtension(path, ".bmp"); }
|
|
|
|
std::unique_ptr<Epub> ReaderActivity::loadEpub(const std::string& path) {
|
|
if (!Storage.exists(path.c_str())) {
|
|
LOG_ERR("READER", "File does not exist: %s", path.c_str());
|
|
return nullptr;
|
|
}
|
|
|
|
auto epub = std::unique_ptr<Epub>(new Epub(path, "/.crosspoint"));
|
|
if (epub->load(true, SETTINGS.embeddedStyle == 0)) {
|
|
return epub;
|
|
}
|
|
|
|
LOG_ERR("READER", "Failed to load epub");
|
|
return nullptr;
|
|
}
|
|
|
|
std::unique_ptr<Xtc> ReaderActivity::loadXtc(const std::string& path) {
|
|
if (!Storage.exists(path.c_str())) {
|
|
LOG_ERR("READER", "File does not exist: %s", path.c_str());
|
|
return nullptr;
|
|
}
|
|
|
|
auto xtc = std::unique_ptr<Xtc>(new Xtc(path, "/.crosspoint"));
|
|
if (xtc->load()) {
|
|
return xtc;
|
|
}
|
|
|
|
LOG_ERR("READER", "Failed to load XTC");
|
|
return nullptr;
|
|
}
|
|
|
|
std::unique_ptr<Txt> ReaderActivity::loadTxt(const std::string& path) {
|
|
if (!Storage.exists(path.c_str())) {
|
|
LOG_ERR("READER", "File does not exist: %s", path.c_str());
|
|
return nullptr;
|
|
}
|
|
|
|
auto txt = std::unique_ptr<Txt>(new Txt(path, "/.crosspoint"));
|
|
if (txt->load()) {
|
|
return txt;
|
|
}
|
|
|
|
LOG_ERR("READER", "Failed to load TXT");
|
|
return nullptr;
|
|
}
|
|
|
|
void ReaderActivity::goToLibrary(const std::string& fromBookPath) {
|
|
// If coming from a book, start in that book's folder; otherwise start from root
|
|
const auto initialPath = fromBookPath.empty() ? "/" : extractFolderPath(fromBookPath);
|
|
onGoToLibrary(initialPath);
|
|
}
|
|
|
|
void ReaderActivity::onGoToEpubReader(std::unique_ptr<Epub> epub) {
|
|
const auto epubPath = epub->getPath();
|
|
currentBookPath = epubPath;
|
|
exitActivity();
|
|
enterNewActivity(new EpubReaderActivity(
|
|
renderer, mappedInput, std::move(epub), [this, epubPath] { goToLibrary(epubPath); }, [this] { onGoBack(); }));
|
|
}
|
|
|
|
void ReaderActivity::onGoToBmpViewer(const std::string& path) {
|
|
exitActivity();
|
|
enterNewActivity(new BmpViewerActivity(renderer, mappedInput, path, [this, path] { goToLibrary(path); }));
|
|
}
|
|
|
|
void ReaderActivity::onGoToXtcReader(std::unique_ptr<Xtc> xtc) {
|
|
const auto xtcPath = xtc->getPath();
|
|
currentBookPath = xtcPath;
|
|
exitActivity();
|
|
enterNewActivity(new XtcReaderActivity(
|
|
renderer, mappedInput, std::move(xtc), [this, xtcPath] { goToLibrary(xtcPath); }, [this] { onGoBack(); }));
|
|
}
|
|
|
|
void ReaderActivity::onGoToTxtReader(std::unique_ptr<Txt> txt) {
|
|
const auto txtPath = txt->getPath();
|
|
currentBookPath = txtPath;
|
|
exitActivity();
|
|
enterNewActivity(new TxtReaderActivity(
|
|
renderer, mappedInput, std::move(txt), [this, txtPath] { goToLibrary(txtPath); }, [this] { onGoBack(); }));
|
|
}
|
|
|
|
void ReaderActivity::onEnter() {
|
|
ActivityWithSubactivity::onEnter();
|
|
|
|
if (initialBookPath.empty()) {
|
|
goToLibrary(); // Start from root when entering via Browse
|
|
return;
|
|
}
|
|
|
|
currentBookPath = initialBookPath;
|
|
if (isBmpFile(initialBookPath)) {
|
|
onGoToBmpViewer(initialBookPath);
|
|
} else if (isXtcFile(initialBookPath)) {
|
|
auto xtc = loadXtc(initialBookPath);
|
|
if (!xtc) {
|
|
onGoBack();
|
|
return;
|
|
}
|
|
onGoToXtcReader(std::move(xtc));
|
|
} else if (isTxtFile(initialBookPath)) {
|
|
auto txt = loadTxt(initialBookPath);
|
|
if (!txt) {
|
|
onGoBack();
|
|
return;
|
|
}
|
|
onGoToTxtReader(std::move(txt));
|
|
} else {
|
|
auto epub = loadEpub(initialBookPath);
|
|
if (!epub) {
|
|
onGoBack();
|
|
return;
|
|
}
|
|
onGoToEpubReader(std::move(epub));
|
|
}
|
|
}
|