From 140c0db7a48b89af9e7a6b4c36a7a0ee0ae9467c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 3 Aug 2019 23:51:00 +0200
Subject: [PATCH] [packagechooser] Set GlobalStorage packagechooser_<id>

---
 .../packagechooser/PackageChooserPage.cpp     | 21 +++++++++++++++++++
 .../packagechooser/PackageChooserPage.h       |  6 ++++++
 .../packagechooser/PackageChooserViewStep.cpp |  9 ++++++++
 src/modules/packagechooser/PackageModel.cpp   |  4 ++++
 src/modules/packagechooser/PackageModel.h     |  3 ++-
 .../packagechooser/packagechooser.conf        |  3 +++
 6 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index d267e4885..265ce3b53 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -98,3 +98,24 @@ PackageChooserPage::hasSelection() const
 {
     return ui && ui->products && ui->products->selectionModel() && ui->products->selectionModel()->hasSelection();
 }
+
+QStringList
+PackageChooserPage::selectedPackageIds() const
+{
+    if ( !( ui && ui->products && ui->products->selectionModel() ) )
+    {
+        return QStringList();
+    }
+
+    const auto* model = ui->products->model();
+    QStringList ids;
+    for ( const auto& index : ui->products->selectionModel()->selectedIndexes() )
+    {
+        QString pid = model->data( index, PackageListModel::IdRole ).toString();
+        if ( !pid.isEmpty() )
+        {
+            ids.append( pid );
+        }
+    }
+    return ids;
+}
diff --git a/src/modules/packagechooser/PackageChooserPage.h b/src/modules/packagechooser/PackageChooserPage.h
index 8f9fde11f..401de903b 100644
--- a/src/modules/packagechooser/PackageChooserPage.h
+++ b/src/modules/packagechooser/PackageChooserPage.h
@@ -37,7 +37,13 @@ public:
 
     void setModel( QAbstractItemModel* model );
 
+    /// @brief Is anything selected?
     bool hasSelection() const;
+    /** @brief Get the list of selected ids
+     *
+     * This list may be empty (if none is selected).
+     */
+    QStringList selectedPackageIds() const;
 
 public slots:
     void currentChanged( const QModelIndex& index );
diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index 9edfa9416..9d32884c7 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -137,6 +137,15 @@ PackageChooserViewStep::isAtEnd() const
 void
 PackageChooserViewStep::onLeave()
 {
+    QString key = QStringLiteral( "packagechooser_%1" ).arg( m_id );
+    QString value;
+    if ( m_widget->hasSelection() )
+    {
+        value = m_widget->selectedPackageIds().join( ',' );
+    }
+    Calamares::JobQueue::instance()->globalStorage()->insert( key, value );
+    
+    cDebug() << "PackageChooser" << key << "selected" << value;
 }
 
 Calamares::JobList
diff --git a/src/modules/packagechooser/PackageModel.cpp b/src/modules/packagechooser/PackageModel.cpp
index eb783259b..aa8dd39fc 100644
--- a/src/modules/packagechooser/PackageModel.cpp
+++ b/src/modules/packagechooser/PackageModel.cpp
@@ -128,6 +128,10 @@ PackageListModel::data( const QModelIndex& index, int role ) const
     {
         return m_packages[ row ].screenshot;
     }
+    else if ( role == IdRole )
+    {
+        return m_packages[ row ].id;
+    }
 
     return QVariant();
 }
diff --git a/src/modules/packagechooser/PackageModel.h b/src/modules/packagechooser/PackageModel.h
index dfb922e59..7f8fff8ec 100644
--- a/src/modules/packagechooser/PackageModel.h
+++ b/src/modules/packagechooser/PackageModel.h
@@ -84,7 +84,8 @@ public:
     {
         NameRole = Qt::DisplayRole,
         DescriptionRole = Qt::UserRole,
-        ScreenshotRole
+        ScreenshotRole,
+        IdRole
     };
 
 private:
diff --git a/src/modules/packagechooser/packagechooser.conf b/src/modules/packagechooser/packagechooser.conf
index fd100ab27..b4e48c995 100644
--- a/src/modules/packagechooser/packagechooser.conf
+++ b/src/modules/packagechooser/packagechooser.conf
@@ -7,6 +7,9 @@
 # If there is just one packagechooser module, and no *id* is set,
 # resulting GS key is probably *packagechooser_packagechooser*.
 #
+# The GS value is a comma-separated list of the IDs of the selected
+# packages, or an empty string if none is selected.
+#
 # id: ""
 
 # Software selection mode, to set whether the software packages