Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb47352' into 'master'
[nemo-systemsettings] Expose symlink from UDisks2 block. Contributes to JB#47352

See merge request mer-core/nemo-qml-plugin-systemsettings!121
  • Loading branch information
rainemak committed Oct 7, 2019
2 parents 955f077 + 093edef commit 19a8d7e
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 0 deletions.
26 changes: 26 additions & 0 deletions src/udisks2block.cpp
Expand Up @@ -294,6 +294,32 @@ QString UDisks2::Block::idUUID() const
return value(QStringLiteral("IdUUID")).toString();
}

QStringList UDisks2::Block::symlinks() const
{
QStringList links;
QVariant variantListBytes = value(QStringLiteral("Symlinks"));

if (variantListBytes.canConvert<QVariantList>()) {
QSequentialIterable iterable = variantListBytes.value<QSequentialIterable>();

for (const QVariant &a : iterable) {
QByteArray symlinkBytes;

if (a.canConvert<QVariantList>()) {
QSequentialIterable i = a.value<QSequentialIterable>();
for (const QVariant &variantByte : i) {
symlinkBytes.append(variantByte.toChar());
}
}

if (!symlinkBytes.isEmpty())
links << QString::fromLocal8Bit(symlinkBytes);
}
}

return links;
}

QString UDisks2::Block::mountPath() const
{
return m_mountPath;
Expand Down
2 changes: 2 additions & 0 deletions src/udisks2block_p.h
Expand Up @@ -100,6 +100,8 @@ class SYSTEMSETTINGS_EXPORT Block : public QObject
QString idLabel() const;
QString idUUID() const;

QStringList symlinks() const;

QString mountPath() const;

QVariant value(const QString &key) const;
Expand Down

0 comments on commit 19a8d7e

Please sign in to comment.