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

[libcalamares] Start putting data into the module Descriptor

Browse Source
This commit is contained in:
Adriaan de Groot 2020-08-12 00:33:08 +02:00
parent 60fbf04594
commit 65273a262b
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libcalamares/modulesystem/Descriptor.cpp
View File

@ -55,6 +55,23 @@ Descriptor::fromDescriptorData( const QVariantMap& moduleDesc )
cDebug() << moduleDesc; cDebug() << moduleDesc;
{
bool typeOk = false;
Type t = typeNames().find( moduleDesc.value( "type" ).toString(), typeOk );
bool interfaceOk = false;
Interface i = interfaceNames().find( moduleDesc.value( "interface" ).toString(), interfaceOk );
if ( typeOk && interfaceOk )
{
d.m_type = t;
d.m_interface = i;
d.m_isValid = true;
}
}
if ( !d.m_isValid )
{
return d;
}
return d; return d;
} }

9
src/libcalamares/modulesystem/Descriptor.h
View File

@ -72,11 +72,11 @@ public:
*/ */
static Descriptor fromDescriptorData( const QVariantMap& moduleDesc ); static Descriptor fromDescriptorData( const QVariantMap& moduleDesc );
bool isValid() const { return false; } bool isValid() const { return m_isValid; }
QString name() const { return QString(); } QString name() const { return QString(); }
Type type() const { return Type::Job; } Type type() const { return m_type; }
Interface interface() const { return Interface::QtPlugin; } Interface interface() const { return m_interface; }
bool isEmergency() const { return false; } bool isEmergency() const { return false; }
bool hasConfig() const { return true; } bool hasConfig() const { return true; }
@ -120,6 +120,9 @@ public:
private: private:
QString m_directory; QString m_directory;
Type m_type;
Interface m_interface;
bool m_isValid = false;
}; };
} // namespace ModuleSystem } // namespace ModuleSystem