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

[partition] Simplify config-reading (now the variant-docs are better)

Browse Source
This commit is contained in:
Adriaan de Groot 2021-06-29 12:21:14 +02:00
parent 88be947f6c
commit ebecfb9f8b
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/partition/Config.cpp
View File

@ -278,16 +278,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
if ( configurationMap.contains( "availableFileSystemTypes" ) )
{
QStringList fsTypes;
if ( configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::List )
{
fsTypes = CalamaresUtils::getStringList( configurationMap, "availableFileSystemTypes" );
}
else if ( configurationMap.value( "availableFileSystemTypes" ).type() == QVariant::String )
{
fsTypes = QStringList { CalamaresUtils::getString( configurationMap, "availableFileSystemTypes" ) };
}
QStringList fsTypes = CalamaresUtils::getStringList( configurationMap, "availableFileSystemTypes" );
m_eraseFsTypes = fsTypes;
if ( !fsTypes.empty() )
@ -297,18 +288,7 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
}
}
if ( configurationMap.contains( "requiredPartitionTableType" )
&& configurationMap.value( "requiredPartitionTableType" ).type() == QVariant::List )
{
m_requiredPartitionTableType.clear();
m_requiredPartitionTableType.append( configurationMap.value( "requiredPartitionTableType" ).toStringList() );
}
else if ( configurationMap.contains( "requiredPartitionTableType" )
&& configurationMap.value( "requiredPartitionTableType" ).type() == QVariant::String )
{
m_requiredPartitionTableType.clear();
m_requiredPartitionTableType.append( configurationMap.value( "requiredPartitionTableType" ).toString() );
}
m_requiredPartitionTableType = CalamaresUtils::getStringList( configurationMap, "requiredPartitionTableType" );
gs->insert( "requiredPartitionTableType", m_requiredPartitionTableType );
fillGSConfigurationEFI(gs, configurationMap);