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

[users] Use DictionaryExpander instead of raw KMacroExpander

Browse Source
This commit is contained in:
Adriaan de Groot 2022-07-02 15:56:59 +02:00
parent 273941f451
commit f8a845d996
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/modules/users/Config.cpp
View File

@ -18,10 +18,9 @@
#include "JobQueue.h" #include "JobQueue.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/String.h" #include "utils/String.h"
#include "utils/StringExpander.h"
#include "utils/Variant.h" #include "utils/Variant.h"
#include <KMacroExpander>
#include <QCoreApplication> #include <QCoreApplication>
#include <QFile> #include <QFile>
#include <QMetaProperty> #include <QMetaProperty>
@ -415,20 +414,20 @@ invalidEmpty( const QString& s )
STATICTEST QString STATICTEST QString
makeHostnameSuggestion( const QString& templateString, const QStringList& fullNameParts, const QString& loginName ) makeHostnameSuggestion( const QString& templateString, const QStringList& fullNameParts, const QString& loginName )
{ {
QHash< QString, QString > replace; Calamares::String::DictionaryExpander d;
// User data // User data
replace.insert( QStringLiteral( "first" ), d.add( QStringLiteral( "first" ),
invalidEmpty( fullNameParts.isEmpty() ? QString() : cleanupForHostname( fullNameParts.first() ) ) ); invalidEmpty( fullNameParts.isEmpty() ? QString() : cleanupForHostname( fullNameParts.first() ) ) )
replace.insert( QStringLiteral( "name" ), invalidEmpty( cleanupForHostname( fullNameParts.join( QString() ) ) ) ); .add( QStringLiteral( "name" ), invalidEmpty( cleanupForHostname( fullNameParts.join( QString() ) ) ) )
replace.insert( QStringLiteral( "login" ), invalidEmpty( cleanupForHostname( loginName ) ) ); .add( QStringLiteral( "login" ), invalidEmpty( cleanupForHostname( loginName ) ) )
// Hardware data // Hardware data
replace.insert( QStringLiteral( "product" ), guessProductName() ); .add( QStringLiteral( "product" ), guessProductName() )
replace.insert( QStringLiteral( "product2" ), cleanupForHostname( QSysInfo::prettyProductName() ) ); .add( QStringLiteral( "product2" ), cleanupForHostname( QSysInfo::prettyProductName() ) )
replace.insert( QStringLiteral( "cpu" ), cleanupForHostname( QSysInfo::currentCpuArchitecture() ) ); .add( QStringLiteral( "cpu" ), cleanupForHostname( QSysInfo::currentCpuArchitecture() ) )
// Hostname data // Hostname data
replace.insert( QStringLiteral( "host" ), invalidEmpty( cleanupForHostname( QSysInfo::machineHostName() ) ) ); .add( QStringLiteral( "host" ), invalidEmpty( cleanupForHostname( QSysInfo::machineHostName() ) ) );
QString hostnameSuggestion = KMacroExpander::expandMacros( templateString, replace, '$' ); QString hostnameSuggestion = d.expand( templateString );
// RegExp for valid hostnames; if the suggestion produces a valid name, return it // RegExp for valid hostnames; if the suggestion produces a valid name, return it
static const QRegExp HOSTNAME_RX( "^[a-zA-Z0-9][-a-zA-Z0-9_]*$" ); static const QRegExp HOSTNAME_RX( "^[a-zA-Z0-9][-a-zA-Z0-9_]*$" );