applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-01 11:25:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[packagechooser] Allow to override some of AppData

Browse source 
- The ID and Screenshot entries might be weird in AppData (in particular,
   a remove URL) so put those back under the control of Calamares even
   when using AppData as the source of descriptions.
This commit is contained in:
Adriaan de Groot 2019-08-06 22:36:35 +02:00
parent d72391942f
commit 6ddae94628
3 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/modules/packagechooser/PackageModel.cpp
View file

@ -257,9 +257,15 @@ getNameAndSummary( const QDomNode& n )
#endif
PackageItem
PackageItem::fromAppData( const QString& fileName )
PackageItem::fromAppData( const QVariantMap& item_map )
{
#ifdef HAVE_XML
QString fileName = CalamaresUtils::getString( item_map, "appdata" );
if ( fileName.isEmpty() )
{
cWarning() << "Can't load AppData without a suitable key.";
return PackageItem();
}
cDebug() << "Loading AppData XML from" << fileName;
QDomDocument doc = loadAppData( fileName );
@ -271,17 +277,28 @@ PackageItem::fromAppData( const QString& fileName )
QDomElement componentNode = doc.documentElement();
if ( !componentNode.isNull() && componentNode.tagName() == "component" )
{
QString id = getChildText( componentNode, "id" );
// An "id" entry in the Calamares config overrides ID in the AppData
QString id = CalamaresUtils::getString( item_map, "id" );
if ( id.isEmpty() )
{
id = getChildText( componentNode, "id" );
}
if ( id.isEmpty() )
{
return PackageItem();
}
QString screenshotPath = getScreenshotPath( componentNode );
// A "screenshot" entry in the Calamares config overrides AppData
QString screenshotPath = CalamaresUtils::getString( item_map, "screenshot" );
if ( screenshotPath.isEmpty() )
{
screenshotPath = getScreenshotPath( componentNode );
}
QVariantMap map = getNameAndSummary( componentNode );
map.insert( "id", id );
map.insert( "screenshot", screenshotPath );
return PackageItem( map );
}