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

Merge pull request #238 from tctara/master

Browse Source 
Implement free-space partition replace install
This commit is contained in:
Teo Mrnjavac 2016-03-18 11:40:54 +01:00
commit 750e33bcb8
2 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/partition/core/PartUtils.cpp
View File

@ -37,9 +37,6 @@ namespace PartUtils
bool bool
canBeReplaced( Partition* candidate ) canBeReplaced( Partition* candidate )
{ {
if ( KPMHelpers::isPartitionFreeSpace( candidate ) )
return false;
bool ok = false; bool ok = false;
double requiredStorageGB = Calamares::JobQueue::instance() double requiredStorageGB = Calamares::JobQueue::instance()
->globalStorage() ->globalStorage()

57
src/modules/partition/gui/ChoicePage.cpp
View File

@ -579,22 +579,49 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current,
m_core->revertDevice( selectedDevice() ); m_core->revertDevice( selectedDevice() );
} }
// TODO: get the selected partition in the immutable model with PartitionPtrRole, // if the partition is unallocated(free space), we don't replace it but create new one
// check KPMHelpers::isPartitionFreeSpace, if true then don't replace but // with the same first and last sector
// just m_core->createPartition for the same first/last sector as the Partition* selectedPartition = (Partition *)( current.data( PartitionModel::PartitionPtrRole ).value< void* >() );
// free space "partition" in the immutable model. if ( KPMHelpers::isPartitionFreeSpace( selectedPartition ) )
// Also set parent correctly (see PartitionActions::doReplacePartition) {
// as well as mount point and format. PartitionRole newRoles = PartitionRole( PartitionRole::Primary );
PartitionNode* newParent = selectedDevice()->partitionTable();
// We can't use the PartitionPtrRole because we need to make changes to the if ( selectedPartition->parent() )
// main DeviceModel, not the immutable copy. {
QString partPath = current.data( PartitionModel::PartitionPathRole ).toString(); Partition* parent = dynamic_cast< Partition* >( selectedPartition->parent() );
Partition* partition = KPMHelpers::findPartitionByPath( { selectedDevice() }, if ( parent && parent->roles().has( PartitionRole::Extended ) )
partPath ); {
if ( partition ) newRoles = PartitionRole( PartitionRole::Logical );
PartitionActions::doReplacePartition( m_core, newParent = KPMHelpers::findPartitionByPath( { selectedDevice() }, parent->partitionPath() );
selectedDevice(), }
partition ); }
Partition* newPartition = KPMHelpers::createNewPartition(
newParent,
*selectedDevice(),
newRoles,
FileSystem::Ext4,
selectedPartition->firstSector(),
selectedPartition->lastSector() );
PartitionInfo::setMountPoint( newPartition, "/" );
PartitionInfo::setFormat( newPartition, true );
m_core->createPartition( selectedDevice(), newPartition);
}
else
{
// We can't use the PartitionPtrRole because we need to make changes to the
// main DeviceModel, not the immutable copy.
QString partPath = current.data( PartitionModel::PartitionPathRole ).toString();
selectedPartition = KPMHelpers::findPartitionByPath( { selectedDevice() },
partPath );
if ( selectedPartition )
PartitionActions::doReplacePartition( m_core,
selectedDevice(),
selectedPartition );
}
} ), } ),
[=] [=]
{ {