move commandline_parser to ../common/

This commit is contained in:
2025-09-15 13:12:57 +02:00
parent ba1b2263d2
commit 34cc077937
4 changed files with 1107 additions and 440 deletions

View File

@@ -294,7 +294,6 @@ SOURCES += \
process/show_software_status_command.cpp \ process/show_software_status_command.cpp \
message_handler.cpp \ message_handler.cpp \
worker.cpp \ worker.cpp \
commandline_parser.cpp \
work_process_list.cpp \ work_process_list.cpp \
$${_PRO_FILE_PWD_}/../common/src/utils_internal.cpp \ $${_PRO_FILE_PWD_}/../common/src/utils_internal.cpp \
$${_PRO_FILE_PWD_}/../common/src/commandline_parser.cpp \ $${_PRO_FILE_PWD_}/../common/src/commandline_parser.cpp \
@@ -324,7 +323,6 @@ HEADERS += \
process/show_software_status_command.h \ process/show_software_status_command.h \
message_handler.h \ message_handler.h \
worker.h \ worker.h \
commandline_parser.h \
work_process_list.h \ work_process_list.h \
$${_PRO_FILE_PWD_}/../common/include/utils_internal.h \ $${_PRO_FILE_PWD_}/../common/include/utils_internal.h \
$${_PRO_FILE_PWD_}/../common/include/commandline_parser.h \ $${_PRO_FILE_PWD_}/../common/include/commandline_parser.h \

View File

