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

Add generic search function to iterate over partitions for convenience.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-05-22 18:14:53 +02:00
parent 04f977d28f
commit 94e9c659d1
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/partition/core/PMUtils.cpp
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> === /* === This file is part of Calamares - <http://github.com/calamares> ===
* *
* Copyright 2014, Aurélien Gâteau <agateau@kde.org> * Copyright 2014, Aurélien Gâteau <agateau@kde.org>
* Copyright 2015, Teo Mrnjavac <teo@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -29,13 +30,15 @@ namespace PMUtils
{ {
bool isPartitionFreeSpace( Partition* partition ) bool
isPartitionFreeSpace( Partition* partition )
{ {
return partition->roles().has( PartitionRole::Unallocated ); return partition->roles().has( PartitionRole::Unallocated );
} }
bool isPartitionNew( Partition* partition ) bool
isPartitionNew( Partition* partition )
{ {
return partition->state() == Partition::StateNew; return partition->state() == Partition::StateNew;
} }
@ -63,6 +66,19 @@ findPartitionByPath( const QList< Device* >& devices, const QString& path )
} }
QList< Partition* >
findPartitions( const QList< Device* >& devices,
std::function< bool ( Partition* ) > criterionFunction )
{
QList< Partition* > results;
for ( auto device : devices )
for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it )
if ( criterionFunction( *it ) )
results.append( *it );
return results;
}
Partition* Partition*
createNewPartition( PartitionNode* parent, const Device& device, const PartitionRole& role, FileSystem::Type fsType, qint64 firstSector, qint64 lastSector ) createNewPartition( PartitionNode* parent, const Device& device, const PartitionRole& role, FileSystem::Type fsType, qint64 firstSector, qint64 lastSector )
{ {

10
src/modules/partition/core/PMUtils.h
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <http://github.com/calamares> === /* === This file is part of Calamares - <http://github.com/calamares> ===
* *
* Copyright 2014, Aurélien Gâteau <agateau@kde.org> * Copyright 2014, Aurélien Gâteau <agateau@kde.org>
* Copyright 2015, Teo Mrnjavac <teo@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -24,6 +25,8 @@
// Qt // Qt
#include <QList> #include <QList>
#include <functional>
class Device; class Device;
class Partition; class Partition;
class PartitionNode; class PartitionNode;
@ -55,6 +58,13 @@ Partition* findPartitionByMountPoint( const QList< Device* >& devices, const QSt
*/ */
Partition* findPartitionByPath( const QList< Device* >& devices, const QString& path ); Partition* findPartitionByPath( const QList< Device* >& devices, const QString& path );
/**
* Iterates on all devices and partitions and returns a list of pointers to the Partition
* objects that satisfy the conditions defined in the criterion function.
*/
QList< Partition* > findPartitions( const QList< Device* >& devices,
std::function< bool ( Partition* ) > criterionFunction );
/** /**
* Helper function to create a new Partition object (does not create anything * Helper function to create a new Partition object (does not create anything
* on the disk) associated with a FileSystem. * on the disk) associated with a FileSystem.