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

Add running script as CLI option

Browse Source
This commit is contained in:
Dušan Poizl
2026-04-08 19:37:21 +02:00
parent 3818fd4625
commit 65fca14ac2
7 changed files with 172 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/batchprocessing.cpp
+51 -4
View File
@@ -18,7 +18,6 @@
#include "chartgraph.h"
#ifdef Q_OS_LINUX
#include <QCloseEvent>
#include <QDBusConnection>
#include <QDBusMessage>
#endif
@@ -99,12 +98,12 @@ BatchProcessing::BatchProcessing(Database *database, QWidget *parent) : QDialog(
qWarning() << "Failed to get app data location";
}
connect(_ui->addFilesButton, &QPushButton::released, this, &BatchProcessing::addFiles);
connect(_ui->addDirButton, &QPushButton::released, this, &BatchProcessing::addDir);
connect(_ui->addFilesButton, &QPushButton::released, this, static_cast<void (BatchProcessing::*)()>(&BatchProcessing::addFiles));
connect(_ui->addDirButton, &QPushButton::released, this, static_cast<void (BatchProcessing::*)()>(&BatchProcessing::addDir));
connect(_ui->addMarkedButton, &QPushButton::released, this, &BatchProcessing::addMarked);
connect(_ui->removeButton, &QPushButton::released, this, &BatchProcessing::removePath);
connect(_ui->removeAllButton, &QPushButton::released, this, &BatchProcessing::removeAllPaths);
connect(_ui->startButton, &QPushButton::released, this, &BatchProcessing::runScript);
connect(_ui->startButton, &QPushButton::released, this, static_cast<void (BatchProcessing::*)()>(&BatchProcessing::runScript));
connect(_ui->stopButton, &QPushButton::released, this, &BatchProcessing::stopScript);
connect(_ui->browseButton, &QPushButton::released, this, &BatchProcessing::browse);
connect(_ui->openScriptsButton, &QPushButton::released, this, &BatchProcessing::openScriptDir);
@@ -148,6 +147,17 @@ BatchProcessing::~BatchProcessing()
delete _ui;
}
void BatchProcessing::setOutputDir(const QString &output)
{
_ui->outputPath->setText(output);
}
void BatchProcessing::setPaths(const QStringList &paths)
{
_ui->pathsList->addItems(paths);
refreshPaths();
}
void BatchProcessing::closeEvent(QCloseEvent *event)
{
if(_engineThread)
@@ -266,6 +276,35 @@ void BatchProcessing::runScript()
else
{
QMessageBox::warning(this, tr("Invalid output directory"), tr("Output directory path doesn't exist or is not writable"));
delete _engineThread;
_engineThread = nullptr;
}
}
}
void BatchProcessing::runScript(const QString &script, bool exit)
{
_ui->log->clear();
{
_engineThread = new Script::ScriptEngineThread(_database, this);
connect(_engineThread, &Script::ScriptEngineThread::newMessage, this, &BatchProcessing::newMessage);
connect(_engineThread, &Script::ScriptEngineThread::newMessage, this, &BatchProcessing::newMessageCli);
connect(_engineThread, &Script::ScriptEngineThread::finished, this, &BatchProcessing::scriptFinished);
if(exit)connect(_engineThread, &Script::ScriptEngineThread::finished, this, &BatchProcessing::accept);
QFileInfo outDir(_ui->outputPath->text());
if(outDir.exists() && outDir.isWritable())
{
_engineThread->setParams(script, _paths, _ui->outputPath->text());
_engineThread->start();
_ui->startButton->setEnabled(false);
_ui->stopButton->setEnabled(true);
}
else
{
QMessageBox::warning(this, tr("Invalid output directory"), tr("Output directory path doesn't exist or is not writable"));
delete _engineThread;
_engineThread = nullptr;
}
}
}
@@ -293,6 +332,14 @@ void BatchProcessing::newMessage(const QString &message, bool error)
_ui->log->append(message);
}
void BatchProcessing::newMessageCli(const QString &message, bool error)
{
if(error)
qWarning() << message;
else
qDebug() << message;
}
QJSValue BatchProcessing::getString(const QString &label, const QString &text)
{
bool ok = false;