@@ -1,360 +0,0 @@
#include "commandline_parser.h"
#include <QDir>
#include <QSettings>
#include <QDebug>
#include <QFile>
CommandLineParser::CommandLineParser()
: m_repositoryUrl("https://git.mimbach49.de/GerhardHoffmann")
, m_plugInDir("/usr/lib/")
, m_plugInName("libCAslave.so")
, m_workingDir("/opt/app/tools/atbupdate/")
, m_dryRun("false")
, m_noUpdatePsaHardware("false")
, m_showYoctoVersion("false")
, m_showYoctoInstallStatus("false")
, m_showExtendedVersion("false")
, m_iniFileName("ATBUpdateTool.ini")
, m_alwaysDownloadConfig("false")
, m_alwaysDownloadDC("false")
, m_repositoryUrlOption(
QCommandLineOption(
QStringList() << "repository-url" << "repository-url",
QCoreApplication::translate("main", "Where to find a customer repository."),
QCoreApplication::translate("main", "directory")))
, m_iniFileDirectoryOption(
QCommandLineOption(
QStringList() << "ini-directory" << "ini-directory",
QCoreApplication::translate("main", "Where to find an ini-file."),
QCoreApplication::translate("main", "directory")))
, m_iniFileNameOption(
QCommandLineOption(
QStringList() << "ini-filename" << "ini-filename",
QCoreApplication::translate("main", "Name of ini-file."),
QCoreApplication::translate("main", "file")))
, m_pluginDirectoryOption(
QCommandLineOption(
QStringList() << "plugin-directory" << "plugin-directory",
QCoreApplication::translate("main", "Where to find dc-plugin."),
QCoreApplication::translate("main", "directory")))
, m_pluginNameOption(
QCommandLineOption(
QStringList() << "plugin-name" << "plugin-name",
QCoreApplication::translate("main", "Name of dc-plugin."),
QCoreApplication::translate("main", "directory")))
, m_noDownloadOption(
QCommandLineOption(
"no-psa-hardware-update",
QCoreApplication::translate("main", "Do not update the PSA firmware (json, device-controller).")))
, m_alwaysDownloadConfigOption(
QCommandLineOption(
"always-download-config",
QCoreApplication::translate("main", "Always download the (json-)configs to DC).")))
, m_alwaysDownloadDCOption(
QCommandLineOption(
"always-download-dc",
QCoreApplication::translate("main", "Always download the dc-bin-file to DC).")))
, m_workingDirectoryOption(
QCommandLineOption(
QStringList() << "working-directory" << "working-directory",
QCoreApplication::translate("main", "working directory of update-script."),
QCoreApplication::translate("main", "directory")))
, m_psaConfigDirectoryOption(
QCommandLineOption(
QStringList() << "psa-config-directory" << "psa-config-directory",
QCoreApplication::translate("main", "config directory of json-files sent to dc."),
QCoreApplication::translate("main", "directory")))
, m_psaTariffDirectoryOption(
QCommandLineOption(
QStringList() << "psa-tariff-directory" << "psa-tariff-directory",
QCoreApplication::translate("main", "tariff directory of tariff-json-files."),
QCoreApplication::translate("main", "directory")))
, m_dryRunOption(
QCommandLineOption(
QStringList() << "d" << "dry-run",
QCoreApplication::translate("main", "Start ATBUpdateTool in dry-run-mode. No actual actions.")))
, m_extendedVersionOption(
QCommandLineOption(
QStringList() << "V" << "extended-version",
QCoreApplication::translate("main", "Show extended version (including last git commit).")))
, m_yoctoVersionOption(
QCommandLineOption(
QStringList() << "y" << "yocto-version",
QCoreApplication::translate("main", "Show yocto version of ATBUpdateTool.")))
, m_yoctoInstallStatusOption(
QCommandLineOption(
QStringList() << "Y" << "yocto-install",
QCoreApplication::translate("main", "Show yocto install status of ATBUpdateTool.")))
, m_dcDirectoryOption(
QCommandLineOption(
QStringList() << "dc-directory" << "dc-directory",
QCoreApplication::translate("main", "device controller directory."),
QCoreApplication::translate("main", "directory")))
, m_readDCVersionOption(
QCommandLineOption(
QStringList() << "D" << "read-dc-version",
QCoreApplication::translate("main", "Show version of device controller."),
QCoreApplication::translate("main", "Show version of device controller.")))
, m_setPPid(
QCommandLineOption(
QStringList() << "P" << "set-ppid",
QCoreApplication::translate("main", "Set pid of parent process."),
QCoreApplication::translate("main", "Set pid of parent process."))) {
configure();
}
void CommandLineParser::configure() {
m_parser.setApplicationDescription("Download tool for downloading device controller firmware, printer json-files and executing opkg-commands.");
m_parser.addHelpOption();
m_parser.addVersionOption();
m_repositoryUrlOption.setDefaultValue("https://git.mimbach49.de/GerhardHoffmann");
m_parser.addOption(m_repositoryUrlOption);
m_iniFileDirectoryOption.setDefaultValue(QCoreApplication::applicationDirPath());
m_parser.addOption(m_iniFileDirectoryOption);
m_iniFileNameOption.setDefaultValue("ATBUpdateTool.ini");
m_parser.addOption(m_iniFileNameOption);
m_pluginDirectoryOption.setDefaultValue("/usr/lib/");
m_parser.addOption(m_pluginDirectoryOption);
m_pluginNameOption.setDefaultValue("libCAslave.so");
m_parser.addOption(m_pluginNameOption);
m_alwaysDownloadConfigOption.setDefaultValue("false");
m_parser.addOption(m_alwaysDownloadConfigOption);
m_alwaysDownloadDCOption.setDefaultValue("false");
m_parser.addOption(m_alwaysDownloadDCOption);
m_noDownloadOption.setDefaultValue("false");
m_parser.addOption(m_noDownloadOption);
m_workingDirectoryOption.setDefaultValue("/opt/app/tools/atbupdate/");
m_parser.addOption(m_workingDirectoryOption);
m_psaConfigDirectoryOption.setDefaultValue("etc/psa_config/");
m_parser.addOption(m_psaConfigDirectoryOption);
m_psaTariffDirectoryOption.setDefaultValue("etc/psa_tariff/");
m_parser.addOption(m_psaTariffDirectoryOption);
m_dryRunOption.setDefaultValue("false");
m_parser.addOption(m_dryRunOption);
m_extendedVersionOption.setDefaultValue("false");
m_parser.addOption(m_extendedVersionOption);
m_yoctoVersionOption.setDefaultValue("false");
m_parser.addOption(m_yoctoVersionOption);
m_yoctoInstallStatusOption.setDefaultValue("false");
m_parser.addOption(m_yoctoInstallStatusOption);
m_dcDirectoryOption.setDefaultValue("etc/dc/");
m_parser.addOption(m_dcDirectoryOption);
m_readDCVersionOption.setDefaultValue("false");
m_parser.addOption(m_readDCVersionOption);
m_setPPid.setDefaultValue("-1");
m_parser.addOption(m_setPPid);
}
void CommandLineParser::readSettings() {
QString const iniFileDir = m_parser.value(m_iniFileDirectoryOption);
QString const iniFileName = m_parser.value(m_iniFileNameOption);
m_iniFileName = QDir::cleanPath(iniFileDir + QDir::separator() + iniFileName);
//qCritical() << __PRETTY_FUNCTION__ << " iniFileDir" << iniFileDir;
//qCritical() << __PRETTY_FUNCTION__ << "iniFileName" << m_iniFileName;
if (!m_iniFileName.isEmpty()) {
if (QFile(m_iniFileName).exists()) {
QSettings settings(m_iniFileName, QSettings::IniFormat);
QStringList keys = settings.allKeys();
for (QString const &key: keys) {
QVariant v = settings.value(key);
//qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
// << key << " -> " << v.toString();
if (key.contains("repository-url")) {
m_repositoryUrl = v.toString();
} else
if (key.contains("plugin-directory")) {
m_plugInDir = v.toString();
} else
if (key.contains("working-directory")) {
m_workingDir = v.toString();
} else
if (key.contains("psa-config-directory")) {
m_psaConfigDir = v.toString();
} else
if (key.contains("psa-tariff-directory")) {
m_psaTariffDir = v.toString();
} else
if (key.contains("dry-run")) {
m_dryRun = (v.toBool() ? "true" : "false");
} else
if (key.contains("extended-version")) {
m_showExtendedVersion = (v.toBool() ? "true" : "false");
} else
if (key.contains("no-psa-hardware-update")) {
m_noUpdatePsaHardware = (v.toBool() ? "true" : "false");
} else
if (key.contains("always-download-config")) {
m_alwaysDownloadConfig = (v.toBool() ? "true" : "false");
} else
if (key.contains("always-download-dc")) {
m_alwaysDownloadDC = (v.toBool() ? "true" : "false");
} else
if (key.contains("yocto-install")) {
m_showYoctoInstallStatus = (v.toBool() ? "true" : "false");
} else
if (key.contains("yocto-version")) {
m_showYoctoVersion = (v.toBool() ? "true" : "false");
} else
if (key.contains("plugin-name")) {
m_plugInName = v.toString();
} else
if (key.contains("dc-directory")) {
m_dcDir = v.toString();
} else
if (key.contains("read-dc-version")) {
m_readDCVersion = (v.toBool() ? "true" : "false");
} else {
qCritical() << __PRETTY_FUNCTION__
<< key << " -> (UNKNOWN) " << v.toString();
}
}
} else {
qCritical() << __PRETTY_FUNCTION__ << "iniFileName" << m_iniFileName
<< "DOES NOT EXIST";
}
}
}
QString CommandLineParser::repositoryUrl() {
if (m_parser.isSet(m_repositoryUrlOption)) {
m_repositoryUrl = m_parser.value(m_repositoryUrlOption);
}
return m_repositoryUrl;
}
QString CommandLineParser::plugInDir() {
if (m_parser.isSet(m_pluginDirectoryOption)) {
m_plugInDir = m_parser.value(m_pluginDirectoryOption);
}
return m_plugInDir;
}
QString CommandLineParser::plugInName() {
if (m_parser.isSet(m_pluginNameOption)) {
m_plugInName = m_parser.value(m_pluginNameOption);
}
return m_plugInName;
}
QString CommandLineParser::psaConfigDir() {
if (m_parser.isSet(m_psaConfigDirectoryOption)) {
m_psaConfigDir = m_parser.value(m_psaConfigDirectoryOption);
}
return m_psaConfigDir;
}
QString CommandLineParser::psaTariffDir() {
if (m_parser.isSet(m_psaTariffDirectoryOption)) {
m_psaTariffDir = m_parser.value(m_psaTariffDirectoryOption);
}
return m_psaTariffDir;
}
QString CommandLineParser::dcDir() {
if (m_parser.isSet(m_dcDirectoryOption)) {
m_dcDir = m_parser.value(m_dcDirectoryOption);
}
return m_dcDir;
}
bool CommandLineParser::readDCVersion() {
if (m_parser.isSet(m_readDCVersionOption)) {
m_readDCVersion = m_parser.value(m_readDCVersionOption);
}
return m_readDCVersion == "false" ? false : true;
}
QString CommandLineParser::workingDir() {
if (m_parser.isSet(m_workingDirectoryOption)) {
m_workingDir = m_parser.value(m_workingDirectoryOption);
}
return m_workingDir;
}
qint64 CommandLineParser::ppid() {
m_ppid = -1;
if (m_parser.isSet(m_setPPid)) {
QString p = m_parser.value(m_setPPid);
bool ok;
qint64 q = p.toLongLong(&ok);
if (ok) {
m_ppid = q;
}
}
return m_ppid;
}
bool CommandLineParser::dryRun() {
if (m_parser.isSet(m_dryRunOption)) {
m_dryRun = m_parser.value(m_dryRunOption);
}
return m_dryRun == "false" ? false : true;
}
bool CommandLineParser::noUpdatePsaHardware() {
if (m_parser.isSet(m_noDownloadOption)) {
m_noUpdatePsaHardware = m_parser.value(m_noDownloadOption);
}
return m_noUpdatePsaHardware == "false" ? false : true;
}
bool CommandLineParser::yoctoVersion() {
if (m_parser.isSet(m_yoctoVersionOption)) {
m_showYoctoVersion = m_parser.value(m_yoctoVersionOption);
}
return m_showYoctoVersion == "false" ? false : true;
}
bool CommandLineParser::yoctoInstallStatus() {
if (m_parser.isSet(m_yoctoInstallStatusOption)) {
m_showYoctoInstallStatus = m_parser.value(m_yoctoInstallStatusOption);
}
return m_showYoctoInstallStatus == "false" ? false : true;
}
bool CommandLineParser::extendedVersion() {
if (m_parser.isSet(m_extendedVersionOption)) {
m_showExtendedVersion = m_parser.value(m_extendedVersionOption);
}
return m_showExtendedVersion == "false" ? false : true;
}
bool CommandLineParser::alwaysDownloadConfig() {
if (m_parser.isSet(m_alwaysDownloadConfigOption)) {
m_alwaysDownloadConfig = m_parser.value(m_alwaysDownloadConfigOption);
// qCritical() << "m_alwaysDownloadConfigOption IS SET" << m_alwaysDownloadConfig;
}
// qCritical() << "m_alwaysDownloadConfig" << m_alwaysDownloadConfig;
return m_alwaysDownloadConfig == "false" ? false : true;
}
bool CommandLineParser::alwaysDownloadDC() {
if (m_parser.isSet(m_alwaysDownloadDCOption)) {
m_alwaysDownloadDC = m_parser.value(m_alwaysDownloadDCOption);
}
return m_alwaysDownloadDC == "false" ? false : true;
}

