From 058e975919f688857be979e0bf8ef0658bb23787 Mon Sep 17 00:00:00 2001
From: Nicolas Mailloux <nicolecrivain@gmail.com>
Date: Tue, 9 Aug 2022 15:41:50 -0400
Subject: [PATCH] Highlighting: Fixes

---
 src/eink.qrc                      |   5 +++--
 src/functions.h                   |  24 +++++++++---------------
 src/reader/reader.cpp             |  13 +++++++++++++
 src/resources/view-highlights.png | Bin 0 -> 5659 bytes
 4 files changed, 25 insertions(+), 17 deletions(-)
 create mode 100644 src/resources/view-highlights.png

diff --git a/src/eink.qrc b/src/eink.qrc
index 3f4621e..ab45a56 100644
--- a/src/eink.qrc
+++ b/src/eink.qrc
@@ -81,7 +81,8 @@
         <file>resources/arrow-right.png</file>
         <file>resources/file-text.png</file>
         <file>resources/pin.png</file>
-	<file>resources/highlight.png</file>
-	<file>resources/unhighlight.png</file>
+        <file>resources/highlight.png</file>
+        <file>resources/unhighlight.png</file>
+        <file>resources/view-highlights.png</file>
     </qresource>
 </RCC>
diff --git a/src/functions.h b/src/functions.h
index 37d1db0..9df8dab 100644
--- a/src/functions.h
+++ b/src/functions.h
@@ -1041,7 +1041,7 @@ namespace {
                 QJsonObject mainJsonObject;
                 QJsonObject firstJsonObject;
                 firstJsonObject.insert("BookPath", QJsonValue(bookPath));
-                firstJsonObject.insert("Text1", QJsonValue(text));
+                firstJsonObject.insert("T-" + QUuid::createUuid().toString(QUuid::WithoutBraces), QJsonValue(text));
                 mainJsonObject["Book1"] = firstJsonObject;
                 writeHighlightsDatabase(mainJsonObject);
             }
