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

[contextualprocess] Apply current coding style

Browse source
This commit is contained in:
Adriaan de Groot 2019-08-01 23:10:49 +02:00
parent a0430f76b7
commit 8186d5730a
3 changed files with 36 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/modules/contextualprocess/ContextualProcessJob.cpp
View file

@ -18,13 +18,13 @@
#include "ContextualProcessJob.h" #include "ContextualProcessJob.h"
#include <QProcess>
#include <QDateTime> #include <QDateTime>
#include <QProcess>
#include <QThread> #include <QThread>
#include "CalamaresVersion.h" #include "CalamaresVersion.h"
#include "JobQueue.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "JobQueue.h"
#include "utils/CommandList.h" #include "utils/CommandList.h"
#include "utils/Logger.h" #include "utils/Logger.h"
@ -67,19 +67,25 @@ struct ContextualProcessBinding
{ {
checks.append( ValueCheck( value, commands ) ); checks.append( ValueCheck( value, commands ) );
if ( value == QString( "*" ) ) if ( value == QString( "*" ) )
{
wildcard = commands; wildcard = commands;
} }
}
Calamares::JobResult run( const QString& value ) const Calamares::JobResult run( const QString& value ) const
{ {
for ( const auto& c : checks ) for ( const auto& c : checks )
{ {
if ( value == c.value() ) if ( value == c.value() )
{
return c.commands()->run(); return c.commands()->run();
} }
}
if ( wildcard ) if ( wildcard )
{
return wildcard->run(); return wildcard->run();
}
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();
} }
@ -129,11 +135,15 @@ ContextualProcessJob::exec()
{ {
Calamares::JobResult r = binding->run( gs->value( binding->variable ).toString() ); Calamares::JobResult r = binding->run( gs->value( binding->variable ).toString() );
if ( !r ) if ( !r )
{
return r; return r;
} }
}
else else
{
cWarning() << "ContextualProcess checks for unknown variable" << binding->variable; cWarning() << "ContextualProcess checks for unknown variable" << binding->variable;
} }
}
return Calamares::JobResult::ok(); return Calamares::JobResult::ok();
} }
@ -144,13 +154,17 @@ ContextualProcessJob::setConfigurationMap( const QVariantMap& configurationMap )
bool dontChroot = CalamaresUtils::getBool( configurationMap, "dontChroot", false ); bool dontChroot = CalamaresUtils::getBool( configurationMap, "dontChroot", false );
int timeout = CalamaresUtils::getInteger( configurationMap, "timeout", 10 ); int timeout = CalamaresUtils::getInteger( configurationMap, "timeout", 10 );
if ( timeout < 1 ) if ( timeout < 1 )
{
timeout = 10; timeout = 10;
}
for ( QVariantMap::const_iterator iter = configurationMap.cbegin(); iter != configurationMap.cend(); ++iter ) for ( QVariantMap::const_iterator iter = configurationMap.cbegin(); iter != configurationMap.cend(); ++iter )
{ {
QString variableName = iter.key(); QString variableName = iter.key();
if ( variableName.isEmpty() || ( variableName == "dontChroot" ) || ( variableName == "timeout" ) ) if ( variableName.isEmpty() || ( variableName == "dontChroot" ) || ( variableName == "timeout" ) )
{
continue; continue;
}
if ( iter.value().type() != QVariant::Map ) if ( iter.value().type() != QVariant::Map )
{ {
@ -166,11 +180,13 @@ ContextualProcessJob::setConfigurationMap( const QVariantMap& configurationMap )
QString valueString = valueiter.key(); QString valueString = valueiter.key();
if ( variableName.isEmpty() ) if ( variableName.isEmpty() )
{ {
cWarning() << moduleInstanceKey() << "variable" << variableName << "unrecognized value" << valueiter.key(); cWarning() << moduleInstanceKey() << "variable" << variableName << "unrecognized value"
<< valueiter.key();
continue; continue;
} }
CalamaresUtils::CommandList* commands = new CalamaresUtils::CommandList( valueiter.value(), !dontChroot, std::chrono::seconds( timeout ) ); CalamaresUtils::CommandList* commands
= new CalamaresUtils::CommandList( valueiter.value(), !dontChroot, std::chrono::seconds( timeout ) );
binding->append( valueString, commands ); binding->append( valueString, commands );
} }
@ -188,7 +204,9 @@ ContextualProcessJob::count(const QString& variableName)
{ {
for ( const ContextualProcessBinding* binding : m_commands ) for ( const ContextualProcessBinding* binding : m_commands )
if ( binding->variable == variableName ) if ( binding->variable == variableName )
{
return binding->checks.count(); return binding->checks.count();
}
return -1; return -1;
} }

9
src/modules/contextualprocess/Tests.cpp
View file

@ -31,13 +31,9 @@ QTEST_GUILESS_MAIN( ContextualProcessTests )
using CommandList = CalamaresUtils::CommandList; using CommandList = CalamaresUtils::CommandList;
ContextualProcessTests::ContextualProcessTests() ContextualProcessTests::ContextualProcessTests() {}
{
}
ContextualProcessTests::~ContextualProcessTests() ContextualProcessTests::~ContextualProcessTests() {}
{
}
void void
ContextualProcessTests::initTestCase() ContextualProcessTests::initTestCase()
@ -66,4 +62,3 @@ ContextualProcessTests::testProcessListSampleConfig()
QCOMPARE( job.count(), 1 ); // Only "firmwareType" QCOMPARE( job.count(), 1 ); // Only "firmwareType"
QCOMPARE( job.count( "firmwareType" ), 4 ); QCOMPARE( job.count( "firmwareType" ), 4 );
} }