From 29894cec6ae2f21cafe849b940c2b87a5dff4018 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 13 Feb 2020 11:22:09 +0100
Subject: [PATCH] [partition] Convenience userVisibleFS()

 - Mark uses of filesystem-name where it's intentional that they
   are user-visible, with a new convenience function.
---
 src/modules/partition/core/KPMHelpers.h             | 12 ++++++++++++
 src/modules/partition/jobs/CreatePartitionJob.cpp   | 13 +++++++++----
 src/modules/partition/jobs/FillGlobalStorageJob.cpp |  5 +++--
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/modules/partition/core/KPMHelpers.h b/src/modules/partition/core/KPMHelpers.h
index 7ef9718ae..bb510cafb 100644
--- a/src/modules/partition/core/KPMHelpers.h
+++ b/src/modules/partition/core/KPMHelpers.h
@@ -127,6 +127,18 @@ untranslatedFS( FileSystem* fs )
     return fs ? untranslatedFS( *fs ) : QString();
 }
 
+static inline QString
+userVisibleFS( FileSystem& fs )
+{
+    return fs.name();
+}
+
+static inline QString
+userVisibleFS( FileSystem* fs )
+{
+    return fs ? userVisibleFS( *fs ) : QString();
+}
+
 }
 
 #endif /* KPMHELPERS_H */
diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp
index 9f8a01004..b59bffcdc 100644
--- a/src/modules/partition/jobs/CreatePartitionJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionJob.cpp
@@ -2,7 +2,7 @@
  *
  *   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
  *   Copyright 2015, Teo Mrnjavac <teo@kde.org>
- *   Copyright 2017, Adriaan de Groot <groot@kde.org>
+ *   Copyright 2017, 2020, Adriaan de Groot <groot@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
@@ -20,6 +20,8 @@
 
 #include "jobs/CreatePartitionJob.h"
 
+#include "core/KPMHelpers.h"
+
 #include "utils/Logger.h"
 #include "utils/Units.h"
 
@@ -32,6 +34,9 @@
 #include <kpmcore/ops/newoperation.h>
 #include <kpmcore/util/report.h>
 
+using KPMHelpers::untranslatedFS;
+using KPMHelpers::userVisibleFS;
+
 CreatePartitionJob::CreatePartitionJob( Device* device, Partition* partition )
     : PartitionJob( partition )
     , m_device( device )
@@ -42,7 +47,7 @@ QString
 CreatePartitionJob::prettyName() const
 {
     return tr( "Create new %2MiB partition on %4 (%3) with file system %1." )
-            .arg( m_partition->fileSystem().name() )
+            .arg( userVisibleFS( m_partition->fileSystem() )
             .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) )
             .arg( m_device->name() )
             .arg( m_device->deviceNode() );
@@ -54,7 +59,7 @@ CreatePartitionJob::prettyDescription() const
 {
     return tr( "Create new <strong>%2MiB</strong> partition on <strong>%4</strong> "
                "(%3) with file system <strong>%1</strong>." )
-            .arg( m_partition->fileSystem().name() )
+            .arg( userVisibleFS( m_partition->fileSystem() ) )
             .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() ) )
             .arg( m_device->name() )
             .arg( m_device->deviceNode() );
@@ -65,7 +70,7 @@ QString
 CreatePartitionJob::prettyStatusMessage() const
 {
     return tr( "Creating new %1 partition on %2." )
-            .arg( m_partition->fileSystem().name() )
+            .arg( userVisibleFS( m_partition->fileSystem() ) )
             .arg( m_device->deviceNode() );
 }
 
diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
index 7faa4b50f..12faaf969 100644
--- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp
+++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
@@ -42,6 +42,7 @@
 #include <QProcess>
 
 using KPMHelpers::untranslatedFS;
+using KPMHelpers::userVisibleFS;
 
 typedef QHash< QString, QString > UuidForPartitionHash;
 
@@ -91,7 +92,7 @@ mapForPartition( Partition* partition, const QString& uuid )
     QVariantMap map;
     map[ "device" ] = partition->partitionPath();
     map[ "mountPoint" ] = PartitionInfo::mountPoint( partition );
-    map[ "fsName" ] = partition->fileSystem().name();  // User-visible
+    map[ "fsName" ] = userVisibleFS( partition->fileSystem() );
     map[ "fs" ] = untranslatedFS( partition->fileSystem() );
     if ( partition->fileSystem().type() == FileSystem::Luks
          && dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS() )
@@ -106,7 +107,7 @@ mapForPartition( Partition* partition, const QString& uuid )
     using TR = Logger::DebugRow< const char* const, const QString& >;
     deb << Logger::SubEntry << "mapping for" << partition->partitionPath() << partition->deviceNode()
         << TR( "mtpoint:", PartitionInfo::mountPoint( partition ) ) << TR( "fs:", map[ "fs" ].toString() )
-        << TR( "fsname", map[ "fsName" ].toString() ) << TR( "uuid", uuid );
+        << TR( "fsName", map[ "fsName" ].toString() ) << TR( "uuid", uuid );
 
     if ( partition->roles().has( PartitionRole::Luks ) )
     {