applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-02 03:45:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Massive refactor of module loading, configuration, startup, management.

Browse source
This commit is contained in:
Teo Mrnjavac 2015-09-09 19:01:56 +02:00
parent c74c67805e
commit fb44fb97b6
12 changed files with 374 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/libcalamaresui/modulesystem/ProcessJobModule.cpp
View file

@ -22,8 +22,6 @@
#include <QDir>
#include <yaml-cpp/yaml.h>
namespace Calamares {
@ -47,10 +45,10 @@ ProcessJobModule::loadSelf()
if ( m_loaded )
return;
m_job = Calamares::job_ptr( new ProcessJob( m_command,
m_workingPath,
m_runInChroot,
m_secondsTimeout ) );
m_job = job_ptr( new ProcessJob( m_command,
m_workingPath,
m_runInChroot,
m_secondsTimeout ) );
m_loaded = true;
}
@ -63,27 +61,29 @@ ProcessJobModule::jobs() const
void
ProcessJobModule::initFrom( const YAML::Node& node )
ProcessJobModule::initFrom( const QVariantMap& moduleDescriptor )
{
Module::initFrom( node );
Module::initFrom( moduleDescriptor );
QDir directory( location() );
m_workingPath = directory.absolutePath();
if ( node[ "command" ] )
if ( !moduleDescriptor.value( "command" ).toString().isEmpty() )
{
m_command = QString::fromStdString( node[ "command" ].as< std::string >() );
m_command = moduleDescriptor.value( "command" ).toString();
}
m_secondsTimeout = 30;
if ( node[ "timeout" ] )
if ( moduleDescriptor.contains( "timeout" ) &&
!moduleDescriptor.value( "timeout" ).isNull() )
{
m_secondsTimeout = node[ "timeout" ].as< int >();
m_secondsTimeout = moduleDescriptor.value( "timeout" ).toInt();
}
m_runInChroot = false;
if ( node[ "chroot" ] )
if ( moduleDescriptor.contains( "chroot" )&&
!moduleDescriptor.value( "chroot" ).isNull() )
{
m_runInChroot = node[ "chroot" ].as< bool >();
m_runInChroot = moduleDescriptor.value( "chroot" ).toBool();
}
}