@@ -1051,30 +1051,23 @@ namespace {
                 int length = jsonObject.length();
                 for(int i = 1; i <= length; i++) {
                     if(jsonObject["Book" + QString::number(i)].toObject().value("BookPath").toString() == bookPath) {
-                        log("highlightBookText: Found existing book with path '" + bookPath + "'", "functions");
-                        int keyCount = 0;
-                        // Counting number of highlights for book
-                        foreach(const QString& key, jsonObject["Book" + QString::number(i)].toObject().keys()) {
-                            keyCount++;
-                        }
-                        // First key is 'BookPath'
-                        int highlightsCount = keyCount - 1;
-                        int currentHighlightPosition = highlightsCount + 1;
+                        log("highlightBookText: Found existing book in database with path '" + bookPath + "'", "functions");
 
                         // Insert highlight
                         QJsonObject highlightJsonObject = jsonObject["Book" + QString::number(i)].toObject();
                         // Finding available slot for highlight in case the one we are looking for is already occupied
-                        if(highlightJsonObject.contains("Text" + QString::number(currentHighlightPosition))) {
+                        QString uuid = "T-"+ QUuid::createUuid().toString(QUuid::WithoutBraces);
+                        if(highlightJsonObject.contains(uuid)) {
                             while(true) {
-                                if(highlightJsonObject.contains("Text" + QString::number(currentHighlightPosition))) {
-                                    currentHighlightPosition++;
+                                if(highlightJsonObject.contains(uuid)) {
+                                    uuid = "T-" + QUuid::createUuid().toString(QUuid::WithoutBraces);
                                 }
                                 else {
                                     break;
                                 }
                             }
                         }
-                        highlightJsonObject.insert("Text" + QString::number(currentHighlightPosition), text);
+                        highlightJsonObject.insert(uuid, text);
                         jsonObject["Book" + QString::number(i)] = highlightJsonObject;
 
                         writeHighlightsDatabase(jsonObject);
@@ -1083,9 +1076,10 @@ namespace {
                 }
 
                 if(highlightWrote == false) {
+                    // This block of code is called when the book is referenced in the database, but no highlights are currently indexed
                     QJsonObject bookJsonObject;
                     bookJsonObject.insert("BookPath", QJsonValue(bookPath));
-                    bookJsonObject.insert("Text1", QJsonValue(text));
+                    bookJsonObject.insert("T-" + QUuid::createUuid().toString(QUuid::WithoutBraces), QJsonValue(text));
                     jsonObject["Book" + QString::number(length + 1)] = bookJsonObject;
 
                     writeHighlightsDatabase(jsonObject);
diff --git a/src/reader/reader.cpp b/src/reader/reader.cpp
index db5a333..aba9ff7 100644
--- a/src/reader/reader.cpp
+++ b/src/reader/reader.cpp
@@ -72,6 +72,7 @@ reader::reader(QWidget *parent) :
     ui->increaseScaleBtn->setProperty("type", "borderless");
     ui->decreaseScaleBtn->setProperty("type", "borderless");
     ui->quitBtn->setProperty("type", "borderless");
+    ui->viewHighlightsBtn->setProperty("type", "borderless");
 
     // Icons
     ui->alignLeftBtn->setText("");
@@ -112,6 +113,8 @@ reader::reader(QWidget *parent) :
     ui->optionsBtn->setIcon(QIcon(":/resources/settings.png"));
     ui->nextBtn->setText("");
     ui->nextBtn->setIcon(QIcon(":/resources/arrow-right.png"));
+    ui->viewHighlightsBtn->setText("");
+    ui->viewHighlightsBtn->setIcon(QIcon(":/resources/view-highlights.png"));
 
     // On the Mini with QT_FONT_DPI set to 187 (default for this device), quitBtn makes the UI go beyond the limits of the screen when the menu bar is shown
     if(global::deviceID == "n705\n") {
@@ -316,6 +319,7 @@ reader::reader(QWidget *parent) :
     ui->fontChooser->setStyleSheet("font-size: 9pt");
     ui->gotoBtn->setStyleSheet("font-size: 9pt; padding: 9px; font-weight: bold; background: lightGrey");
     ui->pageNumberLabel->setFont(QFont("Source Serif Pro"));
+    ui->viewHighlightsBtn->setStyleSheet("padding: 9px");
 
     // Hiding the menubar + definition widget + brightness widget + buttons bar widget
     ui->menuWidget->setVisible(false);
@@ -536,11 +540,19 @@ reader::reader(QWidget *parent) :
     else if(is_pdf == true) {
         ui->text->hide();
         ui->text->deleteLater();
+        ui->line_20->hide();
+        ui->line_20->deleteLater();
+        ui->viewHighlightsBtn->hide();
+        ui->viewHighlightsBtn->deleteLater();
         setupPng();
     }
     else if(is_image == true) {
         ui->text->hide();
         ui->text->deleteLater();
+        ui->line_20->hide();
+        ui->line_20->deleteLater();
+        ui->viewHighlightsBtn->hide();
+        ui->viewHighlightsBtn->deleteLater();
         setupPng();
     }
     else {
@@ -1437,6 +1449,7 @@ void reader::alignAndHighlightText(int alignment) {
     // Highlight
     QString htmlText = ui->text->toHtml();
     QJsonObject jsonObject = getHighlightsForBook(book_file);
+    qDebug() << jsonObject;
     int keyCount = 1;
     foreach(const QString& key, jsonObject.keys()) {
         if(keyCount <= 1) {
diff --git a/src/resources/view-highlights.png b/src/resources/view-highlights.png
new file mode 100644
index 0000000000000000000000000000000000000000..af2078b5eb8dd6f7e1953299d93fd2b22083bda2
GIT binary patch
literal 5659
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

literal 0
HcmV?d00001