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

[libcalamaresui] one more refactor for string-loading

Browse Source 
- Do the checking for IsMap inside loadStrings() and use
   YAML::Exception to get to bail() (since we're already dealing
   with exceptions here, no extra costs). This tidies up the code
   somewhat.
This commit is contained in:
Adriaan de Groot 2019-05-20 17:00:43 +02:00
parent 667f78c016
commit 92d0e71029
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/libcalamaresui/Branding.cpp
View File

@ -89,15 +89,20 @@ Branding::WindowDimension::suffixes()
return names; return names;
} }
/** @brief Load the @p map with strings from @p config /** @brief Load the @p map with strings from @p doc
* *
* Each key-value pair from @p config is inserted into the @p map, * Each key-value pair from the sub-map in @p doc identified by @p key
* but the value is first transformed by the @p transform function, * is inserted into the @p map, but the value is first transformed by
* which may change strings. * the @p transform function, which may change strings.
*/ */
static void static void
loadStrings( QMap<QString, QString>& map, const QVariantMap& config, const std::function< QString(const QString&) >& transform ) loadStrings( QMap<QString, QString>& map, const YAML::Node& doc, const std::string& key, const std::function< QString(const QString&) >& transform )
{ {
if ( !doc[ key ].IsMap() )
throw YAML::Exception( YAML::Mark(), std::string("Branding configuration is not a map: ") + key );
const auto& config = CalamaresUtils::yamlMapToVariant( doc[ key ] ).toMap();
map.clear(); map.clear();
for ( auto it = config.constBegin(); it != config.constEnd(); ++it ) for ( auto it = config.constBegin(); it != config.constEnd(); ++it )
map.insert( it.key(), transform( it.value().toString() ) ); map.insert( it.key(), transform( it.value().toString() ) );
@ -141,14 +146,10 @@ Branding::Branding( const QString& brandingFilePath,
initSimpleSettings( doc ); initSimpleSettings( doc );
if ( !doc[ "strings" ].IsMap() ) loadStrings( m_strings, doc, "strings",
bail( "Syntax error in strings map." ); []( const QString& s ) -> QString { return s; }
loadStrings( m_strings, CalamaresUtils::yamlMapToVariant( doc[ "strings" ] ).toMap(), );
[]( const QString& s ) -> QString { return s; } ); loadStrings( m_images, doc, "images",
if ( !doc[ "images" ].IsMap() )
bail( "Syntax error in images map." );
loadStrings( m_images, CalamaresUtils::yamlMapToVariant( doc[ "images" ] ).toMap(),
[&]( const QString& s ) -> QString [&]( const QString& s ) -> QString
{ {
QFileInfo imageFi( componentDir.absoluteFilePath( s ) ); QFileInfo imageFi( componentDir.absoluteFilePath( s ) );
@ -156,12 +157,10 @@ Branding::Branding( const QString& brandingFilePath,
bail( QString( "Image file %1 does not exist." ).arg( imageFi.absoluteFilePath() ) ); bail( QString( "Image file %1 does not exist." ).arg( imageFi.absoluteFilePath() ) );
return imageFi.absoluteFilePath(); return imageFi.absoluteFilePath();
} }
); );
loadStrings( m_style, doc, "style",
if ( !doc[ "style" ].IsMap() ) []( const QString& s ) -> QString { return s; }
bail( "Syntax error in style map." ); );
loadStrings( m_style, CalamaresUtils::yamlMapToVariant( doc[ "style" ] ).toMap(),
[]( const QString& s ) -> QString { return s; } );
if ( doc[ "slideshow" ].IsSequence() ) if ( doc[ "slideshow" ].IsSequence() )
{ {