View File

@@ -1,78 +0,0 @@
#ifndef COMMAND_LINE_PARSER_H_INCLUDED
#define COMMAND_LINE_PARSER_H_INCLUDED
#include <QCoreApplication>
#include <QCommandLineParser>
#include <QCommandLineOption>
#include <QString>
class CommandLineParser : public QCommandLineParser {
QString m_repositoryUrl;
QString m_plugInDir;
QString m_plugInName;
QString m_workingDir;
QString m_psaConfigDir{"etc/psa_config"};
QString m_psaTariffDir{"etc/psa_tariff"};
QString m_dryRun;
QString m_noUpdatePsaHardware;
QString m_showYoctoVersion;
QString m_showYoctoInstallStatus;
QString m_showExtendedVersion;
QString m_iniFileName;
QString m_alwaysDownloadConfig;
QString m_alwaysDownloadDC;
QString m_readDCVersion{"false"};
QString m_dcDir{"etc/dc/"};
qint64 m_ppid;
QCommandLineOption m_repositoryUrlOption;
QCommandLineOption m_iniFileDirectoryOption;
QCommandLineOption m_iniFileNameOption;
QCommandLineOption m_pluginDirectoryOption;
QCommandLineOption m_pluginNameOption;
QCommandLineOption m_noDownloadOption;
QCommandLineOption m_alwaysDownloadConfigOption;
QCommandLineOption m_alwaysDownloadDCOption;
QCommandLineOption m_workingDirectoryOption;
QCommandLineOption m_psaConfigDirectoryOption;
QCommandLineOption m_psaTariffDirectoryOption;
QCommandLineOption m_dryRunOption;
QCommandLineOption m_extendedVersionOption;
QCommandLineOption m_yoctoVersionOption;
QCommandLineOption m_yoctoInstallStatusOption;
QCommandLineOption m_dcDirectoryOption;
QCommandLineOption m_readDCVersionOption;
QCommandLineOption m_setPPid;
QCommandLineParser m_parser;
void configure();
public:
explicit CommandLineParser();
~CommandLineParser() = default;
QCommandLineParser &parser() { return m_parser; }
QCommandLineParser const &parser() const { return m_parser; }
void process(const QCoreApplication &app) { m_parser.process(app); }
QString const &iniFileName() const { return m_iniFileName; }
void readSettings();
QString repositoryUrl();
QString plugInDir();
QString plugInName();
QString workingDir();
QString psaConfigDir();
QString psaTariffDir();
bool dryRun();
qint64 ppid();
bool noUpdatePsaHardware();
bool yoctoVersion();
bool yoctoInstallStatus();
bool extendedVersion();
bool alwaysDownloadConfig();
bool alwaysDownloadDC();
bool readDCVersion();
QString dcDir();
};
#endif // COMMAND_LINE_PARSER_H_INCLUDED

File diff suppressed because it is too large Load Diff