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

dcCandidateToInstall(): pass mount path as second parameter to prevent code duplication.

Browse Source
This commit is contained in:
Gerhard Hoffmann
2025-09-29 13:06:14 +02:00
parent 4f1efcf5cf
commit 559298331b
2 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/include/utils_internal.h
View File

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

36
common/src/utils_internal.cpp
View File

@@ -76,11 +76,11 @@ std::unique_ptr<QSettings> readSettings(QString const &optionalDirName) {
settings.reset(new QSettings(fi.absoluteFilePath(), QSettings::IniFormat)); settings.reset(new QSettings(fi.absoluteFilePath(), QSettings::IniFormat));
return settings; return settings;
} else { } else {
qCritical() << fi.absoluteFilePath() << "not found." qCritical().noquote() << "read" << fileName << ":" << fi.absoluteFilePath() << "not found."
<< "Try" << internal::DEFAULT_INI_DIR; << "Try" << internal::DEFAULT_INI_DIR;
} }
} else { } else {
qCritical() << optionalDirName << "not found." qCritical().noquote() << "read" << fileName << ":" << optionalDirName << "not found."
<< "Try" << internal::DEFAULT_INSTALL_DIR; << "Try" << internal::DEFAULT_INSTALL_DIR;
} }
} }
@@ -91,11 +91,11 @@ std::unique_ptr<QSettings> readSettings(QString const &optionalDirName) {
settings.reset(new QSettings(fi.absoluteFilePath(), QSettings::IniFormat)); settings.reset(new QSettings(fi.absoluteFilePath(), QSettings::IniFormat));
return settings; return settings;
} else { } else {
qCritical() << fi.absoluteFilePath() << "not found." qCritical().noquote() << "read" << fileName << ":" << fi.absoluteFilePath() << "not found."
<< "Try" << internal::DEFAULT_INSTALL_DIR; << "Try" << internal::DEFAULT_INSTALL_DIR;
} }
} else { } else {
qCritical() << internal::DEFAULT_INI_DIR << "not found." qCritical().noquote() << "read" << fileName << ":" << internal::DEFAULT_INI_DIR << "not found."
<< "Try" << internal::DEFAULT_INSTALL_DIR; << "Try" << internal::DEFAULT_INSTALL_DIR;
} }
d = QDir{internal::DEFAULT_INSTALL_DIR}; d = QDir{internal::DEFAULT_INSTALL_DIR};
@@ -105,22 +105,38 @@ std::unique_ptr<QSettings> readSettings(QString const &optionalDirName) {
settings.reset(new QSettings(fi.absoluteFilePath(), QSettings::IniFormat)); settings.reset(new QSettings(fi.absoluteFilePath(), QSettings::IniFormat));
return settings; return settings;
} else { } else {
qCritical() << fi.absoluteFilePath() << "not found."; qCritical().noquote() << "read" << fileName << ":" << fi.absoluteFilePath() << "not found.";
} }
} else { } else {
qCritical() << internal::DEFAULT_INSTALL_DIR << "not found."; qCritical().noquote() << "read" << fileName << ":" << internal::DEFAULT_INSTALL_DIR << "not found.";
} }
return settings; return settings;
} }
std::unique_ptr<QString> dcCandidateToInstall(QString const &dcDirectory) { std::unique_ptr<QString> dcCandidateToInstall(QString const &dcDirectory,
QString const &rootDir) {
std::unique_ptr<QString> dcCandidate{nullptr}; 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 (dcDirectory.isEmpty()) {
dcDir = QDir::cleanPath(rootDir + QDir::separator() + customerRepoDcDir());
} else {
dcDir = QDir::cleanPath(rootDir + QDir::separator() + dcDirectory);
}
}
QDir dcDir{dcDirectory.isEmpty() ? customerRepoDcDir() : dcDirectory};
if (dcDir.exists()) { if (dcDir.exists()) {
qCritical() << __func__ << __LINE__ << dcDir;
QFileInfoList fileInfoList = QFileInfoList fileInfoList =
dcDir.entryInfoList(QStringList("*.bin"), dcDir.entryInfoList(QStringList("*.bin"),
@@ -159,6 +175,8 @@ std::unique_ptr<QString> dcCandidateToInstall(QString const &dcDirectory) {
} }
} }
} }
} else {
qCritical() << __func__ << __LINE__ << dcDir << "does not exist";
} }
return dcCandidate; return dcCandidate;