Add objects() method to the Job

sailfishos · Nov 22, 2018 · 12bb39b · 12bb39b
1 parent b8d96da
commit 12bb39b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/udisks2job.cpp b/src/udisks2job.cpp
@@ -58,8 +58,7 @@ UDisks2::Job::Job(const QString &path, const QVariantMap &data, QObject *parent)
     }
 
     connect(Monitor::instance(), &Monitor::errorMessage, this, [this](const QString &objectPath, const QString &errorName) {
-        QStringList objects = value(UDISKS2_JOB_KEY_OBJECTS).toStringList();
-        if (objects.contains(objectPath) && errorName == UDISKS2_ERROR_DEVICE_BUSY) {
+        if (objects().contains(objectPath) && errorName == UDISKS2_ERROR_DEVICE_BUSY) {
             m_message = errorName;
             if (!isCompleted() && deviceBusy()) {
                 updateCompleted(false, m_message);
@@ -100,6 +99,11 @@ bool UDisks2::Job::deviceBusy() const
     return m_message == UDISKS2_ERROR_TARGET_BUSY || m_message == UDISKS2_ERROR_DEVICE_BUSY;
 }
 
+QStringList UDisks2::Job::objects() const
+{
+    return value(UDISKS2_JOB_KEY_OBJECTS).toStringList();
+}
+
 QString UDisks2::Job::path() const
 {
     return m_path;

diff --git a/src/udisks2job_p.h b/src/udisks2job_p.h
@@ -68,6 +68,8 @@ class Job : public QObject
     QString message() const;
     bool deviceBusy() const;
 
+    QStringList objects() const;
+
     QString path() const;
     QVariant value(const QString &key) const;
 

diff --git a/src/udisks2monitor.cpp b/src/udisks2monitor.cpp
@@ -369,7 +369,7 @@ void UDisks2::Monitor::updatePartitionStatus(const UDisks2::Job *job, bool succe
 {
     UDisks2::Job::Operation operation = job->operation();
     PartitionManagerPrivate::Partitions affectedPartitions;
-    lookupPartitions(affectedPartitions, job->value(UDISKS2_JOB_KEY_OBJECTS).toStringList());
+    lookupPartitions(affectedPartitions, job->objects());
     if (operation == UDisks2::Job::Lock || operation == UDisks2::Job::Unlock) {
         for (auto partition : affectedPartitions) {
             Partition::Status oldStatus = partition->status;