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

[netinstall] Swap parameters to makeSourceItem and document it

Browse Source
This commit is contained in:
Adriaan de Groot 2021-03-16 13:17:33 +01:00
parent 79b4f918fc
commit 6662cb5f2d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/netinstall/Config.cpp
View File

@ -171,7 +171,7 @@ Config::receivedGroupData()
} }
Config::SourceItem Config::SourceItem
Config::SourceItem::makeSourceItem( const QVariantMap& configurationMap, const QString& groupsUrl ) Config::SourceItem::makeSourceItem( const QString& groupsUrl, const QVariantMap& configurationMap )
{ {
if ( groupsUrl == QStringLiteral( "local" ) ) if ( groupsUrl == QStringLiteral( "local" ) )
{ {
@ -211,13 +211,13 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
const auto& groupsUrlVariant = configurationMap.value( key ); const auto& groupsUrlVariant = configurationMap.value( key );
if ( groupsUrlVariant.type() == QVariant::String ) if ( groupsUrlVariant.type() == QVariant::String )
{ {
m_urls.append( SourceItem::makeSourceItem( configurationMap, groupsUrlVariant.toString() ) ); m_urls.append( SourceItem::makeSourceItem( groupsUrlVariant.toString(), configurationMap ) );
} }
else if ( groupsUrlVariant.type() == QVariant::StringList ) else if ( groupsUrlVariant.type() == QVariant::StringList )
{ {
for ( const auto& s : groupsUrlVariant.toStringList() ) for ( const auto& s : groupsUrlVariant.toStringList() )
{ {
m_urls.append( SourceItem::makeSourceItem( configurationMap, s ) ); m_urls.append( SourceItem::makeSourceItem( s, configurationMap ) );
} }
} }

8
src/modules/netinstall/Config.h
View File

@ -99,7 +99,13 @@ private:
bool isUrl() const { return url.isValid(); } bool isUrl() const { return url.isValid(); }
bool isLocal() const { return !data.isEmpty(); } bool isLocal() const { return !data.isEmpty(); }
bool isValid() const { return isUrl() || isLocal(); } bool isValid() const { return isUrl() || isLocal(); }
static SourceItem makeSourceItem( const QVariantMap& configurationMap, const QString& groupsUrl ); /** @brief Create a SourceItem
*
* If the @p groupsUrl is @c "local" then the *groups* key in
* the @p configurationMap is used as the source; otherwise the
* string is used as an actual URL.
*/
static SourceItem makeSourceItem( const QString& groupsUrl, const QVariantMap& configurationMap );
}; };
QQueue< SourceItem > m_urls; QQueue< SourceItem > m_urls;