GerhardHoffmann/UpdatePTUDevCtrl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Qt-commandline parser

Browse Source
This commit is contained in:
Gerhard Hoffmann 2023-06-19 15:59:17 +02:00
parent bc3a801b8d
commit a4afeeb396
1 changed files with 66 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
main.cpp
View File

@ -4,6 +4,10 @@
#include <QTimer> #include <QTimer>
#include <QFileInfo> #include <QFileInfo>
#ifdef __linux__
#include <stdlib.h> // system()
#endif
#include "message_handler.h" #include "message_handler.h"
#include "plugins/interfaces.h" #include "plugins/interfaces.h"
@ -14,6 +18,9 @@
#include <QRunnable> #include <QRunnable>
#include <QThreadPool> #include <QThreadPool>
#include <QDir> #include <QDir>
#include <QProcess>
#include <QCommandLineParser>
#include <QStandardPaths>
#include "update.h" #include "update.h"
#include "worker_thread.h" #include "worker_thread.h"
@ -27,17 +34,26 @@
#define SERIAL_PORT "ttyUSB0" #define SERIAL_PORT "ttyUSB0"
#endif #endif
static void doWork(QString update_ctrl_file, QString workingDir) { class hwinf;
static void doWork(hwinf *hw, QString update_ctrl_file, QString workingDir) {
std::this_thread::sleep_for(std::chrono::milliseconds(2000)); std::this_thread::sleep_for(std::chrono::milliseconds(2000));
//Update update(update_ctrl_file, workingDir); Update update(hw, update_ctrl_file, workingDir);
//update.doUpdate(); update.doUpdate();
std::this_thread::sleep_for(std::chrono::milliseconds(2000)); std::this_thread::sleep_for(std::chrono::milliseconds(2000));
QCoreApplication::quit(); QCoreApplication::quit();
} }
// argv[1]: file to send to dc // argv[1]: file to send to dc
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
QByteArray const value = qgetenv("XDG_RUNTIME_DIR");
if (value.size() == 0) {
qputenv("XDG_RUNTIME_DIR", "/run/user/0");
}
QApplication a(argc, argv); QApplication a(argc, argv);
QApplication::setApplicationName("ATBUpdateTool");
QApplication::setApplicationVersion("1.0");
if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling if (!messageHandlerInstalled()) { // change internal qt-QDebug-handling
atbInstallMessageHandler(atbDebugOutput); atbInstallMessageHandler(atbDebugOutput);
@ -45,31 +61,64 @@ int main(int argc, char *argv[]) {
//setDebugLevel(QtMsgType::QtDebugMsg); //setDebugLevel(QtMsgType::QtDebugMsg);
} }
QByteArray const value = qgetenv("XDG_RUNTIME_DIR"); QCommandLineParser parser;
if (value.size() == 0) { parser.setApplicationDescription("Download tool for downloading device controller firmware, printer json-files and executing opkg-commands.");
qputenv("XDG_RUNTIME_DIR", "/run/user/0"); parser.addHelpOption();
} parser.addVersionOption();
QString rtPath = QCoreApplication::applicationDirPath(); QCommandLineOption pluginDirectoryOption(QStringList() << "plugin-directory" << "plugin-directory",
QString plugInDir(rtPath +(rtPath.endsWith("/") ? "" : "/") + "plugins"); QCoreApplication::translate("main", "Where to find dc-plugin."),
QCoreApplication::translate("main", "directory"));
QString const pluginDefault = "./plugins";
pluginDirectoryOption.setDefaultValue(pluginDefault);
parser.addOption(pluginDirectoryOption);
QCommandLineOption pluginNameOption(QStringList() << "plugin-name" << "plugin-name",
QCoreApplication::translate("main", "Name of dc-plugin."),
QCoreApplication::translate("main", "directory"));
QString const pluginNameDefault = "libCAmaster.so";
pluginNameOption.setDefaultValue(pluginNameDefault);
parser.addOption(pluginNameOption);
QCommandLineOption workingDirectoryOption(QStringList() << "working-directory" << "working-directory",
QCoreApplication::translate("main", "working directory of update-script."),
QCoreApplication::translate("main", "directory"));
QString const workingDirectoryDefault = ".";
workingDirectoryOption.setDefaultValue(workingDirectoryDefault);
parser.addOption(workingDirectoryOption);
// Process the actual command line arguments given by the user
parser.process(a);
QString plugInDir = parser.value(pluginDirectoryOption);
QString plugInName = parser.value(pluginNameOption);
QString workingDir = parser.value(workingDirectoryOption);
QString const rtPath = QCoreApplication::applicationDirPath();
if (plugInDir == pluginDefault) {
plugInDir = (rtPath + "/" + pluginDefault);
}
if (!QDir(plugInDir).exists()) { if (!QDir(plugInDir).exists()) {
qCritical() << plugInDir qCritical() << plugInDir
<< "does not exists, but has to contain dc-library"; << "does not exists, but has to contain dc-library";
exit(-1); exit(-1);
} }
qInfo() << "pwd" << "=" << rtPath; qInfo() << "pwd" << "=" << rtPath;
qInfo() << "plugInDir" << "=" << plugInDir; qInfo() << "plugInDir" << "=" << plugInDir;
qInfo() << "plugInName" << "=" << plugInName;
qInfo() << "workingDir" << "=" << workingDir;
hwinf *hw = Update::loadDCPlugin(QDir(plugInDir), "libCAmaster.so"); // before loading the library, delete all possible shared memory segments
#if defined Q_OS_LINUX || defined Q_OS_UNIX
// system("rm -rf /tmp/qipc*");
#else
#error "Only tested under UNIX/LINUX"
#endif
hwinf *hw = Update::loadDCPlugin(QDir(plugInDir), plugInName);
hw->dc_autoRequest(false);
QString const update_ctrl_file = "/opt/app/tools/atbupdate/update_log.csv"; QString const update_ctrl_file = "/opt/app/tools/atbupdate/update_log.csv";
QString const workingDir = (argc == 2) ? argv[1] : "."; std::thread t(doWork, hw, update_ctrl_file, workingDir);
Update update(hw, update_ctrl_file, workingDir);
return 0;
std::thread t(doWork, update_ctrl_file, workingDir);
int ret = a.exec(); int ret = a.exec();
t.join(); t.join();