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

[libcalamares] Factor out Python helper

Browse source 
- the strange construction of Helper and treating it as a singleton
  can be factored out into a separate singleton-handling instance()
  function. The Helper should never be destroyed.
This commit is contained in:
Adriaan de Groot 2020-03-09 10:05:01 -05:00
parent 3025c5383b
commit 9b5a391c86
4 changed files with 37 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/libcalamares/PythonHelper.cpp
View file

@ -204,8 +204,6 @@ variantHashFromPyDict( const boost::python::dict& pyDict )
}
Helper* Helper::s_instance = nullptr;
static inline void
add_if_lib_exists( const QDir& dir, const char* name, QStringList& list )
{
@ -221,48 +219,46 @@ add_if_lib_exists( const QDir& dir, const char* name, QStringList& list )
}
}
Helper::Helper( QObject* parent )
: QObject( parent )
Helper::Helper()
: QObject( nullptr )
{
// Let's make extra sure we only call Py_Initialize once
if ( !s_instance )
if ( !Py_IsInitialized() )
{
if ( !Py_IsInitialized() )
{
Py_Initialize();
}
m_mainModule = bp::import( "__main__" );
m_mainNamespace = m_mainModule.attr( "__dict__" );
// If we're running from the build dir
add_if_lib_exists( QDir::current(), "libcalamares.so", m_pythonPaths );
QDir calaPythonPath( CalamaresUtils::systemLibDir().absolutePath() + QDir::separator() + "calamares" );
add_if_lib_exists( calaPythonPath, "libcalamares.so", m_pythonPaths );
bp::object sys = bp::import( "sys" );
foreach ( QString path, m_pythonPaths )
{
bp::str dir = path.toLocal8Bit().data();
sys.attr( "path" ).attr( "append" )( dir );
}
}
else
{
cWarning() << "creating PythonHelper more than once. This is very bad.";
return;
Py_Initialize();
}
s_instance = this;
m_mainModule = bp::import( "__main__" );
m_mainNamespace = m_mainModule.attr( "__dict__" );
// If we're running from the build dir
add_if_lib_exists( QDir::current(), "libcalamares.so", m_pythonPaths );
QDir calaPythonPath( CalamaresUtils::systemLibDir().absolutePath() + QDir::separator() + "calamares" );
add_if_lib_exists( calaPythonPath, "libcalamares.so", m_pythonPaths );
bp::object sys = bp::import( "sys" );
foreach ( QString path, m_pythonPaths )
{
bp::str dir = path.toLocal8Bit().data();
sys.attr( "path" ).attr( "append" )( dir );
}
}
Helper::~Helper()
Helper::~Helper() {}
Helper*
Helper::instance()
{
s_instance = nullptr;
}
static Helper* s_helper = nullptr;
if ( !s_helper )
{
s_helper = new Helper;
}
return s_helper;
}
boost::python::dict
Helper::createCleanNamespace()