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

[netinstall] Apply coding style

Browse Source
This commit is contained in:
Adriaan de Groot 2020-02-18 11:02:53 +01:00
parent 7c2a196568
commit 17eb3f5e33
6 changed files with 167 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/modules/netinstall/NetInstallViewStep.cpp
View File

@ -20,15 +20,15 @@
#include "NetInstallViewStep.h"
#include "JobQueue.h"
#include "GlobalStorage.h"
#include "JobQueue.h"
#include "utils/Logger.h"
#include "utils/Variant.h"
#include "NetInstallPage.h"
CALAMARES_PLUGIN_FACTORY_DEFINITION( NetInstallViewStepFactory, registerPlugin<NetInstallViewStep>(); )
CALAMARES_PLUGIN_FACTORY_DEFINITION( NetInstallViewStepFactory, registerPlugin< NetInstallViewStep >(); )
NetInstallViewStep::NetInstallViewStep( QObject* parent )
: Calamares::ViewStep( parent )
@ -36,15 +36,16 @@ NetInstallViewStep::NetInstallViewStep( QObject* parent )
, m_nextEnabled( false )
{
emit nextStatusChanged( true );
connect( m_widget, &NetInstallPage::checkReady,
this, &NetInstallViewStep::nextIsReady );
connect( m_widget, &NetInstallPage::checkReady, this, &NetInstallViewStep::nextIsReady );
}
NetInstallViewStep::~NetInstallViewStep()
{
if ( m_widget && m_widget->parent() == nullptr )
{
m_widget->deleteLater();
}
}
@ -131,28 +132,32 @@ NetInstallViewStep::onLeave()
// with the more complicated datastructure.
if ( !package.preScript.isEmpty() || !package.postScript.isEmpty() )
{
QMap<QString, QVariant> sdetails;
QMap< QString, QVariant > sdetails;
sdetails.insert( "pre-script", package.preScript );
sdetails.insert( "package", package.packageName );
sdetails.insert( "post-script", package.postScript );
details = sdetails;
}
if ( package.isCritical )
{
installPackages.append( details );
}
else
{
tryInstallPackages.append( details );
}
}
if ( !installPackages.empty() )
{
QMap<QString, QVariant> op;
QMap< QString, QVariant > op;
op.insert( "install", QVariant( installPackages ) );
packageOperations.append( op );
cDebug() << Logger::SubEntry << installPackages.length() << "critical packages.";
}
if ( !tryInstallPackages.empty() )
{
QMap<QString, QVariant> op;
QMap< QString, QVariant > op;
op.insert( "try_install", QVariant( tryInstallPackages ) );
packageOperations.append( op );
cDebug() << Logger::SubEntry << tryInstallPackages.length() << "non-critical packages.";

2
src/modules/netinstall/NetInstallViewStep.h
View File

@ -70,4 +70,4 @@ private:
CALAMARES_PLUGIN_FACTORY_DECLARATION( NetInstallViewStepFactory )
#endif // NETINSTALLVIEWSTEP_H
#endif // NETINSTALLVIEWSTEP_H

151
src/modules/netinstall/PackageModel.cpp
View File

@ -21,9 +21,9 @@
#include "utils/Yaml.h"
PackageModel::PackageModel( const YAML::Node& data, QObject* parent ) :
QAbstractItemModel( parent ),
m_columnHeadings()
PackageModel::PackageModel( const YAML::Node& data, QObject* parent )
: QAbstractItemModel( parent )
, m_columnHeadings()
{
m_rootItem = new PackageTreeItem();
setupModelData( data, m_rootItem );
@ -38,33 +38,47 @@ QModelIndex
PackageModel::index( int row, int column, const QModelIndex& parent ) const
{
if ( !hasIndex( row, column, parent ) )
{
return QModelIndex();
}
PackageTreeItem* parentItem;
if ( !parent.isValid() )
{
parentItem = m_rootItem;
}
else
parentItem = static_cast<PackageTreeItem*>( parent.internalPointer() );
{
parentItem = static_cast< PackageTreeItem* >( parent.internalPointer() );
}
PackageTreeItem* childItem = parentItem->child( row );
if ( childItem )
{
return createIndex( row, column, childItem );
}
else
{
return QModelIndex();
}
}
QModelIndex
PackageModel::parent( const QModelIndex& index ) const
{
if ( !index.isValid() )
{
return QModelIndex();
}
PackageTreeItem* child = static_cast<PackageTreeItem*>( index.internalPointer() );
PackageTreeItem* child = static_cast< PackageTreeItem* >( index.internalPointer() );
PackageTreeItem* parent = child->parentItem();
if ( parent == m_rootItem )
{
return QModelIndex();
}
return createIndex( parent->row(), 0, parent );
}
@ -72,13 +86,19 @@ int
PackageModel::rowCount( const QModelIndex& parent ) const
{
if ( parent.column() > 0 )
{
return 0;
}
PackageTreeItem* parentItem;
if ( !parent.isValid() )
{
parentItem = m_rootItem;
}
else
parentItem = static_cast<PackageTreeItem*>( parent.internalPointer() );
{
parentItem = static_cast< PackageTreeItem* >( parent.internalPointer() );
}
return parentItem->childCount();
}
@ -87,7 +107,9 @@ int
PackageModel::columnCount( const QModelIndex& parent ) const
{
if ( parent.isValid() )
return static_cast<PackageTreeItem*>( parent.internalPointer() )->columnCount();
{
return static_cast< PackageTreeItem* >( parent.internalPointer() )->columnCount();
}
return m_rootItem->columnCount();
}
@ -95,17 +117,25 @@ QVariant
PackageModel::data( const QModelIndex& index, int role ) const
{
if ( !index.isValid() )
{
return QVariant();
}
PackageTreeItem* item = static_cast<PackageTreeItem*>( index.internalPointer() );
PackageTreeItem* item = static_cast< PackageTreeItem* >( index.internalPointer() );
if ( index.column() == 0 && role == Qt::CheckStateRole )
{
return item->isSelected();
}
if ( item->isHidden() && role == Qt::DisplayRole ) // Hidden group
if ( item->isHidden() && role == Qt::DisplayRole ) // Hidden group
{
return QVariant();
}
if ( role == Qt::DisplayRole )
{
return item->data( index.column() );
}
return QVariant();
}
@ -114,27 +144,31 @@ PackageModel::setData( const QModelIndex& index, const QVariant& value, int role
{
if ( role == Qt::CheckStateRole && index.isValid() )
{
PackageTreeItem* item = static_cast<PackageTreeItem*>( index.internalPointer() );
item->setSelected( static_cast<Qt::CheckState>( value.toInt() ) );
PackageTreeItem* item = static_cast< PackageTreeItem* >( index.internalPointer() );
item->setSelected( static_cast< Qt::CheckState >( value.toInt() ) );
emit dataChanged( this->index( 0, 0 ), index.sibling( index.column(), index.row() + 1 ),
QVector<int>( Qt::CheckStateRole ) );
emit dataChanged( this->index( 0, 0 ),
index.sibling( index.column(), index.row() + 1 ),
QVector< int >( Qt::CheckStateRole ) );
}
return true;
}
bool
PackageModel::setHeaderData( int section, Qt::Orientation orientation,
const QVariant& value, int role )
PackageModel::setHeaderData( int section, Qt::Orientation orientation, const QVariant& value, int role )
{
Q_UNUSED( role )
if ( orientation == Qt::Horizontal )
{
if ( m_columnHeadings.value( section ) != QVariant() )
{
m_columnHeadings.replace( section, value );
}
else
{
m_columnHeadings.insert( section, value );
}
emit headerDataChanged( orientation, section, section );
}
return true;
@ -144,9 +178,13 @@ Qt::ItemFlags
PackageModel::flags( const QModelIndex& index ) const
{
if ( !index.isValid() )
{
return Qt::ItemFlags();
}
if ( index.column() == 0 )
{
return Qt::ItemIsUserCheckable | QAbstractItemModel::flags( index );
}
return QAbstractItemModel::flags( index );
}
@ -154,46 +192,55 @@ QVariant
PackageModel::headerData( int section, Qt::Orientation orientation, int role ) const
{
if ( orientation == Qt::Horizontal && role == Qt::DisplayRole )
{
return m_columnHeadings.value( section );
}
return QVariant();
}
QList<PackageTreeItem::ItemData>
QList< PackageTreeItem::ItemData >
PackageModel::getPackages() const
{
QList<PackageTreeItem*> items = getItemPackages( m_rootItem );
QList< PackageTreeItem* > items = getItemPackages( m_rootItem );
for ( auto package : m_hiddenItems )
if ( package->hiddenSelected() )
{
items.append( getItemPackages( package ) );
QList<PackageTreeItem::ItemData> packages;
}
QList< PackageTreeItem::ItemData > packages;
for ( auto item : items )
{
PackageTreeItem::ItemData itemData;
itemData.preScript = item->parentItem()->preScript(); // Only groups have hooks
itemData.packageName = item->packageName(); // this seg faults
itemData.postScript = item->parentItem()->postScript(); // Only groups have hooks
itemData.isCritical = item->parentItem()->isCritical(); // Only groups are critical
itemData.preScript = item->parentItem()->preScript(); // Only groups have hooks
itemData.packageName = item->packageName(); // this seg faults
itemData.postScript = item->parentItem()->postScript(); // Only groups have hooks
itemData.isCritical = item->parentItem()->isCritical(); // Only groups are critical
packages.append( itemData );
}
return packages;
}
QList<PackageTreeItem*>
QList< PackageTreeItem* >
PackageModel::getItemPackages( PackageTreeItem* item ) const
{
QList<PackageTreeItem*> selectedPackages;
QList< PackageTreeItem* > selectedPackages;
for ( int i = 0; i < item->childCount(); i++ )
{
if ( item->child( i )->isSelected() == Qt::Unchecked )
{
continue;
}
if ( !item->child( i )->childCount() ) // package
if ( !item->child( i )->childCount() ) // package
{
selectedPackages.append( item->child( i ) );
}
else
{
selectedPackages.append( getItemPackages( item->child( i ) ) );
}
}
return selectedPackages;
}
void
@ -203,49 +250,49 @@ PackageModel::setupModelData( const YAML::Node& data, PackageTreeItem* parent )
{
const YAML::Node itemDefinition = *it;
QString name(
tr( CalamaresUtils::yamlToVariant( itemDefinition["name"] ).toByteArray() ) );
QString description(
tr( CalamaresUtils::yamlToVariant( itemDefinition["description"] ).toByteArray() ) );
QString name( tr( CalamaresUtils::yamlToVariant( itemDefinition[ "name" ] ).toByteArray() ) );
QString description( tr( CalamaresUtils::yamlToVariant( itemDefinition[ "description" ] ).toByteArray() ) );
PackageTreeItem::ItemData itemData;
itemData.name = name;
itemData.description = description;
if ( itemDefinition["pre-install"] )
itemData.preScript =
CalamaresUtils::yamlToVariant( itemDefinition["pre-install"] ).toString();
if ( itemDefinition["post-install"] )
itemData.postScript =
CalamaresUtils::yamlToVariant( itemDefinition["post-install"] ).toString();
if ( itemDefinition[ "pre-install" ] )
itemData.preScript = CalamaresUtils::yamlToVariant( itemDefinition[ "pre-install" ] ).toString();
if ( itemDefinition[ "post-install" ] )
itemData.postScript = CalamaresUtils::yamlToVariant( itemDefinition[ "post-install" ] ).toString();
PackageTreeItem* item = new PackageTreeItem( itemData, parent );
if ( itemDefinition["selected"] )
item->setSelected(
CalamaresUtils::yamlToVariant( itemDefinition["selected"] ).toBool() ?
Qt::Checked : Qt::Unchecked );
if ( itemDefinition[ "selected" ] )
item->setSelected( CalamaresUtils::yamlToVariant( itemDefinition[ "selected" ] ).toBool() ? Qt::Checked
: Qt::Unchecked );
else
item->setSelected( parent->isSelected() ); // Inherit from it's parent
{
item->setSelected( parent->isSelected() ); // Inherit from it's parent
}
if ( itemDefinition["hidden"] )
item->setHidden(
CalamaresUtils::yamlToVariant( itemDefinition["hidden"] ).toBool() );
if ( itemDefinition[ "hidden" ] )
item->setHidden( CalamaresUtils::yamlToVariant( itemDefinition[ "hidden" ] ).toBool() );
if ( itemDefinition["critical"] )
item->setCritical(
CalamaresUtils::yamlToVariant( itemDefinition["critical"] ).toBool() );
if ( itemDefinition[ "critical" ] )
item->setCritical( CalamaresUtils::yamlToVariant( itemDefinition[ "critical" ] ).toBool() );
if ( itemDefinition["packages"] )
for ( YAML::const_iterator packageIt = itemDefinition["packages"].begin();
packageIt != itemDefinition["packages"].end(); ++packageIt )
if ( itemDefinition[ "packages" ] )
for ( YAML::const_iterator packageIt = itemDefinition[ "packages" ].begin();
packageIt != itemDefinition[ "packages" ].end();
++packageIt )
item->appendChild(
new PackageTreeItem( CalamaresUtils::yamlToVariant( *packageIt ).toString(), item ) );
if ( itemDefinition["subgroups"] )
setupModelData( itemDefinition["subgroups"], item );
if ( itemDefinition[ "subgroups" ] )
{
setupModelData( itemDefinition[ "subgroups" ], item );
}
if ( item->isHidden() )
{
m_hiddenItems.append( item );
}
else
{
item->setCheckable( true );

21
src/modules/netinstall/PackageModel.h
View File

@ -29,7 +29,7 @@
namespace YAML
{
class Node;
class Node;
}
class PackageModel : public QAbstractItemModel
@ -43,27 +43,24 @@ public:
~PackageModel() override;
QVariant data( const QModelIndex& index, int role ) const override;
bool setData( const QModelIndex& index, const QVariant& value,
int role = Qt::EditRole ) override;
bool setHeaderData( int section, Qt::Orientation orientation,
const QVariant& value, int role = Qt::EditRole ) override;
bool setData( const QModelIndex& index, const QVariant& value, int role = Qt::EditRole ) override;
bool
setHeaderData( int section, Qt::Orientation orientation, const QVariant& value, int role = Qt::EditRole ) override;
Qt::ItemFlags flags( const QModelIndex& index ) const override;
QVariant headerData( int section, Qt::Orientation orientation,
int role = Qt::DisplayRole ) const override;
QModelIndex index( int row, int column,
const QModelIndex& parent = QModelIndex() ) const override;
QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const override;
QModelIndex index( int row, int column, const QModelIndex& parent = QModelIndex() ) const override;
QModelIndex parent( const QModelIndex& index ) const override;
int rowCount( const QModelIndex& parent = QModelIndex() ) const override;
int columnCount( const QModelIndex& parent = QModelIndex() ) const override;
PackageItemDataList getPackages() const;
QList<PackageTreeItem*> getItemPackages( PackageTreeItem* item ) const;
QList< PackageTreeItem* > getItemPackages( PackageTreeItem* item ) const;
private:
void setupModelData( const YAML::Node& data, PackageTreeItem* parent );
PackageTreeItem* m_rootItem;
QList<PackageTreeItem*> m_hiddenItems;
QList< PackageTreeItem* > m_hiddenItems;
QVariantList m_columnHeadings;
};
#endif // PACKAGEMODEL_H
#endif // PACKAGEMODEL_H

55
src/modules/netinstall/PackageTreeItem.cpp
View File

@ -24,25 +24,30 @@
PackageTreeItem::PackageTreeItem( const ItemData& data, PackageTreeItem* parent )
: m_parentItem( parent )
, m_data( data )
{ }
{
}
PackageTreeItem::PackageTreeItem( const QString packageName, PackageTreeItem* parent ) :
m_parentItem( parent )
PackageTreeItem::PackageTreeItem( const QString packageName, PackageTreeItem* parent )
: m_parentItem( parent )
{
m_data.packageName = packageName;
if ( parent != nullptr )
{
m_data.selected = parent->isSelected();
}
else
{
m_data.selected = Qt::Unchecked;
}
}
PackageTreeItem::PackageTreeItem( PackageTreeItem* parent ) :
m_parentItem( parent )
PackageTreeItem::PackageTreeItem( PackageTreeItem* parent )
: m_parentItem( parent )
{
}
PackageTreeItem::PackageTreeItem::PackageTreeItem() :
PackageTreeItem( QString(), nullptr )
PackageTreeItem::PackageTreeItem::PackageTreeItem()
: PackageTreeItem( QString(), nullptr )
{
m_data.selected = Qt::Checked;
m_data.name = QLatin1String( "<root>" );
@ -75,7 +80,9 @@ int
PackageTreeItem::row() const
{
if ( m_parentItem )
return m_parentItem->m_childItems.indexOf( const_cast<PackageTreeItem*>( this ) );
{
return m_parentItem->m_childItems.indexOf( const_cast< PackageTreeItem* >( this ) );
}
return 0;
}
@ -88,13 +95,15 @@ PackageTreeItem::columnCount() const
QVariant
PackageTreeItem::data( int column ) const
{
if ( packageName() != nullptr ) // package
if ( packageName() != nullptr ) // package
{
if ( !column )
{
return QVariant( packageName() );
}
return QVariant();
}
switch ( column ) // group
switch ( column ) // group
{
case 0:
return QVariant( prettyName() );
@ -164,14 +173,18 @@ bool
PackageTreeItem::hiddenSelected() const
{
Q_ASSERT( m_data.isHidden );
if (! m_data.selected )
if ( !m_data.selected )
{
return false;
}
const PackageTreeItem* currentItem = parentItem();
while ( currentItem != nullptr )
{
if ( !currentItem->isHidden() )
{
return currentItem->isSelected() != Qt::Unchecked;
}
currentItem = currentItem->parentItem();
}
@ -202,8 +215,10 @@ void
PackageTreeItem::setSelected( Qt::CheckState isSelected )
{
if ( parentItem() == nullptr )
// This is the root, it is always checked so don't change state
// This is the root, it is always checked so don't change state
{
return;
}
m_data.selected = isSelected;
setChildrenSelected( isSelected );
@ -216,8 +231,10 @@ PackageTreeItem::setSelected( Qt::CheckState isSelected )
currentItem = currentItem->parentItem();
}
if ( currentItem == nullptr )
// Reached the root .. don't bother
// Reached the root .. don't bother
{
return;
}
// Figure out checked-state based on the children
int childrenSelected = 0;
@ -225,16 +242,26 @@ PackageTreeItem::setSelected( Qt::CheckState isSelected )
for ( int i = 0; i < currentItem->childCount(); i++ )
{
if ( currentItem->child( i )->isSelected() == Qt::Checked )
{
childrenSelected++;
}
if ( currentItem->child( i )->isSelected() == Qt::PartiallyChecked )
{
childrenPartiallySelected++;
}
}
if ( !childrenSelected && !childrenPartiallySelected)
if ( !childrenSelected && !childrenPartiallySelected )
{
currentItem->setSelected( Qt::Unchecked );
}
else if ( childrenSelected == currentItem->childCount() )
{
currentItem->setSelected( Qt::Checked );
}
else
{
currentItem->setSelected( Qt::PartiallyChecked );
}
}
void

9
src/modules/netinstall/PackageTreeItem.h
View File

@ -21,8 +21,8 @@
#define PACKAGETREEITEM_H
#include <QList>
#include <QVariant>
#include <QStandardItem>
#include <QVariant>
class PackageTreeItem : public QStandardItem
{
@ -78,11 +78,12 @@ public:
void setSelected( Qt::CheckState isSelected );
void setChildrenSelected( Qt::CheckState isSelected );
int type() const override;
private:
PackageTreeItem* m_parentItem;
QList<PackageTreeItem*> m_childItems;
QList< PackageTreeItem* > m_childItems;
ItemData m_data;
const int m_columns = 2; // Name, description
const int m_columns = 2; // Name, description
};
#endif // PACKAGETREEITEM_H
#endif // PACKAGETREEITEM_H