andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

Changing prettyName for RAID devices with Resync/Recovery status.

This commit is contained in:
Caio Carvalho 2018-07-15 13:21:12 -03:00
parent f3fac7eac7
commit e761c131d0
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/raid/softwareraid.cpp
View File

@ -96,8 +96,12 @@ QString SoftwareRAID::prettyName() const
{
QString raidInfo;
if (status() != SoftwareRAID::Status::Inactive)
if (status() == SoftwareRAID::Status::Active)
raidInfo = xi18nc("@item:inlistbox [RAID level]", " [RAID %1]", raidLevel());
else if (status() == SoftwareRAID::Status::Recovery)
raidInfo = xi18nc("@item:inlistbox [RAID level - Recovering]", " [RAID %1 - Recovering]", raidLevel());
else if (status() == SoftwareRAID::Status::Resync)
raidInfo = xi18nc("@item:inlistbox [RAID level - Resyncing]", " [RAID %1 - Resyncing]", raidLevel());
else
raidInfo = QStringLiteral(" [RAID]");
@ -193,13 +197,12 @@ void SoftwareRAID::scanSoftwareRAID(QList<Device*>& devices)
SoftwareRAID* d = static_cast<SoftwareRAID *>(CoreBackendManager::self()->backend()->scanDevice(deviceNode));
if (scannedRaid.contains(d)) {
if (status == QStringLiteral("inactive"))
d->setStatus(SoftwareRAID::Status::Inactive);
}
else
if (!scannedRaid.contains(d))
scannedRaid << d;
if (status == QStringLiteral("inactive"))
d->setStatus(SoftwareRAID::Status::Inactive);
if (d->raidLevel() > 0) {
QRegularExpression reMirrorStatus(QStringLiteral("\\[[=>.]+\\]\\s+(resync|recovery)"));