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

[libcalamares] Call Python function if available for status

Browse Source
This commit is contained in:
Adriaan de Groot 2020-03-09 15:13:40 -05:00
parent 252089e372
commit b4aaf85ccf
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libcalamares/PythonJob.cpp
View File

@ -168,7 +168,6 @@ namespace Calamares
struct PythonJob::Private struct PythonJob::Private
{ {
bp::object m_prettyStatusMessage; bp::object m_prettyStatusMessage;
bp::object m_prettyName;
}; };
PythonJob::PythonJob( const ModuleSystem::InstanceKey& instance, PythonJob::PythonJob( const ModuleSystem::InstanceKey& instance,
@ -205,6 +204,21 @@ PythonJob::prettyName() const
QString QString
PythonJob::prettyStatusMessage() const PythonJob::prettyStatusMessage() const
{ {
if ( m_d && !m_d->m_prettyStatusMessage.is_none() )
{
cDebug() << "Getting dynamic message";
QString r;
bp::extract< std::string > result( m_d->m_prettyStatusMessage() );
r = result.check() ? QString::fromStdString( result() ).trimmed() : QString();
if ( !r.isEmpty() )
{
return r;
}
}
else
{
cDebug() << "Getting static message";
}
if ( m_description.isEmpty() ) if ( m_description.isEmpty() )
{ {
return tr( "Running %1 operation." ).arg( QDir( m_workingPath ).dirName() ); return tr( "Running %1 operation." ).arg( QDir( m_workingPath ).dirName() );