UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[reader] Added detection of rich text files (.urt) TODO: parse differently this files

Browse Source
This commit is contained in:
Laury
2021-12-13 21:54:25 +01:00
parent 2248e415c4
commit 7fc28f8b72
6 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
apps/reader/list_book_controller.cpp
View File

@@ -15,12 +15,13 @@ ListBookController::ListBookController(Responder * parentResponder):
m_tableView(this, this, this), m_tableView(this, this, this),
m_readBookController(this) m_readBookController(this)
{ {
m_filesNumber = filesWithExtension(".txt", m_files, k_maxFilesNumber); m_txtFilesNumber = filesWithExtension(".txt", m_files, k_maxFilesNumber);
m_urtFilesNumber = filesWithExtension(".urt", m_files + m_txtFilesNumber, k_maxFilesNumber - m_txtFilesNumber);
cleanRemovedBookRecord(); cleanRemovedBookRecord();
} }
int ListBookController::numberOfRows() const { int ListBookController::numberOfRows() const {
return m_filesNumber; return m_txtFilesNumber + m_urtFilesNumber;
} }
KDCoordinate ListBookController::cellHeight() { KDCoordinate ListBookController::cellHeight() {
@@ -52,7 +53,7 @@ void ListBookController::didBecomeFirstResponder() {
bool ListBookController::handleEvent(Ion::Events::Event event) { bool ListBookController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::OK || event == Ion::Events::EXE || event == Ion::Events::Right) if (event == Ion::Events::OK || event == Ion::Events::EXE || event == Ion::Events::Right)
{ {
m_readBookController.setBook(m_files[selectedRow()]); m_readBookController.setBook(m_files[selectedRow()], selectedRow() >= m_txtFilesNumber);
static_cast<StackViewController*>(parentResponder())->push(&m_readBookController); static_cast<StackViewController*>(parentResponder())->push(&m_readBookController);
Container::activeApp()->setFirstResponder(&m_readBookController); Container::activeApp()->setFirstResponder(&m_readBookController);
return true; return true;
@@ -63,10 +64,9 @@ bool ListBookController::handleEvent(Ion::Events::Event event) {
bool ListBookController::hasBook(const char* filename) const { bool ListBookController::hasBook(const char* filename) const {
for(int i=0;i<m_filesNumber;i++) for(int i=0;i<m_txtFilesNumber + m_urtFilesNumber;i++)
{ {
if(strcmp(m_files[i].name, filename) == 0) if(strcmp(m_files[i].name, filename) == 0) {
{
return true; return true;
} }
} }
@@ -75,18 +75,24 @@ bool ListBookController::hasBook(const char* filename) const {
void ListBookController::cleanRemovedBookRecord() { void ListBookController::cleanRemovedBookRecord() {
int nb = Ion::Storage::sharedStorage()->numberOfRecordsWithExtension("txt"); int nb = Ion::Storage::sharedStorage()->numberOfRecordsWithExtension("txt");
for(int i=0; i<nb; i++) for(int i=0; i<nb; i++) {
{ Ion::Storage::Record r = Ion::Storage::sharedStorage()->recordWithExtensionAtIndex("txt", i);
Ion::Storage::Record r = Ion::Storage::sharedStorage()->recordWithExtensionAtIndex("txt", i); if(!hasBook(r.fullName())) {
if(!hasBook(r.fullName())) r.destroy();
{ }
r.destroy();
} }
nb = Ion::Storage::sharedStorage()->numberOfRecordsWithExtension("urt");
for(int i=0; i<nb; i++) {
Ion::Storage::Record r = Ion::Storage::sharedStorage()->recordWithExtensionAtIndex("urt", i);
if(!hasBook(r.fullName())) {
r.destroy();
}
} }
} }
bool ListBookController::isEmpty() const { bool ListBookController::isEmpty() const {
return m_filesNumber == 0; return m_txtFilesNumber + m_urtFilesNumber == 0;
} }
I18n::Message ListBookController::emptyMessage() { I18n::Message ListBookController::emptyMessage() {

3
apps/reader/list_book_controller.h
View File

@@ -31,7 +31,8 @@ private:
SelectableTableView m_tableView; SelectableTableView m_tableView;
static const int k_maxFilesNumber = 20; static const int k_maxFilesNumber = 20;
External::Archive::File m_files[k_maxFilesNumber]; External::Archive::File m_files[k_maxFilesNumber];
int m_filesNumber = 0; int m_txtFilesNumber;
int m_urtFilesNumber;
static const int k_cellsNumber = 6; static const int k_cellsNumber = 6;
MessageTableCellWithChevron m_cells[k_cellsNumber]; MessageTableCellWithChevron m_cells[k_cellsNumber];
ReadBookController m_readBookController; ReadBookController m_readBookController;

4
apps/reader/read_book_controller.cpp
View File

@@ -12,10 +12,10 @@ View * ReadBookController::view() {
return &m_readerView; return &m_readerView;
} }
void ReadBookController::setBook(const External::Archive::File& file) { void ReadBookController::setBook(const External::Archive::File& file, bool isRichTextFile) {
m_file = &file; m_file = &file;
loadPosition(); loadPosition();
m_readerView.setText(reinterpret_cast<const char*>(file.data), file.dataLength); m_readerView.setText(reinterpret_cast<const char*>(file.data), file.dataLength, isRichTextFile);
} }
bool ReadBookController::handleEvent(Ion::Events::Event event) { bool ReadBookController::handleEvent(Ion::Events::Event event) {

2
apps/reader/read_book_controller.h
View File

@@ -11,7 +11,7 @@ class ReadBookController : public ViewController {
public: public:
ReadBookController(Responder * parentResponder); ReadBookController(Responder * parentResponder);
View * view() override; View * view() override;
void setBook(const External::Archive::File& file); void setBook(const External::Archive::File& file, bool isRichTextFile);
bool handleEvent(Ion::Events::Event event) override; bool handleEvent(Ion::Events::Event event) override;
void viewDidDisappear() override; void viewDidDisappear() override;
void savePosition() const; void savePosition() const;

6
apps/reader/word_wrap_view.cpp
View File

@@ -12,7 +12,8 @@ WordWrapTextView::WordWrapTextView() :
PointerTextView(GlobalPreferences::sharedGlobalPreferences()->font()), PointerTextView(GlobalPreferences::sharedGlobalPreferences()->font()),
m_pageOffset(0), m_pageOffset(0),
m_nextPageOffset(0), m_nextPageOffset(0),
m_length(0) m_length(0),
m_isRichTextFile(false) // Value isn't important, it will change when the file is loaded
{ {
} }
@@ -25,9 +26,10 @@ void WordWrapTextView::nextPage() {
markRectAsDirty(bounds()); markRectAsDirty(bounds());
} }
void WordWrapTextView::setText(const char* text, int length) { void WordWrapTextView::setText(const char* text, int length, bool isRichTextFile) {
PointerTextView::setText(text); PointerTextView::setText(text);
m_length = length; m_length = length;
m_isRichTextFile = isRichTextFile;
} }
void WordWrapTextView::previousPage() { void WordWrapTextView::previousPage() {

5
apps/reader/word_wrap_view.h
View File

@@ -16,7 +16,7 @@ class WordWrapTextView : public PointerTextView {
public: public:
WordWrapTextView(); WordWrapTextView();
void drawRect(KDContext * ctx, KDRect rect) const override; void drawRect(KDContext * ctx, KDRect rect) const override;
void setText(const char*, int length); void setText(const char*, int length, bool isRichTextFile);
void nextPage(); void nextPage();
void previousPage(); void previousPage();
BookSave getBookSave() const; BookSave getBookSave() const;
@@ -28,9 +28,10 @@ private:
int m_pageOffset; int m_pageOffset;
mutable int m_nextPageOffset; mutable int m_nextPageOffset;
int m_length; int m_length;
bool m_isRichTextFile;
mutable KDColor m_textColor; mutable KDColor m_textColor;
}; };
} }
#endif #endif