Run page parsing in separate thread (issue #1246)

Bionus · May 16, 2018 · d2d7995 · d2d7995
1 parent ff10f6d
commit d2d7995
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 1 deletion.
diff --git a/gui/src/main/main.cpp b/gui/src/main/main.cpp
@@ -29,6 +29,7 @@
 #include "downloader/downloader.h"
 #include "functions.h"
 #include "mainwindow.h"
+#include "models/page-api.h"
 #include "models/profile.h"
 #include "models/site.h"
 #include "updater/update-dialog.h"
@@ -52,6 +53,8 @@ int main(int argc, char *argv[])
 	app.setOrganizationName("Bionus");
 	app.setOrganizationDomain("bionus.fr.cr");
 
+	qRegisterMetaType<PageApi::LoadResult>("LoadResult");
+
 	// Set window title according to the current build
 	#ifdef NIGHTLY
 		QString commit(NIGHTLY_COMMIT);

diff --git a/lib/src/models/api/api.cpp b/lib/src/models/api/api.cpp
@@ -262,6 +262,7 @@ QSharedPointer<Image> Api::parseImage(Page *parentPage, QMap<QString, QString> d
 
 	// Generate image
 	QSharedPointer<Image> img(new Image(site, d, site->getSource()->getProfile(), parentPage));
+	img->moveToThread(this->thread());
 	if (!tags.isEmpty())
 		img->setTags(tags);
 

diff --git a/lib/src/models/api/javascript-api.cpp b/lib/src/models/api/javascript-api.cpp
@@ -169,10 +169,12 @@ ParsedPage JavascriptApi::parsePage(Page *parentPage, const QString &source, int
 
 	ParsedPage ret;
 
+	m_engineMutex.lock();
 	Site *site = parentPage->site();
 	const QJSValue &api = m_source.property("apis").property(m_key);
 	QJSValue parseFunction = api.property("search").property("parse");
 	const QJSValue &results = parseFunction.call(QList<QJSValue>() << source);
+	m_engineMutex.unlock();
 
 	// Script errors and exceptions
 	if (results.isError())

diff --git a/lib/src/models/api/javascript-api.h b/lib/src/models/api/javascript-api.h
@@ -2,6 +2,7 @@
 #define JAVASCRIPT_API_H
 
 #include <QJSValue>
+#include <QMutex>
 #include "models/api/api.h"
 
 
@@ -40,6 +41,7 @@ class JavascriptApi : public Api
 	private:
 		const QJSValue &m_source;
 		QString m_key;
+		mutable QMutex m_engineMutex;
 };
 
 #endif // JAVASCRIPT_API_H
diff --git a/lib/src/models/page-api.cpp b/lib/src/models/page-api.cpp
@@ -1,6 +1,7 @@
 #include "models/page-api.h"
 #include <QDomDocument>
 #include <QRegularExpression>
+#include <QtConcurrentRun>
 #include <QtMath>
 #include "functions.h"
 #include "logger.h"
@@ -159,7 +160,7 @@ void PageApi::parse()
 		return;
 	}
 
-	parseActual();
+	QtConcurrent::run(this, &PageApi::parseActual);
 }
 
 void PageApi::parseActual()