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

[contextualprocess] Use GS method for dotted lookup

Browse Source
This commit is contained in:
Adriaan de Groot 2024-11-05 14:56:00 +01:00
parent 05bc0cbb09
commit f6b4d6db43
1 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/modules/contextualprocess/ContextualProcessJob.cpp
View File

@ -58,45 +58,18 @@ ContextualProcessBinding::run( const QString& value ) const
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();
} }
///@brief Implementation of fetch() for recursively looking up dotted selector parts.
static bool
fetch( QString& value, QStringList& selector, int index, const QVariant& v )
{
if ( !v.canConvert< QVariantMap >() )
{
return false;
}
const QVariantMap map = v.toMap();
const QString& key = selector.at( index );
if ( index == selector.length() - 1 )
{
value = map.value( key ).toString();
return map.contains( key );
}
else
{
return fetch( value, selector, index + 1, map.value( key ) );
}
}
bool bool
ContextualProcessBinding::fetch( Calamares::GlobalStorage* storage, QString& value ) const ContextualProcessBinding::fetch( Calamares::GlobalStorage* storage, QString& value ) const
{ {
value.clear(); value.clear();
if ( !storage ) bool ok = false;
const auto v = Calamares::lookup( storage, m_variable, ok );
if ( !ok )
{ {
return false; return false;
} }
if ( m_variable.contains( '.' ) ) value = v.toString();
{ return true;
QStringList steps = m_variable.split( '.' );
return ::fetch( value, steps, 1, storage->value( steps.first() ) );
}
else
{
value = storage->value( m_variable ).toString();
return storage->contains( m_variable );
}
} }
ContextualProcessJob::ContextualProcessJob( QObject* parent ) ContextualProcessJob::ContextualProcessJob( QObject* parent )