applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-28 01:45:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Big configuration overhaul.

Browse source 
Module descriptors are now module.desc, no configuration allowed inside.
Module config files are <modulename>.conf, installed in
share/calamares/modules.
settings.conf is read from /etc/calamares, then share/calamares, and if
running with --debug also in the current dir.
Module config files are read from /etc/calamares/modules, then
share/calamares/modules, and if running with --debug also in
src/modules/<modulename> relative to the current dir.
This commit is contained in:
Teo Mrnjavac 2014-08-05 18:18:57 +02:00
parent 75e9fd6aa3
commit 8f10c21e5b
38 changed files with 161 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/libcalamaresui/modulesystem/ModuleManager.cpp
View file

@ -27,7 +27,7 @@
#include <QDir>
#include <QTimer>
#define MODULE_CONFIG_FILENAME "module.conf"
#define MODULE_CONFIG_FILENAME "module.desc"
namespace Calamares
{
@ -92,7 +92,7 @@ ModuleManager::loadModules( Phase phase )
continue;
}
recursiveLoad( moduleName );
doLoad( moduleName );
}
emit modulesLoaded( phase );
// Loading sequence:
@ -114,7 +114,7 @@ ModuleManager::doInit()
// might (should) contain Calamares modules of any type/interface.
// For each modules search path (directory), it is expected that each module
// lives in its own subdirectory. This subdirectory must have the same name as
// the module name, and must contain a settings file named module.conf.
// the module name, and must contain a settings file named module.desc.
// If at any time the module loading procedure finds something unexpected, it
// silently skips to the next module or search path. --Teo 6/2014
foreach ( const QString& path, m_paths )
@ -137,7 +137,7 @@ ModuleManager::doInit()
continue;
}
Module* moduleInfo = Module::fromConfigFile( metadataFileInfo.absoluteFilePath() );
Module* moduleInfo = Module::fromDescriptorFile( metadataFileInfo.absoluteFilePath() );
if ( moduleInfo &&
( moduleInfo->name() == currentDir.dirName() ) &&
@ -170,16 +170,9 @@ ModuleManager::doInit()
void
ModuleManager::recursiveLoad( const QString& moduleName )
ModuleManager::doLoad( const QString& moduleName )
{
Module* thisModule = m_availableModules.value( moduleName );
foreach ( const QString& module, thisModule->requiredModules() )
{
if ( !m_availableModules.value( module )->isLoaded() )
{
recursiveLoad( module );
}
}
thisModule->loadSelf();
cDebug() << ( thisModule->isLoaded() ? "SUCCESS" : "FAILURE" );
}