From 409ad6d3c2028d14b54f0ea8a117efd55eaa23c8 Mon Sep 17 00:00:00 2001
From: Gres <gres@gres.biz>
Date: Fri, 1 May 2020 14:05:23 +0300
Subject: [PATCH] Clear processing queue after settings update

---
 src/correct/corrector.cpp    | 28 ++++++++++++++++++++++++----
 src/correct/corrector.h      |  4 ++++
 src/ocr/recognizer.cpp       | 30 +++++++++++++++++++++++++++++-
 src/ocr/recognizer.h         |  7 ++++++-
 src/translate/translator.cpp |  1 +
 5 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/src/correct/corrector.cpp b/src/correct/corrector.cpp
index d6cefc6..faebde7 100644
--- a/src/correct/corrector.cpp
+++ b/src/correct/corrector.cpp
@@ -40,8 +40,10 @@ void Corrector::correct(const TaskPtr &task)
   SOFT_ASSERT(task, return );
   SOFT_ASSERT(task->isValid(), return );
 
+  queue_.push_back(task);
+
   if (task->recognized.isEmpty()) {
-    manager_.corrected(task);
+    finishCorrection(task);
     return;
   }
 
@@ -52,22 +54,40 @@ void Corrector::correct(const TaskPtr &task)
     LTRACE() << "Corrected with user data";
   }
 
-  if (task->useHunspell) {
-    emit correctAuto(task);
+  if (!task->useHunspell) {
+    finishCorrection(task);
     return;
   }
 
-  finishCorrection(task);
+  if (queue_.size() == 1)
+    processQueue();
+}
+
+void Corrector::processQueue()
+{
+  if (queue_.empty())
+    return;
+  emit correctAuto(queue_.front());
 }
 
 void Corrector::updateSettings()
 {
+  queue_.clear();
   emit resetAuto(settings_.hunspellDir);
 }
 
 void Corrector::finishCorrection(const TaskPtr &task)
 {
   manager_.corrected(task);
+
+  SOFT_ASSERT(!queue_.empty(), return );
+  if (queue_.front() == task) {
+    queue_.pop_front();
+  } else {
+    LERROR() << "processed not first item in correction queue";
+    queue_.clear();
+  }
+  processQueue();
 }
 
 QString Corrector::substituteUser(const QString &source,
diff --git a/src/correct/corrector.h b/src/correct/corrector.h
index 3b61e30..1b645c8 100644
--- a/src/correct/corrector.h
+++ b/src/correct/corrector.h
@@ -4,6 +4,8 @@
 
 #include <QObject>
 
+#include <deque>
+
 class Corrector : public QObject
 {
   Q_OBJECT
@@ -22,8 +24,10 @@ private:
   void finishCorrection(const TaskPtr &task);
   QString substituteUser(const QString &source,
                          const LanguageId &language) const;
+  void processQueue();
 
   Manager &manager_;
   const Settings &settings_;
   QThread *workerThread_;
+  std::deque<TaskPtr> queue_;
 };
diff --git a/src/ocr/recognizer.cpp b/src/ocr/recognizer.cpp
index b1a248a..4d71ffc 100644
--- a/src/ocr/recognizer.cpp
+++ b/src/ocr/recognizer.cpp
@@ -3,6 +3,7 @@
 #include "manager.h"
 #include "recognizerworker.h"
 #include "settings.h"
+#include "task.h"
 #include "tesseract.h"
 
 #include <QThread>
@@ -15,7 +16,7 @@ Recognizer::Recognizer(Manager &manager, const Settings &settings)
   auto worker = new RecognizeWorker;
   connect(this, &Recognizer::reset,  //
           worker, &RecognizeWorker::reset);
-  connect(this, &Recognizer::recognize,  //
+  connect(this, &Recognizer::recognizeImpl,  //
           worker, &RecognizeWorker::handle);
   connect(worker, &RecognizeWorker::finished,  //
           this, &Recognizer::recognized);
@@ -26,9 +27,35 @@ Recognizer::Recognizer(Manager &manager, const Settings &settings)
   worker->moveToThread(workerThread_);
 }
 
+void Recognizer::recognize(const TaskPtr &task)
+{
+  SOFT_ASSERT(task, return );
+  SOFT_ASSERT(task->isValid(), return );
+
+  queue_.push_back(task);
+  if (queue_.size() == 1)
+    processQueue();
+}
+
+void Recognizer::processQueue()
+{
+  if (queue_.empty())
+    return;
+  emit recognizeImpl(queue_.front());
+}
+
 void Recognizer::recognized(const TaskPtr &task)
 {
   manager_.recognized(task);
+
+  SOFT_ASSERT(!queue_.empty(), return );
+  if (queue_.front() == task) {
+    queue_.pop_front();
+  } else {
+    LERROR() << "processed not first item in recognition queue";
+    queue_.clear();
+  }
+  processQueue();
 }
 
 Recognizer::~Recognizer()
@@ -43,5 +70,6 @@ void Recognizer::updateSettings()
 {
   SOFT_ASSERT(!settings_.tessdataPath.isEmpty(), return );
 
+  queue_.clear();
   emit reset(settings_.tessdataPath);
 }
diff --git a/src/ocr/recognizer.h b/src/ocr/recognizer.h
index 1eed33b..8bc0216 100644
--- a/src/ocr/recognizer.h
+++ b/src/ocr/recognizer.h
@@ -4,6 +4,8 @@
 
 #include <QObject>
 
+#include <deque>
+
 class Recognizer : public QObject
 {
   Q_OBJECT
@@ -12,15 +14,18 @@ public:
   ~Recognizer();
 
   void updateSettings();
+  void recognize(const TaskPtr &task);
 
 signals:
-  void recognize(const TaskPtr &task);
+  void recognizeImpl(const TaskPtr &task);
   void reset(const QString &tessdataPath);
 
 private:
   void recognized(const TaskPtr &task);
+  void processQueue();
 
   Manager &manager_;
   const Settings &settings_;
   QThread *workerThread_;
+  std::deque<TaskPtr> queue_;
 };
diff --git a/src/translate/translator.cpp b/src/translate/translator.cpp
index fb15904..2535817 100644
--- a/src/translate/translator.cpp
+++ b/src/translate/translator.cpp
@@ -117,6 +117,7 @@ void Translator::updateSettings()
 {
   view_->setPage(nullptr);
   pages_.clear();
+  queue_.clear();
   url_->clear();
 
   tabs_->blockSignals(true);