From 738a6a9019eb900769e916a0176551135f231e7f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 20 May 2020 12:12:11 +0200
Subject: [PATCH] [calamares] Make module-tester configurable in slideshow mode

- Uses global storage to steer the jobs that are created, in case
  the slideshow needs to be tweaked by percentages or whatever.
- While here, add some code docs and apply coding style.
---
 src/calamares/testmain.cpp | 40 +++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index 5c3dd5c95..a29c8ce91 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -144,8 +144,9 @@ handle_args( QCoreApplication& a )
 class ExecViewJob : public Calamares::CppJob
 {
 public:
-    explicit ExecViewJob( const QString& name )
+    explicit ExecViewJob( const QString& name, unsigned long t = 3 )
         : m_name( name )
+        , m_delay( t )
     {
     }
     virtual ~ExecViewJob() override;
@@ -154,7 +155,7 @@ public:
 
     Calamares::JobResult exec() override
     {
-        QThread::sleep( 3 );
+        QThread::sleep( m_delay );
         return Calamares::JobResult::ok();
     }
 
@@ -162,6 +163,7 @@ public:
 
 private:
     QString m_name;
+    unsigned long m_delay;
 };
 
 ExecViewJob::~ExecViewJob() {}
@@ -194,9 +196,12 @@ protected:
 ExecViewModule::ExecViewModule()
     : Calamares::Module()
 {
+    // Normally the module-loader gives the module an instance key
+    // (out of the settings file, or the descriptor of the module).
+    // We don't have one, so build one -- this gives us "x@x".
     QVariantMap m;
     m.insert( "name", "x" );
-    Calamares::Module::initFrom(m, "x" );
+    Calamares::Module::initFrom( m, "x" );
 }
 
 ExecViewModule::~ExecViewModule() {}
@@ -212,7 +217,7 @@ ExecViewModule::loadSelf()
     auto* viewStep = new Calamares::ExecutionViewStep();
     viewStep->setModuleInstanceKey( instanceKey() );
     viewStep->setConfigurationMap( m_configurationMap );
-    viewStep->appendJobModuleInstanceKey( "x@x" );
+    viewStep->appendJobModuleInstanceKey( instanceKey().toString() );
     Calamares::ViewManager::instance()->addViewStep( viewStep );
     m_loaded = true;
 }
@@ -234,9 +239,34 @@ Calamares::JobList
 ExecViewModule::jobs() const
 {
     Calamares::JobList l;
+    const auto* gs = Calamares::JobQueue::instance()->globalStorage();
+    if ( gs && gs->contains( "jobs" ) )
+    {
+        QVariantList joblist = gs->value( "jobs" ).toList();
+        for ( const auto& jd : joblist )
+        {
+            QVariantMap jobdescription = jd.toMap();
+            if ( jobdescription.contains( "name" ) && jobdescription.contains( "delay" ) )
+            {
+                l.append( Calamares::job_ptr( new ExecViewJob( jobdescription.value( "name" ).toString(),
+                                                               jobdescription.value( "delay" ).toULongLong() ) ) );
+            }
+        }
+    }
+    if ( l.count() > 0 )
+    {
+        return l;
+    }
+
     l.append( Calamares::job_ptr( new ExecViewJob( QStringLiteral( "step 1" ) ) ) );
     l.append( Calamares::job_ptr( new ExecViewJob( QStringLiteral( "step two" ) ) ) );
-    l.append( Calamares::job_ptr( new ExecViewJob( QStringLiteral( "step III" ) ) ) );
+    l.append( Calamares::job_ptr( new ExecViewJob( QStringLiteral( "locking mutexes" ), 20 ) ) );
+    l.append( Calamares::job_ptr( new ExecViewJob( QStringLiteral( "unlocking mutexes" ), 1 ) ) );
+    for ( const QString& s : QStringList { "Harder", "Better", "Faster", "Stronger" } )
+    {
+        l.append( Calamares::job_ptr( new ExecViewJob( s, 0 ) ) );
+    }
+    l.append( Calamares::job_ptr( new ExecViewJob( QStringLiteral( "cleaning up" ), 20 ) ) );
     return l;
 }