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

[users] Refactor hostname-guessing

Browse Source
This commit is contained in:
Adriaan de Groot 2020-02-14 11:45:45 +01:00
parent 7c323bdcdc
commit 2bb4dd8e22
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/modules/users/UsersPage.cpp
View File

@ -271,6 +271,38 @@ UsersPage::onFullNameTextEdited( const QString& textRef )
checkReady( isReady() ); checkReady( isReady() );
} }
/** @brief Guess the machine's name
*
* If there is DMI data, use that; otherwise, just call the machine "-pc".
* Reads the DMI data just once.
*/
static QString
guessProductName()
{
static bool tried = false;
static QString dmiProduct;
if ( !tried )
{
// yes validateHostnameText() but these files can be a mess
QRegExp dmirx( "[^a-zA-Z0-9]", Qt::CaseInsensitive );
QFile dmiFile( QStringLiteral( "/sys/devices/virtual/dmi/id/product_name" ) );
if ( dmiFile.exists() && dmiFile.open( QIODevice::ReadOnly ) )
{
dmiProduct = QString::fromLocal8Bit( dmiFile.readAll().simplified().data() )
.toLower()
.replace( dmirx, " " )
.remove( ' ' );
}
if ( dmiProduct.isEmpty() )
{
dmiProduct = QStringLiteral( "-pc" );
}
tried = true;
}
return dmiProduct;
}
void void
UsersPage::fillSuggestions() UsersPage::fillSuggestions()
@ -305,27 +337,9 @@ UsersPage::fillSuggestions()
{ {
if ( !cleanParts.isEmpty() && !cleanParts.first().isEmpty() ) if ( !cleanParts.isEmpty() && !cleanParts.first().isEmpty() )
{ {
QString dmiProductName;
QString hostnameSuggestion; QString hostnameSuggestion;
// yes validateHostnameText() but these files can be a mess QString productName = guessProductName();
QRegExp dmirx( "[^a-zA-Z0-9]", Qt::CaseInsensitive ); hostnameSuggestion = QString( "%1-%2" ).arg( cleanParts.first() ).arg( productName );
QFile dmiFile( QStringLiteral( "/sys/devices/virtual/dmi/id/product_name" ) );
if ( dmiFile.exists() &&
dmiFile.open(QIODevice::ReadOnly))
{
dmiProductName = QString::fromLocal8Bit( dmiFile.readAll().simplified().data() )
.toLower().replace(dmirx, " ").remove(' ');
}
if ( !dmiProductName.isEmpty() )
{
hostnameSuggestion = QString( "%1-%2" ).arg( cleanParts.first() ).arg( dmiProductName );
}
else
{
hostnameSuggestion = QString( "%1-pc" ).arg( cleanParts.first() );
}
if ( HOSTNAME_RX.indexIn( hostnameSuggestion ) != -1 ) if ( HOSTNAME_RX.indexIn( hostnameSuggestion ) != -1 )
{ {
ui->textBoxHostname->setText( hostnameSuggestion ); ui->textBoxHostname->setText( hostnameSuggestion );