[libcalamaresui] Change return type of loadedInstanceKeys()

- Replace stringlist with a stronger-typed list of InstanceKey objects
 - Move smashing-that-to-stringlist into consumers of the list
   (just one, the debug window)
main
Adriaan de Groot 5 years ago
parent c482990bc5
commit fed0c46612

@ -113,7 +113,13 @@ DebugWindow::DebugWindow()
} ); } );
// Modules page // Modules page
QStringListModel* modulesModel = new QStringListModel( ModuleManager::instance()->loadedInstanceKeys() ); QStringList modulesKeys;
for ( const auto& m : ModuleManager::instance()->loadedInstanceKeys() )
{
modulesKeys << m.toString();
}
QStringListModel* modulesModel = new QStringListModel( modulesKeys );
m_ui->modulesListView->setModel( modulesModel ); m_ui->modulesListView->setModel( modulesModel );
m_ui->modulesListView->setSelectionMode( QAbstractItemView::SingleSelection ); m_ui->modulesListView->setSelectionMode( QAbstractItemView::SingleSelection );

@ -95,16 +95,12 @@ ModuleManager::doInit()
QFileInfo descriptorFileInfo( currentDir.absoluteFilePath( QLatin1String( "module.desc" ) ) ); QFileInfo descriptorFileInfo( currentDir.absoluteFilePath( QLatin1String( "module.desc" ) ) );
if ( !descriptorFileInfo.exists() ) if ( !descriptorFileInfo.exists() )
{ {
cDebug() << bad_descriptor cDebug() << bad_descriptor << descriptorFileInfo.absoluteFilePath() << "(missing)";
<< descriptorFileInfo.absoluteFilePath()
<< "(missing)";
continue; continue;
} }
if ( !descriptorFileInfo.isReadable() ) if ( !descriptorFileInfo.isReadable() )
{ {
cDebug() << bad_descriptor cDebug() << bad_descriptor << descriptorFileInfo.absoluteFilePath() << "(unreadable)";
<< descriptorFileInfo.absoluteFilePath()
<< "(unreadable)";
continue; continue;
} }
@ -133,22 +129,16 @@ ModuleManager::doInit()
} }
// At this point m_availableDescriptorsByModuleName is filled with // At this point m_availableDescriptorsByModuleName is filled with
// the modules that were found in the search paths. // the modules that were found in the search paths.
cDebug() << "Found" cDebug() << "Found" << m_availableDescriptorsByModuleName.count() << "modules"
<< m_availableDescriptorsByModuleName.count() << "modules"
<< m_moduleDirectoriesByModuleName.count() << "names"; << m_moduleDirectoriesByModuleName.count() << "names";
emit initDone(); emit initDone();
} }
QStringList QList< ModuleSystem::InstanceKey >
ModuleManager::loadedInstanceKeys() ModuleManager::loadedInstanceKeys()
{ {
QStringList l; return m_loadedModulesByInstanceKey.keys();
for ( const auto& m : m_loadedModulesByInstanceKey.keys() )
{
l << m.toString();
}
return l;
} }
@ -188,15 +178,14 @@ findCustomInstance( const Settings::InstanceDescriptionList& customInstances, co
void void
ModuleManager::loadModules() ModuleManager::loadModules()
{ {
if (checkDependencies()) if ( checkDependencies() )
{ {
cWarning() << "Some installed modules have unmet dependencies."; cWarning() << "Some installed modules have unmet dependencies.";
} }
Settings::InstanceDescriptionList customInstances = Settings::instance()->customModuleInstances(); Settings::InstanceDescriptionList customInstances = Settings::instance()->customModuleInstances();
QStringList failedModules; QStringList failedModules;
const auto modulesSequence const auto modulesSequence = Settings::instance()->modulesSequence();
= Settings::instance()->modulesSequence() ;
for ( const auto& modulePhase : modulesSequence ) for ( const auto& modulePhase : modulesSequence )
{ {
ModuleSystem::Action currentAction = modulePhase.first; ModuleSystem::Action currentAction = modulePhase.first;
@ -269,7 +258,8 @@ ModuleManager::loadModules()
m_moduleDirectoriesByModuleName.value( instanceKey.module() ) ); m_moduleDirectoriesByModuleName.value( instanceKey.module() ) );
if ( !thisModule ) if ( !thisModule )
{ {
cError() << "Module" << instanceKey.toString() << "cannot be created from descriptor" << configFileName; cError() << "Module" << instanceKey.toString() << "cannot be created from descriptor"
<< configFileName;
failedModules.append( instanceKey.toString() ); failedModules.append( instanceKey.toString() );
continue; continue;
} }

@ -62,7 +62,7 @@ public:
* modules. * modules.
* @return a QStringList with the instance keys. * @return a QStringList with the instance keys.
*/ */
QStringList loadedInstanceKeys(); QList< ModuleSystem::InstanceKey > loadedInstanceKeys();
/** /**
* @brief moduleDescriptor returns the module descriptor structure for a given module. * @brief moduleDescriptor returns the module descriptor structure for a given module.

Loading…
Cancel
Save