nou/tenmon
1
0
Fork 1
Code Issues Pull Requests Projects Releases 33 Wiki Activity

Use only single database

Browse Source
This commit is contained in:
Dušan Poizl
2025-03-18 14:46:08 +01:00
parent f30dd2a520
commit 6fd17fbdf5
7 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scriptengine.cpp
+13 -9
View File
@@ -17,9 +17,9 @@
namespace Script
{
ScriptEngine::ScriptEngine(BatchProcessing *parent)
ScriptEngine::ScriptEngine(Database *database, BatchProcessing *parent)
: _jsEngine(new QJSEngine(this))
, _database(new Database(this))
, _database(database)
, _parent(parent)
, _pool(new QThreadPool(this))
{
@@ -27,7 +27,6 @@ ScriptEngine::ScriptEngine(BatchProcessing *parent)
_jsEngine->globalObject().setProperty("core", core);
QJSValue fitsRecordObject = _jsEngine->newQMetaObject(&FITSRecordModify::staticMetaObject);
_jsEngine->globalObject().setProperty("FITSRecordModify", fitsRecordObject);
_database->init(QLatin1String("scriptengine"));
_semaphore.release(_pool->maxThreadCount());
_pool->setThreadPriority(QThread::LowPriority);
@@ -73,17 +72,22 @@ void ScriptEngine::log(const QString &message)
void ScriptEngine::mark(File *file)
{
_database->mark(file->absoluteFilePath());
QString path = file->absoluteFilePath();
QMetaObject::invokeMethod(_database, [this, path](){ _database->mark(path); }, Qt::QueuedConnection);
}
void ScriptEngine::unmark(File *file)
{
_database->unmark(file->absoluteFilePath());
QString path = file->absoluteFilePath();
QMetaObject::invokeMethod(_database, [this, path](){ _database->unmark(path); }, Qt::QueuedConnection);
}
bool ScriptEngine::isMarked(const File *file) const
bool ScriptEngine::isMarked(const File *file)
{
return _database->isMarked(file->absoluteFilePath());
bool ret;
QString path = file->absoluteFilePath();
QMetaObject::invokeMethod(_database, [this, path](){ _database->isMarked(path); }, Qt::BlockingQueuedConnection, &ret);
return ret;
}
void ScriptEngine::setMaxThread(int maxthread)
@@ -765,11 +769,11 @@ QJSValue File::extractStars(bool hfr)
}
#endif // PLATESOLVER
ScriptEngineThread::ScriptEngineThread(BatchProcessing *parent) : QObject(parent)
ScriptEngineThread::ScriptEngineThread(Database *database, BatchProcessing *parent) : QObject(parent)
{
_thread = new QThread();
_thread->setObjectName("ScriptEngine");
_engine = new ScriptEngine(parent);
_engine = new ScriptEngine(database, parent);
_engine->moveToThread(_thread);
connect(_engine, &ScriptEngine::finished, _thread, &QThread::quit);
connect(_engine, &ScriptEngine::newMessage, this, &ScriptEngineThread::newMessage);