Reader framework bug fixes, preparing for v1.3

reader.cpp

@@ -270,8 +270,10 @@ reader::reader(QWidget *parent) :
     if(checkconfig("/inkbox/skip_opendialog") == true) {
         // We have to get the file's path
         if(checkconfig("/tmp/suspendBook") == true) {
+            wakeFromSleep = true;
             // Prevent from opening the Reader framework next time unless the condition is reset
             string_writeconfig("/tmp/suspendBook", "false");
+            book_file = "/inkbox/book/book.txt";
         }
         else {
             string_checkconfig("/inkbox/book_number");
@@ -320,10 +322,21 @@ reader::reader(QWidget *parent) :
         }
     }
 
-    // Counting number of parsed files
+    // Checking if we're waking from sleep; if so, do nothing there because the book should already have been parsed
-    split_total = setup_book(book_file, 0, true);
+    if(wakeFromSleep != true) {
-    split_files_number = split_total;
+        // Counting number of parsed files
-    split_total = split_total - 1;
+        split_total = setup_book(book_file, 0, true);
+        split_files_number = split_total;
+        split_total = split_total - 1;
+
+        writeconfig_pagenumber();
+    }
+    else {
+        // Retrieve split_total from tmpfs
+        string_checkconfig("/tmp/inkboxPageNumber");
+        split_total = checkconfig_str_val.toInt();
+        setup_book(book_file, 0, true);
+    }
 
     // Get text
     QDir::setCurrent("/mnt/onboard/.adds/inkbox");
@@ -370,6 +383,12 @@ reader::reader(QWidget *parent) :
     // Wheeee!
     ui->text->setText(ittext);
 
+    // Clean up
+    string_writeconfig("/inkbox/remount", "true");
+
+    // Way to tell shell scripts that we're in the Reader framework
+    string_writeconfig("/tmp/inkboxReading", "true");
+
     // Saving the book opened in the favorites list
     string_checkconfig(".config/08-recent_books/1");
     book_1 = checkconfig_str_val;
@@ -411,6 +430,7 @@ void reader::on_nextBtn_clicked()
     else {
         parser_ran = true;
         split_total = split_total - 1;
+
         setup_book(book_file, split_total, false);
         ui->text->setText("");
         ui->text->setText(ittext);
@@ -428,6 +448,7 @@ void reader::on_nextBtn_clicked()
                 pagesTurned = 0;
             }
         }
+        writeconfig_pagenumber();
     }
 }
 
@@ -458,6 +479,7 @@ void reader::on_previousBtn_clicked()
                 pagesTurned = 0;
             }
         }
+        writeconfig_pagenumber();
     }
 }
 
@@ -511,6 +533,10 @@ void reader::on_aboutBtn_clicked()
 
 void reader::on_homeBtn_clicked()
 {
+    // We're leaving reading mode
+    string_writeconfig("/tmp/inkboxReading", "false");
+
+    // Relaunching process
     QProcess process;
     process.startDetached("inkbox", QStringList());
     qApp->quit();
@@ -778,3 +804,9 @@ void reader::on_sizeSlider_valueChanged(int value)
         }
     }
 }
+
+void reader::writeconfig_pagenumber() {
+    // Saving the page number in tmpfs
+    string split_total_str = to_string(split_total);
+    string_writeconfig("/tmp/inkboxPageNumber", split_total_str);
+}

reader.h

@@ -39,6 +39,8 @@ public:
     bool parser_ran = false;
     bool booktostr_ran = false;
     bool neverRefresh = false;
+    bool wakeFromSleep = false;
+    bool remount = true;
     QString book_1;
     QString book_2;
     QString book_3;
@@ -61,12 +63,24 @@ public:
     ~reader();
     int setup_book(QString book, int i, bool run_parser) {
         // Parse ebook
-        QString mount_prog ("sh");
+        if(remount != false) {
-        QStringList mount_args;
+            QString mount_prog ("sh");
-        mount_args << "split.sh";
+            QStringList mount_args;
-        QProcess *mount_proc = new QProcess();
+            mount_args << "split.sh";
-        mount_proc->start(mount_prog, mount_args);
+            QProcess *mount_proc = new QProcess();
-        mount_proc->waitForFinished();
+            mount_proc->start(mount_prog, mount_args);
+            mount_proc->waitForFinished();
+            remount = false;
+        }
+        else {
+            string_writeconfig("/inkbox/remount", "false");
+            QString mount_prog ("sh");
+            QStringList mount_args;
+            mount_args << "split.sh";
+            QProcess *mount_proc = new QProcess();
+            mount_proc->start(mount_prog, mount_args);
+            mount_proc->waitForFinished();
+        }
 
         if(booktostr_ran != true) {
             if(epub_file_match(book) == true) {
@@ -108,7 +122,7 @@ public:
                 QProcess *parse_proc = new QProcess();
                 parse_proc->start(parse_prog, parse_args);
                 parse_proc->waitForFinished();
-                parser_ran = false;
+                parser_ran = true;
             }
             else {
                 QString parse_prog ("python3");
@@ -117,7 +131,7 @@ public:
                 QProcess *parse_proc = new QProcess();
                 parse_proc->start(parse_prog, parse_args);
                 parse_proc->waitForFinished();
-                parser_ran = false;
+                parser_ran = true;
             }
         }
 
@@ -219,40 +233,24 @@ public:
 
 private slots:
     void on_nextBtn_clicked();
-
     void on_previousBtn_clicked();
-
     void on_optionsBtn_clicked();
-
     void on_hideOptionsBtn_clicked();
-
     void on_brightnessDecBtn_clicked();
-
     void on_brightnessIncBtn_clicked();
-
     void on_aboutBtn_clicked();
-
     void on_homeBtn_clicked();
-
     void on_fontChooser_currentIndexChanged(const QString &arg1);
-
     void on_alignLeftBtn_clicked();
-
     void on_alignCenterBtn_clicked();
-
     void on_alignRightBtn_clicked();
-
     void on_alignJustifyBtn_clicked();
-
     void on_infoCloseBtn_clicked();
-
     void on_previousDefinitionBtn_clicked();
-
     void on_nextDefinitionBtn_clicked();
-
     void on_saveWordBtn_clicked();
-
     void on_sizeSlider_valueChanged(int value);
+    void writeconfig_pagenumber();
 
 private:
     Ui::reader *ui;