napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[tracking] Use KMacroExpander instead of homebrew for install-URL

Browse Source
This commit is contained in:
Adriaan de Groot 2020-06-17 10:36:35 +02:00
parent c797a30a72
commit 4d6a5d0cb5
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/tracking/TrackingJobs.cpp
View File

@ -24,6 +24,8 @@
#include "utils/CalamaresUtilsSystem.h" #include "utils/CalamaresUtilsSystem.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include <KMacroExpander>
#include <QSemaphore> #include <QSemaphore>
#include <QTimer> #include <QTimer>
@ -79,14 +81,13 @@ TrackingInstallJob::addJob( Calamares::JobList& list, InstallTrackingConfig* con
{ {
if ( config->isEnabled() ) if ( config->isEnabled() )
{ {
QString installUrl = config->installTrackingUrl();
const auto* s = CalamaresUtils::System::instance(); const auto* s = CalamaresUtils::System::instance();
QHash<QString, QString> map { std::initializer_list< std::pair< QString, QString > > {
QString memory, disk; { QStringLiteral("CPU"), s->getCpuDescription() },
memory.setNum( s->getTotalMemoryB().first ); { QStringLiteral("MEMORY"), QString::number( s->getTotalMemoryB().first ) },
disk.setNum( s->getTotalDiskB() ); { QStringLiteral("DISK"), QString::number( s->getTotalDiskB() ) }
} };
installUrl.replace( "$CPU", s->getCpuDescription() ).replace( "$MEMORY", memory ).replace( "$DISK", disk ); QString installUrl = KMacroExpander::expandMacros( config->installTrackingUrl(), map );
cDebug() << Logger::SubEntry << "install-tracking URL" << installUrl; cDebug() << Logger::SubEntry << "install-tracking URL" << installUrl;