! add signal to stop pull thread when close window

Author: fog.hua

src/app/mainwindow.cpp

@@ -29,7 +29,7 @@ void MainWindow::startWorker()
     QObject::connect(m_workThread, &QThread::started, m_worker, &Worker::run);
     QObject::connect(m_workThread, &QThread::finished, m_worker, &Worker::deleteLater);
     QObject::connect(m_workThread, &QThread::finished, m_workThread, &QThread::deleteLater);
-    //QObject::connect(this, &MainWindow::workStop, m_worker, &Worker::onWorkStop);
+    QObject::connect(this, &MainWindow::workStop, m_worker, &Worker::onWorkStop);
     QObject::connect(m_worker, &Worker::indexDownloaded, this, &MainWindow::onIndexDownloaded);
     QObject::connect(m_worker, &Worker::pageDownloaded, this, &MainWindow::onPageDownloaded);
 
@@ -39,7 +39,7 @@ void MainWindow::startWorker()
 
 void MainWindow::stopWorker()
 {
-    //emit workStop();
+    emit workStop();
 
     if(m_workThread && (!m_workThread->isFinished())) {
         m_workThread->quit();

src/app/mainwindow.h

@@ -26,6 +26,9 @@ private slots:
     void on_pbReqPages_clicked();
     void on_pbPullPages_clicked();
 
+signals:
+    void workStop();
+
 private:
     void startWorker();
     void stopWorker();

src/app/worker.cpp

@@ -314,13 +314,23 @@ bool Worker::pullBookPages(int start, int end)
         if (m_siteInfo.m_interval) {
             msleep(m_siteInfo.m_interval);
         }
+
+        QCoreApplication::processEvents();
+        if (m_isQuit) {
+            break;
+        }
     }
 
     outFile->close();
 
     return true;
 }
 
+void Worker::onWorkStop()
+{
+    m_isQuit = true;
+}
+
 bool Worker::loadSiteConfigs(const QUrl &url)
 {
     const QString &domain = url.host();

src/app/worker.h

@@ -48,12 +48,14 @@ public slots:
     bool requestBookPages(const QString &urlStr);
     bool pullBookPage(QTextStream &out, int index);
     bool pullBookPages(int start, int end);
+    void onWorkStop();
 
 private:
     void oldparser();
     bool loadSiteConfigs(const QUrl &url);
 
     HttpSession *m_session = nullptr;
+    bool m_isQuit = false;
 
 };