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

[packagechooser] Store *method* configuration in Config object

Browse Source
This commit is contained in:
Adriaan de Groot 2021-04-23 21:46:46 +02:00
parent 7521be3c5f
commit 6ce1a49f1c
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/packagechooser/Config.cpp
View File

@ -92,17 +92,19 @@ void
Config::updateGlobalStorage( const QStringList& selected ) const Config::updateGlobalStorage( const QStringList& selected ) const
{ {
QString key = QStringLiteral( "packagechooser_%1" ).arg( m_id ); QString key = QStringLiteral( "packagechooser_%1" ).arg( m_id );
cDebug() << "Writing to GS" << key;
if ( m_method == PackageChooserMethod::Legacy ) if ( m_method == PackageChooserMethod::Legacy )
{ {
QString value = selected.join( ',' ); QString value = selected.join( ',' );
Calamares::JobQueue::instance()->globalStorage()->insert( key, value ); Calamares::JobQueue::instance()->globalStorage()->insert( key, value );
cDebug() << "PackageChooser" << key << "selected" << value; cDebug() << Logger::SubEntry << "PackageChooser" << key << "selected" << value;
} }
else if ( m_method == PackageChooserMethod::Packages ) else if ( m_method == PackageChooserMethod::Packages )
{ {
QStringList packageNames = m_model->getInstallPackagesForNames( selected ); QStringList packageNames = m_model->getInstallPackagesForNames( selected );
cDebug() << Logger::SubEntry << "Got packages" << packageNames;
CalamaresUtils::Packages::setGSPackageAdditions( CalamaresUtils::Packages::setGSPackageAdditions(
Calamares::JobQueue::instance()->globalStorage(), m_defaultId, packageNames ); Calamares::JobQueue::instance()->globalStorage(), m_defaultId, packageNames );
} }
@ -175,21 +177,14 @@ fillModel( PackageListModel* model, const QVariantList& items )
void void
Config::setConfigurationMap( const QVariantMap& configurationMap ) Config::setConfigurationMap( const QVariantMap& configurationMap )
{ {
QString mode = CalamaresUtils::getString( configurationMap, "mode" ); m_mode = packageChooserModeNames().find( CalamaresUtils::getString( configurationMap, "mode" ), PackageChooserMode::Required );
bool mode_ok = false; m_method = PackageChooserMethodNames().find( CalamaresUtils::getString( configurationMap, "method" ), PackageChooserMethod::Legacy );
if ( !mode.isEmpty() )
{
m_mode = packageChooserModeNames().find( mode, mode_ok );
}
if ( !mode_ok )
{
m_mode = PackageChooserMode::Required;
}
m_id = CalamaresUtils::getString( configurationMap, "id" ); m_id = CalamaresUtils::getString( configurationMap, "id" );
if ( m_id.isEmpty() ) if ( m_id.isEmpty() )
{ {
m_id = m_defaultId.id(); m_id = m_defaultId.id();
cDebug() << "Using default ID" << m_id << "from" << m_defaultId.toString();
} }
m_defaultModelIndex = QModelIndex(); m_defaultModelIndex = QModelIndex();