Introduce FillGlobalStorageJob

src/modules/partition/CMakeLists.txt

@@ -28,6 +28,7 @@ calamares_add_plugin( partition
         DeletePartitionJob.cpp
         DeviceModel.cpp
         EditExistingPartitionDialog.cpp
+        FillGlobalStorageJob.cpp
         FormatPartitionJob.cpp
         PartitionCoreModule.cpp
         PartitionInfo.cpp

src/modules/partition/FillGlobalStorageJob.cpp

@@ -0,0 +1,65 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <FillGlobalStorageJob.h>
+
+#include <GlobalStorage.h>
+#include <JobQueue.h>
+#include <PartitionInfo.h>
+#include <PartitionIterator.h>
+
+// CalaPM
+#include <core/device.h>
+#include <core/partition.h>
+#include <fs/filesystem.h>
+
+FillGlobalStorageJob::FillGlobalStorageJob( QList< Device* > devices )
+    : m_devices( devices )
+{
+}
+
+QString
+FillGlobalStorageJob::prettyName() const
+{
+    return tr( "Set partition information" );
+}
+
+Calamares::JobResult
+FillGlobalStorageJob::exec()
+{
+    QVariantList lst;
+    for( auto device : m_devices )
+        for( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it)
+        {
+            QVariant var = mapForPartition( *it );
+            if ( var.isValid() )
+                lst << var;
+        }
+    Calamares::JobQueue::instance()->globalStorage()->insert( "partitions", lst );
+    return Calamares::JobResult::ok();
+}
+
+QVariant
+FillGlobalStorageJob::mapForPartition( Partition* partition )
+{
+    QVariantMap map;
+    map[ "device" ] = partition->partitionPath();
+    map[ "mountPoint" ] = PartitionInfo::mountPoint( partition );
+    map[ "fs" ] = partition->fileSystem().name();
+    return map;
+}

src/modules/partition/FillGlobalStorageJob.h

@@ -0,0 +1,47 @@
+/* === This file is part of Calamares - <http://github.com/calamares> ===
+ *
+ *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
+ *
+ *   Calamares is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Calamares is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef FILLGLOBALSTORAGEJOB_H
+#define FILLGLOBALSTORAGEJOB_H
+
+#include <Job.h>
+
+// Qt
+#include <QList>
+
+class Device;
+class Partition;
+
+/**
+ * Fills the "partitions" key of GlobalStorage. Doing it after partitioning
+ * makes it possible to access information such as the partition UUID.
+ */
+class FillGlobalStorageJob : public Calamares::Job
+{
+    Q_OBJECT
+public:
+    FillGlobalStorageJob( QList< Device* > devices );
+    QString prettyName() const override;
+    Calamares::JobResult exec() override;
+private:
+    QList< Device* > m_devices;
+
+    QVariant mapForPartition( Partition* );
+};
+
+#endif /* FILLGLOBALSTORAGEJOB_H */

src/modules/partition/PartitionCoreModule.cpp

@@ -21,6 +21,7 @@
 #include <CreatePartitionJob.h>
 #include <CreatePartitionTableJob.h>
 #include <DeletePartitionJob.h>
+#include <FillGlobalStorageJob.h>
 #include <FormatPartitionJob.h>
 #include <DeviceModel.h>
 #include <PartitionInfo.h>
@@ -218,8 +219,13 @@ PartitionCoreModule::jobs() const
     dumpQueue();
 
     QList< Calamares::job_ptr > lst;
+    QList< Device* > devices;
     for ( auto info : m_deviceInfos )
+    {
         lst << info->jobs;
+        devices << info->device.data();
+    }
+    lst << Calamares::job_ptr( new FillGlobalStorageJob( devices ) );
     return lst;
 }