Make sure that if everything fails, to check /etc/dc for thedc-binary.

DownloadDCFirmware/DownloadDCFirmware.pro

@@ -86,7 +86,7 @@ SOURCES += \
 
 HEADERS += \
         ../common/include/message_handler.h \
-        ../common/src/commandline_parser.h \
+        ../common/include/commandline_parser.h \
         update.h \
         ../common/include/System.h \
         ../common/include/utils_internal.h \

DownloadDCFirmware/main.cpp

@@ -67,11 +67,11 @@ int main(int argc, char **argv) {
 
     //return 0;
 
-/*
     CommandLineParser parser;
     parser.process(a);
     parser.readSettings();
 
+/*
     QString repositoryUrl = parser.repositoryUrl();
     QString plugInDir = parser.plugInDir();
     QString plugInName = parser.plugInName();
@@ -80,6 +80,7 @@ int main(int argc, char **argv) {
     QString psaTariffDir = parser.psaTariffDir();
     QString psaDcDir = parser.dcDir();
     QString iniFileName = parser.iniFileName();
+    bool debug = parser.debug();
     bool const dryRun = parser.dryRun();
     bool const noUpdatePsaHardware = parser.noUpdatePsaHardware();
     bool const showYoctoVersion = parser.yoctoVersion();
@@ -133,11 +134,13 @@ int main(int argc, char **argv) {
     QString const &customerRepo
         = QDir::cleanPath(workingDir + QDir::separator() + QString("customer_%1").arg(customerNr));
 */
-
-    QString const &psaDcDir = internal::customerRepoDcDir();
-    QString const &psaRepoRootDir = internal::customerRepoRoot();
-    QString const &psaRepoDir = internal::customerRepoDir();
-    QString const &branchName = internal::branchName();
+    QString psaDcDir = internal::customerRepoDcDir();
+    QString psaRepoRootDir = internal::customerRepoRoot();
+    QString psaRepoDir = internal::customerRepoDir();
+    QString branchName = internal::branchName();
+    QString rootDir = "/etc/dc/";
+    // bool usbDetected = false;
+    // bool sdCardDetected = false;
 
     bool debug = false;
     bool noaction = true;
@@ -145,38 +148,68 @@ int main(int argc, char **argv) {
     QString libca;
 
     std::unique_ptr<QSettings> settings = internal::readSettings();
-
     if (settings) {
         settings->beginGroup("ATBUpdateDC");
         debug = settings->value("debug", false).toBool();
         workingDir = settings->value("workingdir", "/tmp").toString();
         libca = settings->value("libca", "/usr/lib/libCAslave.so").toString();
         settings->endGroup();
+    } else {
+        qCritical() << "count not read ATBUpdateTool.ini";
+        return -1;
+    }
+
+    QString dcDir = parser.dcDir();
+    if (!dcDir.isEmpty()) {
+        psaDcDir = dcDir;
+    }
+    debug = parser.debug();
+
+    if (debug) {
+        qInfo() << "           using dc directory: " << psaDcDir;
+        qInfo() << "using psa repo root directory: " << psaRepoRootDir;
+        qInfo() << "    using customer repository: " << psaRepoDir;
+        qInfo() << "                 using branch: " << branchName;
     }
 
     // etc/dc: located under mount-path
     std::optional<QString> mountPath = System::checkForUSBStick(psaDcDir);
     QFileInfo fi;
     if (mountPath.has_value()) {
-        fi.setFile(mountPath.value(), System::getDCFileOnUsbStick(mountPath.value()));
+        // usbDetected = true;
+        // mountPath/etc/dc must exists !
+        // cannot override with commandline parameter --dc-directory
+        if (debug) {
+            qInfo() << "using mount path (USB): " << mountPath.value();
+        }
     } else
     if ((mountPath = System::checkForSDCard(psaDcDir)).has_value()) {
-        fi.setFile(mountPath.value(), System::getDCFileOnSDCard(mountPath.value()));
-    } else {
-
+        // sdCardDetected = true;
+        // mountPath/etc/dc must exists !
+        // cannot override with commandline parameter --dc-directory
         if (debug) {
-            qInfo() << "using customer repository" << psaRepoDir;
+            qInfo() << "using mount path (SD): " << mountPath.value();
         }
+    } else {
+        rootDir = "";
+        mountPath = QDir::cleanPath(psaRepoRootDir + QDir::separator() + psaDcDir);
+        if (debug) {
+            qInfo() << "using as dc-directory" << mountPath.value();
+        }
+    }
 
-        std::unique_ptr<QString> c = internal::dcCandidateToInstall("/etc/dc/");
-        if (c) {
-            fi.setFile(*c);
-            if (fi.exists() == false) {
-                qCritical() << "dc2c.bin candidate" << *c << "does not exist. STOP.";
-                return -1;
-            }
-            qInfo() << "dc2c.bin canditate" << fi.absoluteFilePath();
+    if (debug) {
+        qInfo() << "using as mount path: " << mountPath.value();
+    }
+
+    std::unique_ptr<QString> c = internal::dcCandidateToInstall(rootDir, mountPath.value());
+    if (c) {
+        fi.setFile(*c);
+        if (fi.exists() == false) {
+            qCritical() << "dc2c.bin candidate" << *c << "does not exist. STOP.";
+            return -1;
         }
+        qInfo() << "dc2c.bin canditate" << fi.absoluteFilePath();
     }
 
     if (debug) {
@@ -185,6 +218,9 @@ int main(int argc, char **argv) {
         qInfo() << "dc-version" << Update::dcVersion(fi.absoluteFilePath());
     }
 
+    // only for testing
+    // return 0;
+
     Update u(fi.absoluteFilePath(), libca, debug, noaction);
     u.run();
 

UpdatePTUDevCtrl/main.cpp

@@ -74,6 +74,7 @@
  * - \page ATBUpdateSync
  * - \page ATBUpdateOpkg
  * - \page ATBUpdateDC
+ *      Typical call: ./ATBUpdateDC --dc-directory /etc/dc/ --debug true
  * - \page ATBUpdateJsonFiles
  * - \page ATBUpdateShow
  */

common/include/commandline_parser.h

@@ -23,6 +23,7 @@ class CommandLineParser : public QCommandLineParser {
     QString m_alwaysDownloadDC;
     QString m_readDCVersion{"false"};
     QString m_dcDir{"etc/dc/"};
+    QString m_debug{"false"};
     qint64 m_ppid;
 
     QCommandLineOption m_repositoryUrlOption;
@@ -43,6 +44,7 @@ class CommandLineParser : public QCommandLineParser {
     QCommandLineOption m_dcDirectoryOption;
     QCommandLineOption m_readDCVersionOption;
     QCommandLineOption m_setPPid;
+    QCommandLineOption m_debugOption;
 
     QCommandLineParser m_parser;
 
@@ -77,5 +79,6 @@ public:
     bool alwaysDownloadDC();
     bool readDCVersion();
     QString dcDir();
+    bool debug();
 };
 #endif // COMMAND_LINE_PARSER_H_INCLUDED

common/include/utils_internal.h

@@ -85,7 +85,7 @@ namespace internal {
     QString branchName();
     bool customerRepoExists();
     std::unique_ptr<QSettings> readSettings(QString const &optionalDirName = "");
-    std::unique_ptr<QString> dcCandidateToInstall(QString const &dcDirectory = "");
+    std::unique_ptr<QString> dcCandidateToInstall(QString const &dcDirectory, QString const &rootDir = "");
 }
 
 #endif // UTILS_INTERNAL_H_INCLUDED

common/src/commandline_parser.cpp

@@ -100,7 +100,12 @@ CommandLineParser::CommandLineParser()
         QCommandLineOption(
             QStringList() << "P" << "set-ppid",
             QCoreApplication::translate("main", "Set pid of parent process."),
-            QCoreApplication::translate("main", "Set pid of parent process."))) {
+            QCoreApplication::translate("main", "Set pid of parent process.")))
+  , m_debugOption(
+        QCommandLineOption(
+            QStringList() << "debug" << "debug",
+            QCoreApplication::translate("main", "Set debug flag."),
+            QCoreApplication::translate("main", "Set debug flag."))) {
 
     configure();
 }
@@ -110,7 +115,7 @@ void CommandLineParser::configure() {
     m_parser.addHelpOption();
     m_parser.addVersionOption();
 
-    m_repositoryUrlOption.setDefaultValue("https://git.mimbach49.de/GerhardHoffmann");
+    m_repositoryUrlOption.setDefaultValue("https://ptu-config.atb-comm.de/ATB/");
     m_parser.addOption(m_repositoryUrlOption);
 
     m_iniFileDirectoryOption.setDefaultValue(QCoreApplication::applicationDirPath());
@@ -163,6 +168,9 @@ void CommandLineParser::configure() {
 
     m_setPPid.setDefaultValue("-1");
     m_parser.addOption(m_setPPid);
+
+    m_debugOption.setDefaultValue("false");
+    m_parser.addOption(m_debugOption);
 }
 
 void CommandLineParser::readSettings() {
@@ -180,7 +188,7 @@ void CommandLineParser::readSettings() {
             for (QString const &key: keys) {
                 QVariant v = settings.value(key);
 
-                //qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
+                // qCritical() << "(" << __func__ << ":" << __LINE__ << ")"
                 //            << key << " -> " << v.toString();
 
                 if (key.contains("repository-url")) {
@@ -227,6 +235,9 @@ void CommandLineParser::readSettings() {
                 } else
                 if (key.contains("read-dc-version")) {
                     m_readDCVersion = (v.toBool() ? "true" : "false");
+                } else
+                if (key.contains("debug")) {
+                    m_debug = (v.toBool() ? "true" : "false");
                 } else {
                     qCritical() << __PRETTY_FUNCTION__
                                 << key << " -> (UNKNOWN) " << v.toString();
@@ -288,6 +299,13 @@ bool CommandLineParser::readDCVersion() {
     return m_readDCVersion == "false" ? false : true;
 }
 
+bool CommandLineParser::debug() {
+    if (m_parser.isSet(m_debugOption)) {
+        m_debug = m_parser.value(m_debugOption);
+    }
+    return m_debug == "false" ? false : true;
+}
+
 QString CommandLineParser::workingDir() {
     if (m_parser.isSet(m_workingDirectoryOption)) {
         m_workingDir = m_parser.value(m_workingDirectoryOption);

common/src/utils_internal.cpp

@@ -62,7 +62,7 @@ QString branchName() {
 }
 
 std::unique_ptr<QSettings> readSettings(QString const &optionalDirName) {
-    std::unique_ptr<QSettings> settings{std::make_unique<QSettings>()};
+    std::unique_ptr<QSettings> settings;
 
     //QString const fileName{settings->applicationName() + ".ini"};
     QString const fileName{"ATBUpdateTool.ini"};
@@ -71,33 +71,17 @@ std::unique_ptr<QSettings> readSettings(QString const &optionalDirName) {
     if (!optionalDirName.isEmpty()) {
         d = QDir{optionalDirName};
         if (d.exists()) { // try to find ini-file under optionalDirname
-            QFileInfo fi{d, optionalDirName};
+            QFileInfo fi{QDir::cleanPath(optionalDirName + QDir::separator() + fileName)};
             if (fi.exists()) {
                 settings.reset(new QSettings(fi.absoluteFilePath(), QSettings::IniFormat));
                 return settings;
             } else {
-                qCritical() << fi.absoluteFilePath() << "not found."
-                            << "Try" << internal::DEFAULT_INI_DIR;
+                qCritical().noquote() << "read" << fileName << ":" << fi.absoluteFilePath() << "not found.";
             }
         } else {
-            qCritical() << optionalDirName << "not found."
-                        << "Try" << internal::DEFAULT_INSTALL_DIR;
+            qCritical().noquote() << optionalDirName << "not found. Try" << internal::DEFAULT_INSTALL_DIR;
         }
     }
-    d = internal::DEFAULT_INI_DIR;
-    if (d.exists()) { // try to find ini-file under /etc/tools/atbupdate
-        QFileInfo fi{d, fileName};
-        if (fi.exists()) {
-            settings.reset(new QSettings(fi.absoluteFilePath(), QSettings::IniFormat));
-            return settings;
-        } else {
-            qCritical() << fi.absoluteFilePath() << "not found."
-                        << "Try" << internal::DEFAULT_INSTALL_DIR;
-        }
-    } else {
-        qCritical() << internal::DEFAULT_INI_DIR << "not found."
-                    << "Try" << internal::DEFAULT_INSTALL_DIR;
-    }
     d = QDir{internal::DEFAULT_INSTALL_DIR};
     if (d.exists()) { // try to find ini-file under /opt/app/tools/atbupdate
         QFileInfo fi{d, fileName};
@@ -105,30 +89,64 @@ std::unique_ptr<QSettings> readSettings(QString const &optionalDirName) {
             settings.reset(new QSettings(fi.absoluteFilePath(), QSettings::IniFormat));
             return settings;
         } else {
-            qCritical() << fi.absoluteFilePath() << "not found.";
+            qCritical().noquote() << "read" << fileName << ":" << fi.absoluteFilePath() << "not found.";
         }
     } else {
-        qCritical() << internal::DEFAULT_INSTALL_DIR << "not found.";
+        qCritical().noquote() << internal::DEFAULT_INSTALL_DIR << "not found.";
     }
 
     return settings;
 }
 
-std::unique_ptr<QString> dcCandidateToInstall(QString const &dcDirectory) {
+/*! \brief Find dc-binary to install.
+ *
+ *  If rootDir is empty, and if dcDirectory is empty as well, use etc/dc in
+ *  custome repository (e,.g. /opt/app/tools/atbupdate/customer_337/etc/dc).
+ *  If dcDirectory is not empty, then use it.
+ *  If rootDir is \b not empty,check if it alreay ends with "/etc/dc/". in this
+ *  case, use rootDir as dcDir. Otherwise, if dcDirectory is empty, use rootDir/etc/dc
+ *  (e,.g. /opt/app/tools/atbupdate/customer_337/etc/dc). If dcDirectory
+ *  is not empty, use roorDir/dcDirectory.
+ *  As last resort, try "/etc/dc".
+ *
+ *  \param[in] dcDirectory directory of device controller binary. Maybe empty.
+ *  \param[in] rootDir root directory for dcDirectory. Might be empty.
+ *  \return name of the found candidate, or null if not found.
+ */
+std::unique_ptr<QString> dcCandidateToInstall(QString const &dcDirectory,
+                                              QString const &rootDir) {
     std::unique_ptr<QString> dcCandidate{nullptr};
 
-    qCritical() << __func__ << __LINE__ << dcDirectory;
+    QDir dcDir;
+
+    if (rootDir.isEmpty()) {
+        if (dcDirectory.isEmpty()) {
+            dcDir = customerRepoDcDir();
+        } else {
+            dcDir = dcDirectory;
+        }
+    } else {
+        if (!rootDir.endsWith("/etc/dc") && !rootDir.endsWith("/etc/dc/")) {
+            if (dcDirectory.isEmpty()) {
+                dcDir = QDir::cleanPath(rootDir + QDir::separator() + "etc/dc/");
+            } else {
+                dcDir = QDir::cleanPath(rootDir + QDir::separator() + dcDirectory);
+            }
+        } else {
+            dcDir = QDir::cleanPath(rootDir + QDir::separator());
+        }
+    }
 
-    QDir dcDir{dcDirectory.isEmpty() ? customerRepoDcDir() : dcDirectory};
     if (dcDir.exists()) {
 
+        qInfo() << "use" << dcDir.absolutePath() << "as directory (containing dc-binary)";
+
         QFileInfoList fileInfoList =
             dcDir.entryInfoList(QStringList("*.bin"),
                                 QDir::Files | QDir::NoDotAndDotDot | QDir::NoSymLinks);
 
         QFileInfo dc2cbin{dcDir.absoluteFilePath("dc2c.bin")};
 
-
         if (dc2cbin.exists()) {
 
             QCryptographicHash md5gen(QCryptographicHash::Md5);
@@ -159,6 +177,12 @@ std::unique_ptr<QString> dcCandidateToInstall(QString const &dcDirectory) {
                 }
             }
         }
+    } else {
+        qCritical() << dcDir.absolutePath() << "does not exist";
+        if (dcDir.absolutePath() != QDir("/etc/dc/").absolutePath()) {
+            qInfo() << __func__ << __LINE__ << "Try /etc/dc/";
+            return dcCandidateToInstall("/etc/dc/", "");
+        }
     }
 
     return dcCandidate;