napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] Apply current coding style to libcalamares/utils/

Browse Source 
- String.cpp needs special handling since part of it should
   remain unchanged, the formatting is "special" there.
This commit is contained in:
Adriaan de Groot 2019-08-04 21:22:54 +02:00
parent 29b9a21f59
commit b8a74657f4
20 changed files with 623 additions and 496 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/libcalamares/utils/CalamaresUtilsSystem.cpp
View File

@ -19,10 +19,10 @@
#include "CalamaresUtilsSystem.h"
#include "utils/Logger.h"
#include "GlobalStorage.h"
#include "JobQueue.h"
#include "Settings.h"
#include "utils/Logger.h"
#include <QCoreApplication>
#include <QDir>
@ -34,8 +34,8 @@
#endif
#ifdef Q_OS_FREEBSD
#include <sys/types.h>
#include <sys/sysctl.h>
#include <sys/types.h>
#endif
/** @brief When logging commands, don't log everything.
@ -63,12 +63,18 @@ operator<<( QDebug& s, const RedactedList& l )
{
for ( const auto& item : l.list )
if ( item.startsWith( "$6$" ) )
{
s << "<password>";
else
s << item;
}
else
{
s << item;
}
}
else
{
s << l.list;
}
return s;
}
@ -92,8 +98,7 @@ System::System( bool doChroot, QObject* parent )
}
System::~System()
{}
System::~System() {}
System*
@ -118,9 +123,13 @@ System::mount( const QString& devicePath,
if ( devicePath.isEmpty() || mountPoint.isEmpty() )
{
if ( devicePath.isEmpty() )
{
cWarning() << "Can't mount an empty device.";
}
if ( mountPoint.isEmpty() )
{
cWarning() << "Can't mount on an empty mountpoint.";
}
return static_cast< int >( ProcessResult::Code::NoWorkingDirectory );
}
@ -140,17 +149,20 @@ System::mount( const QString& devicePath,
QStringList args = { devicePath, mountPoint };
if ( !filesystemName.isEmpty() )
{
args << "-t" << filesystemName;
}
if ( !options.isEmpty() )
{
args << "-o" << options;
}
return QProcess::execute( program, args );
}
ProcessResult
System::runCommand(
System::RunLocation location,
System::runCommand( System::RunLocation location,
const QStringList& args,
const QString& workingPath,
const QString& stdInput,
@ -158,10 +170,10 @@ System::runCommand(
{
QString output;
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
Calamares::GlobalStorage* gs
= Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
if ( ( location == System::RunLocation::RunInTarget ) &&
( !gs || !gs->contains( "rootMountPoint" ) ) )
if ( ( location == System::RunLocation::RunInTarget ) && ( !gs || !gs->contains( "rootMountPoint" ) ) )
{
cWarning() << "No rootMountPoint in global storage";
return ProcessResult::Code::NoWorkingDirectory;
@ -197,7 +209,9 @@ System::runCommand(
if ( !workingPath.isEmpty() )
{
if ( QDir( workingPath ).exists() )
{
process.setWorkingDirectory( QDir( workingPath ).absolutePath() );
}
else
{
cWarning() << "Invalid working directory:" << workingPath;
@ -219,10 +233,10 @@ System::runCommand(
}
process.closeWriteChannel();
if ( !process.waitForFinished( timeoutSec > std::chrono::seconds::zero() ? ( std::chrono::milliseconds( timeoutSec ).count() ) : -1 ) )
if ( !process.waitForFinished(
timeoutSec > std::chrono::seconds::zero() ? ( std::chrono::milliseconds( timeoutSec ).count() ) : -1 ) )
{
cWarning().noquote().nospace() << "Timed out. Output so far:\n" <<
process.readAllStandardOutput();
cWarning().noquote().nospace() << "Timed out. Output so far:\n" << process.readAllStandardOutput();
return ProcessResult::Code::TimedOut;
}
@ -252,7 +266,8 @@ System::targetPath( const QString& path ) const
if ( doChroot() )
{
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
Calamares::GlobalStorage* gs
= Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
if ( !gs || !gs->contains( "rootMountPoint" ) )
{
@ -317,7 +332,9 @@ System::getTotalMemoryB() const
int r = sysinfo( &i );
if ( r )
{
return qMakePair( 0, 0.0 );
}
return qMakePair( quint64( i.mem_unit ) * quint64( i.totalram ), 1.1 );
#elif defined( Q_OS_FREEBSD )
@ -326,7 +343,9 @@ System::getTotalMemoryB() const
int r = sysctlbyname( "vm.kmem_size", &memsize, &s, NULL, 0 );
if ( r )
{
return qMakePair( 0, 0.0 );
}
return qMakePair( memsize, 1.01 );
#else
@ -376,40 +395,45 @@ ProcessResult::explainProcess( int ec, const QString& command, const QString& ou
using Calamares::JobResult;
if ( ec == 0 )
{
return JobResult::ok();
}
QString outputMessage = output.isEmpty()
? QCoreApplication::translate( "ProcessResult", "\nThere was no output from the command." )
: ( QCoreApplication::translate( "ProcessResult", "\nOutput:\n" ) + output );
if ( ec == static_cast< int >( ProcessResult::Code::Crashed ) ) //Crash!
return JobResult::error( QCoreApplication::translate( "ProcessResult", "External command crashed." ),
QCoreApplication::translate( "ProcessResult", "Command <i>%1</i> crashed." )
.arg( command )
return JobResult::error(
QCoreApplication::translate( "ProcessResult", "External command crashed." ),
QCoreApplication::translate( "ProcessResult", "Command <i>%1</i> crashed." ).arg( command )
+ outputMessage );
if ( ec == static_cast< int >( ProcessResult::Code::FailedToStart ) )
return JobResult::error( QCoreApplication::translate( "ProcessResult", "External command failed to start." ),
QCoreApplication::translate( "ProcessResult", "Command <i>%1</i> failed to start." )
.arg( command ) );
return JobResult::error(
QCoreApplication::translate( "ProcessResult", "External command failed to start." ),
QCoreApplication::translate( "ProcessResult", "Command <i>%1</i> failed to start." ).arg( command ) );
if ( ec == static_cast< int >( ProcessResult::Code::NoWorkingDirectory ) )
return JobResult::error( QCoreApplication::translate( "ProcessResult", "Internal error when starting command." ),
return JobResult::error(
QCoreApplication::translate( "ProcessResult", "Internal error when starting command." ),
QCoreApplication::translate( "ProcessResult", "Bad parameters for process job call." ) );
if ( ec == static_cast< int >( ProcessResult::Code::TimedOut ) )
return JobResult::error( QCoreApplication::translate( "ProcessResult", "External command failed to finish." ),
return JobResult::error(
QCoreApplication::translate( "ProcessResult", "External command failed to finish." ),
QCoreApplication::translate( "ProcessResult", "Command <i>%1</i> failed to finish in %2 seconds." )
.arg( command )
.arg( timeout.count() )
+ outputMessage );
//Any other exit code
return JobResult::error( QCoreApplication::translate( "ProcessResult", "External command finished with errors." ),
return JobResult::error(
QCoreApplication::translate( "ProcessResult", "External command finished with errors." ),
QCoreApplication::translate( "ProcessResult", "Command <i>%1</i> finished with exit code %2." )
.arg( command )
.arg( ec )
+ outputMessage );
}
} // namespace
} // namespace CalamaresUtils

33
src/libcalamares/utils/CalamaresUtilsSystem.h
View File

@ -43,8 +43,14 @@ public:
};
/** @brief Implicit one-argument constructor has no output, only a return code */
ProcessResult( Code r ) : QPair< int, QString >( static_cast<int>(r), QString() ) {}
ProcessResult( int r, QString s ) : QPair< int, QString >( r, s ) {}
ProcessResult( Code r )
: QPair< int, QString >( static_cast< int >( r ), QString() )
{
}
ProcessResult( int r, QString s )
: QPair< int, QString >( r, s )
{
}
int getExitCode() const { return first; }
QString getOutput() const { return second; }
@ -62,7 +68,8 @@ public:
* @param timeout Timeout passed to the process runner, for explaining
* error code -4 (timeout).
*/
static Calamares::JobResult explainProcess( int errorCode, const QString& command, const QString& output, std::chrono::seconds timeout );
static Calamares::JobResult
explainProcess( int errorCode, const QString& command, const QString& output, std::chrono::seconds timeout );
/// @brief Convenience wrapper for explainProcess()
inline Calamares::JobResult explainProcess( const QString& command, std::chrono::seconds timeout ) const
@ -116,7 +123,11 @@ public:
/** (Typed) Boolean describing where a particular command should be run,
* whether in the host (live) system or in the (chroot) target system.
*/
enum class RunLocation { RunInHost, RunInTarget };
enum class RunLocation
{
RunInHost,
RunInTarget
};
/**
* Runs the specified command in the chroot of the target system.
@ -135,8 +146,7 @@ public:
* NoWorkingDirectory = bad arguments
* TimedOut = QProcess timeout
*/
static DLLEXPORT ProcessResult runCommand(
RunLocation location,
static DLLEXPORT ProcessResult runCommand( RunLocation location,
const QStringList& args,
const QString& workingPath = QString(),
const QString& stdInput = QString(),
@ -147,18 +157,13 @@ public:
* doChroot(), which is what you usually want for running commands
* during installation.
*/
inline ProcessResult targetEnvCommand(
const QStringList &args,
inline ProcessResult targetEnvCommand( const QStringList& args,
const QString& workingPath = QString(),
const QString& stdInput = QString(),
std::chrono::seconds timeoutSec = std::chrono::seconds( 0 ) )
{
return runCommand(
m_doChroot ? RunLocation::RunInTarget : RunLocation::RunInHost,
args,
workingPath,
stdInput,
timeoutSec );
m_doChroot ? RunLocation::RunInTarget : RunLocation::RunInHost, args, workingPath, stdInput, timeoutSec );
}
/** @brief Convenience wrapper for targetEnvCommand() which returns only the exit code */
@ -279,6 +284,6 @@ private:
bool m_doChroot;
};
} // namespace
} // namespace CalamaresUtils
#endif

52
src/libcalamares/utils/CommandList.cpp
View File

@ -32,34 +32,44 @@
namespace CalamaresUtils
{
static CommandLine get_variant_object( const QVariantMap& m )
static CommandLine
get_variant_object( const QVariantMap& m )
{
QString command = CalamaresUtils::getString( m, "command" );
int timeout = CalamaresUtils::getInteger( m, "timeout", -1 );
if ( !command.isEmpty() )
{
return CommandLine( command, timeout >= 0 ? std::chrono::seconds( timeout ) : CommandLine::TimeoutNotSet() );
}
cWarning() << "Bad CommandLine element" << m;
return CommandLine();
}
static CommandList_t get_variant_stringlist( const QVariantList& l )
static CommandList_t
get_variant_stringlist( const QVariantList& l )
{
CommandList_t retl;
unsigned int count = 0;
for ( const auto& v : l )
{
if ( v.type() == QVariant::String )
{
retl.append( CommandLine( v.toString(), CommandLine::TimeoutNotSet() ) );
}
else if ( v.type() == QVariant::Map )
{
auto command( get_variant_object( v.toMap() ) );
if ( command.isValid() )
{
retl.append( command );
}
// Otherwise warning is already given
}
else
{
cWarning() << "Bad CommandList element" << count << v.type() << v;
}
++count;
}
return retl;
@ -78,37 +88,48 @@ CommandList::CommandList::CommandList( const QVariant& v, bool doChroot, std::ch
{
const auto v_list = v.toList();
if ( v_list.count() )
{
append( get_variant_stringlist( v_list ) );
}
else
{
cWarning() << "Empty CommandList";
}
}
else if ( v.type() == QVariant::String )
{
append( v.toString() );
}
else if ( v.type() == QVariant::Map )
{
auto c( get_variant_object( v.toMap() ) );
if ( c.isValid() )
{
append( c );
}
// Otherwise warning is already given
}
else
{
cWarning() << "CommandList does not understand variant" << v.type();
}
CommandList::~CommandList()
{
}
CommandList::~CommandList() {}
static inline bool
findInCommands( const CommandList& l, const QString& needle )
{
for ( CommandList::const_iterator i = l.cbegin(); i != l.cend(); ++i )
if ( i->command().contains( needle ) )
{
return true;
}
return false;
}
Calamares::JobResult CommandList::run()
Calamares::JobResult
CommandList::run()
{
QLatin1Literal rootMagic( "@@ROOT@@" );
QLatin1Literal userMagic( "@@USER@@" );
@ -125,8 +146,11 @@ Calamares::JobResult CommandList::run()
if ( !gs || !gs->contains( "rootMountPoint" ) )
{
cError() << "No rootMountPoint defined.";
return Calamares::JobResult::error( QCoreApplication::translate( "CommandList", "Could not run command." ),
QCoreApplication::translate( "CommandList", "The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined." ) );
return Calamares::JobResult::error(
QCoreApplication::translate( "CommandList", "Could not run command." ),
QCoreApplication::translate( "CommandList",
"The command runs in the host environment and needs to know the root "
"path, but no rootMountPoint is defined." ) );
}
root = gs->value( "rootMountPoint" ).toString();
}
@ -137,7 +161,8 @@ Calamares::JobResult CommandList::run()
cError() << "No username defined.";
return Calamares::JobResult::error(
QCoreApplication::translate( "CommandList", "Could not run command." ),
QCoreApplication::translate( "CommandList", "The command needs to know the user's name, but no username is defined." ) );
QCoreApplication::translate( "CommandList",
"The command needs to know the user's name, but no username is defined." ) );
}
QString user = gs->value( "username" ).toString(); // may be blank if unset
@ -156,17 +181,20 @@ Calamares::JobResult CommandList::run()
shell_cmd << processed_cmd;
std::chrono::seconds timeout = i->timeout() >= std::chrono::seconds::zero() ? i->timeout() : m_timeout;
ProcessResult r = System::runCommand(
location, shell_cmd, QString(), QString(), timeout );
ProcessResult r = System::runCommand( location, shell_cmd, QString(), QString(), timeout );
if ( r.getExitCode() != 0 )
{
if ( suppress_result )
{
cDebug() << "Error code" << r.getExitCode() << "ignored by CommandList configuration.";
}
else
{
return r.explainProcess( processed_cmd, timeout );
}
}
}
return Calamares::JobResult::ok();
}
@ -177,4 +205,4 @@ CommandList::append( const QString& s )
append( CommandLine( s, m_timeout ) );
}
} // namespace
} // namespace CalamaresUtils

28
src/libcalamares/utils/CommandList.h
View File

@ -53,20 +53,11 @@ struct CommandLine : public QPair< QString, std::chrono::seconds >
{
}
QString command() const
{
return first;
}
QString command() const { return first; }
std::chrono::seconds timeout() const
{
return second;
}
std::chrono::seconds timeout() const { return second; }
bool isValid() const
{
return !first.isEmpty();
}
bool isValid() const { return !first.isEmpty(); }
};
/** @brief Abbreviation, used internally. */
@ -88,19 +79,16 @@ public:
CommandList( const QVariant& v, bool doChroot = true, std::chrono::seconds timeout = std::chrono::seconds( 10 ) );
~CommandList();
bool doChroot() const
{
return m_doChroot;
}
bool doChroot() const { return m_doChroot; }
Calamares::JobResult run();
using CommandList_t::isEmpty;
using CommandList_t::count;
using CommandList_t::at;
using CommandList_t::cbegin;
using CommandList_t::cend;
using CommandList_t::const_iterator;
using CommandList_t::at;
using CommandList_t::count;
using CommandList_t::isEmpty;
protected:
using CommandList_t::append;
@ -111,5 +99,5 @@ private:
std::chrono::seconds m_timeout;
};
} // namespace
} // namespace CalamaresUtils
#endif

18
src/libcalamares/utils/Dirs.cpp
View File

@ -101,18 +101,26 @@ mungeEnvironment( QStringList& l, const char* name, const char* defaultDirs )
QStringList dirs = QString( qgetenv( name ) ).split( ':' );
if ( dirs.isEmpty() )
{
dirs = QString( defaultDirs ).split( ':' );
}
for ( auto s : dirs )
{
if ( s.isEmpty() )
{
continue;
}
if ( s.endsWith( '/' ) )
{
l << ( s + calamaresSubdir ) << s;
}
else
{
l << ( s + '/' + calamaresSubdir ) << ( s + '/' );
}
}
}
void
setXdgDirs()
@ -127,7 +135,9 @@ QStringList
extraConfigDirs()
{
if ( s_haveExtraDirs )
{
return s_extraConfigDirs;
}
return QStringList();
}
@ -135,7 +145,9 @@ QStringList
extraDataDirs()
{
if ( s_haveExtraDirs )
{
return s_extraDataDirs;
}
return QStringList();
}
@ -173,12 +185,16 @@ appLogDir()
QString path = QStandardPaths::writableLocation( QStandardPaths::CacheLocation );
QDir dir( path );
if ( isWritableDir( dir ) )
{
return dir;
}
cerr << "warning: Could not find a standard writable location for log dir, falling back to $HOME\n";
dir = QDir::home();
if ( isWritableDir( dir ) )
{
return dir;
}
cerr << "warning: Found no writable location for log dir, falling back to the temp dir\n";
return QDir::temp();
@ -191,4 +207,4 @@ setQmlModulesDir( const QDir& dir )
s_qmlModulesDir = dir;
}
} // namespace
} // namespace CalamaresUtils

2
src/libcalamares/utils/Dirs.h
View File

@ -68,6 +68,6 @@ namespace CalamaresUtils
DLLEXPORT QStringList extraConfigDirs();
/** @brief XDG_DATA_DIRS, each guaranteed to end with / */
DLLEXPORT QStringList extraDataDirs();
} // namespace
} // namespace CalamaresUtils
#endif

34
src/libcalamares/utils/Logger.cpp
View File

@ -20,8 +20,8 @@
#include "Logger.h"
#include <iostream>
#include <fstream>
#include <iostream>
#include <QCoreApplication>
#include <QDir>
@ -30,8 +30,8 @@
#include <QTime>
#include <QVariant>
#include "utils/Dirs.h"
#include "CalamaresVersion.h"
#include "utils/Dirs.h"
#define LOGFILE_SIZE 1024 * 256
@ -51,7 +51,9 @@ void
setupLogLevel( unsigned int level )
{
if ( level > LOGVERBOSE )
{
level = LOGVERBOSE;
}
s_threshold = level + 1; // Comparison is < in log() function
}
@ -77,11 +79,9 @@ log( const char* msg, unsigned int debugLevel )
// If we don't format the date as a Qt::ISODate then we get a crash when
// logging at exit as Qt tries to use QLocale to format, but QLocale is
// on its way out.
logfile << QDate::currentDate().toString( Qt::ISODate ).toUtf8().data()
<< " - "
<< QTime::currentTime().toString().toUtf8().data()
<< " [" << QString::number( debugLevel ).toUtf8().data() << "]: "
<< msg << std::endl;
logfile << QDate::currentDate().toString( Qt::ISODate ).toUtf8().data() << " - "
<< QTime::currentTime().toString().toUtf8().data() << " ["
<< QString::number( debugLevel ).toUtf8().data() << "]: " << msg << std::endl;
logfile.flush();
}
@ -90,9 +90,8 @@ log( const char* msg, unsigned int debugLevel )
{
QMutexLocker lock( &s_mutex );
std::cout << QTime::currentTime().toString().toUtf8().data()
<< " [" << QString::number( debugLevel ).toUtf8().data() << "]: "
<< msg << std::endl;
std::cout << QTime::currentTime().toString().toUtf8().data() << " ["
<< QString::number( debugLevel ).toUtf8().data() << "]: " << msg << std::endl;
std::cout.flush();
}
}
@ -164,7 +163,9 @@ setupLogfile()
QMutexLocker lock( &s_mutex );
logfile.open( logFile().toLocal8Bit(), std::ios::app );
if ( logfile.tellp() )
{
logfile << "\n\n" << std::endl;
}
logfile << "=== START CALAMARES " << CALAMARES_VERSION << std::endl;
}
@ -183,14 +184,13 @@ CLog::~CLog()
log( m_msg.toUtf8().data(), m_debugLevel );
}
CDebug::~CDebug()
{
}
CDebug::~CDebug() {}
const char Continuation[] = "\n ";
const char SubEntry[] = " .. ";
QString toString( const QVariant& v )
QString
toString( const QVariant& v )
{
auto t = v.type();
@ -199,11 +199,15 @@ QString toString( const QVariant& v )
QStringList s;
auto l = v.toList();
for ( auto lit = l.constBegin(); lit != l.constEnd(); ++lit )
{
s << lit->toString();
}
return s.join( ", " );
}
else
{
return v.toString();
}
}
} // namespace
} // namespace Logger

22
src/libcalamares/utils/Logger.h
View File

@ -55,13 +55,18 @@ namespace Logger
class DLLEXPORT CDebug : public CLog
{
public:
CDebug( unsigned int debugLevel = LOGDEBUG ) : CLog( debugLevel )
CDebug( unsigned int debugLevel = LOGDEBUG )
: CLog( debugLevel )
{
if ( debugLevel <= LOGERROR )
{
*this << "ERROR:";
}
else if ( debugLevel <= LOGWARNING )
{
*this << "WARNING:";
}
}
virtual ~CDebug();
};
@ -113,7 +118,8 @@ namespace Logger
explicit DebugRow( const T& t, const U& u )
: first( t )
, second( u )
{}
{
}
const T& first;
const U& second;
@ -132,7 +138,8 @@ namespace Logger
{
explicit DebugList( const QStringList& l )
: list( l )
{}
{
}
const QStringList& list;
};
@ -152,7 +159,8 @@ namespace Logger
public:
explicit DebugMap( const QVariantMap& m )
: map( m )
{}
{
}
const QVariantMap& map;
};
@ -171,7 +179,9 @@ namespace Logger
operator<<( QDebug& s, const DebugList& c )
{
for ( const auto& i : c.list )
{
s << Continuation << i;
}
return s;
}
@ -183,10 +193,12 @@ namespace Logger
operator<<( QDebug& s, const DebugMap& t )
{
for ( auto it = t.map.constBegin(); it != t.map.constEnd(); ++it )
{
s << Continuation << it.key().toUtf8().constData() << ':' << ' ' << toString( it.value() ).toUtf8().constData();
}
return s;
}
} // namespace
} // namespace Logger
#define cDebug Logger::CDebug
#define cWarning() Logger::CDebug( Logger::LOGWARNING )

13
src/libcalamares/utils/NamedEnum.h
View File

@ -31,9 +31,9 @@
#include <QString>
#include <vector>
#include <type_traits>
#include <initializer_list>
#include <type_traits>
#include <vector>
/** @brief Type for collecting parts of a named enum. */
template < typename T >
@ -53,7 +53,11 @@ struct NamedEnumTable
*
* static const NamedEnumTable<Colors> c{ {"red", Colors::Red } };
*/
NamedEnumTable( const std::initializer_list< pair_t >& v ) : table( v ) { /* static_assert( v.size() > 0 ); */ }
NamedEnumTable( const std::initializer_list< pair_t >& v )
: table( v )
{
/* static_assert( v.size() > 0 ); */
}
/** @brief Find a name @p s in the table.
*
@ -103,7 +107,8 @@ struct NamedEnumTable
/** @brief Smashes an enum value to its underlying type. */
template < typename E >
constexpr typename std::underlying_type<E>::type smash( const E e )
constexpr typename std::underlying_type< E >::type
smash( const E e )
{
return static_cast< typename std::underlying_type< E >::type >( e );
}

5
src/libcalamares/utils/PluginFactory_p.h
View File

@ -39,7 +39,8 @@ protected:
PluginFactoryPrivate()
: catalogInitialized( false )
, q_ptr( nullptr )
{}
{
}
~PluginFactoryPrivate() {}
QHash< QString, Plugin > createInstanceHash;
@ -49,6 +50,6 @@ protected:
PluginFactory* q_ptr;
};
} // namespace
} // namespace Calamares
#endif

31
src/libcalamares/utils/Retranslator.cpp
View File

@ -26,27 +26,30 @@
#include <QTranslator>
namespace CalamaresUtils {
namespace CalamaresUtils
{
static QTranslator* s_brandingTranslator = nullptr;
static QTranslator* s_translator = nullptr;
static QString s_translatorLocaleName;
void
installTranslator( const QLocale& locale,
const QString& brandingTranslationsPrefix,
QObject* parent )
installTranslator( const QLocale& locale, const QString& brandingTranslationsPrefix, QObject* parent )
{
QString localeName = locale.name();
localeName.replace( "-", "_" );
if ( localeName == "C" )
{
localeName = "en";
}
// Special case of sr@latin
//
// See top-level CMakeLists.txt about special cases for translation loading.
if ( locale.language() == QLocale::Language::Serbian && locale.script() == QLocale::Script::LatinScript )
{
localeName = QStringLiteral( "sr@latin" );
}
cDebug() << "Looking for translations for" << localeName;
@ -56,19 +59,14 @@ installTranslator( const QLocale& locale,
if ( !brandingTranslationsPrefix.isEmpty() )
{
QString brandingTranslationsDirPath( brandingTranslationsPrefix );
brandingTranslationsDirPath.truncate( brandingTranslationsPrefix.lastIndexOf(
QDir::separator() ) );
brandingTranslationsDirPath.truncate( brandingTranslationsPrefix.lastIndexOf( QDir::separator() ) );
QDir brandingTranslationsDir( brandingTranslationsDirPath );
if ( brandingTranslationsDir.exists() )
{
QString filenameBase( brandingTranslationsPrefix );
filenameBase.remove( 0, brandingTranslationsPrefix.lastIndexOf(
QDir::separator() ) + 1 );
filenameBase.remove( 0, brandingTranslationsPrefix.lastIndexOf( QDir::separator() ) + 1 );
translator = new QTranslator( parent );
if ( translator->load( locale,
filenameBase,
"_",
brandingTranslationsDir.absolutePath() ) )
if ( translator->load( locale, filenameBase, "_", brandingTranslationsDir.absolutePath() ) )
{
cDebug() << Logger::SubEntry << "Branding using locale:" << localeName;
}
@ -121,19 +119,22 @@ translatorLocaleName()
}
void
Retranslator::attachRetranslator( QObject* parent,
std::function< void ( void ) > retranslateFunc )
Retranslator::attachRetranslator( QObject* parent, std::function< void( void ) > retranslateFunc )
{
Retranslator* r = nullptr;
for ( QObject* child : parent->children() )
{
r = qobject_cast< Retranslator* >( child );
if ( r )
{
break;
}
}
if ( !r )
{
r = new Retranslator( parent );
}
r->m_retranslateFuncList.append( retranslateFunc );
retranslateFunc();
@ -155,9 +156,11 @@ Retranslator::eventFilter( QObject* obj, QEvent* e )
if ( e->type() == QEvent::LanguageChange )
{
foreach ( std::function< void() > func, m_retranslateFuncList )
{
func();
}
}
}
// pass the event on to the base
return QObject::eventFilter( obj, e );
}

12
src/libcalamares/utils/Retranslator.h
View File

@ -38,9 +38,7 @@ namespace CalamaresUtils
* @param brandingTranslationsPrefix the branding path prefix, from Calamares::Branding.
* @param parent the parent QObject.
*/
DLLEXPORT void installTranslator( const QLocale& locale,
const QString& brandingTranslationsPrefix,
QObject* parent );
DLLEXPORT void installTranslator( const QLocale& locale, const QString& brandingTranslationsPrefix, QObject* parent );
DLLEXPORT QString translatorLocaleName();
@ -48,8 +46,7 @@ class Retranslator : public QObject
{
Q_OBJECT
public:
static void attachRetranslator( QObject* parent,
std::function< void( void ) > retranslateFunc );
static void attachRetranslator( QObject* parent, std::function< void( void ) > retranslateFunc );
void addRetranslateFunc( std::function< void( void ) > retranslateFunc );
@ -63,10 +60,9 @@ private:
};
} // namespace
} // namespace CalamaresUtils
#define CALAMARES_RETRANSLATE(body) \
CalamaresUtils::Retranslator::attachRetranslator( this, [=] { body } );
#define CALAMARES_RETRANSLATE( body ) CalamaresUtils::Retranslator::attachRetranslator( this, [=] { body } );
#define CALAMARES_RETRANSLATE_WIDGET( widget, body ) \
CalamaresUtils::Retranslator::attachRetranslator( widget, [=] { body } );

8
src/libcalamares/utils/String.cpp
View File

@ -123,10 +123,10 @@ obscure( const QString& string )
for ( int i = 0; i < string.length(); ++i )
// yes, no typo. can't encode ' ' or '!' because
// they're the unicode BOM. stupid scrambling. stupid.
result += ( unicode[ i ].unicode() <= 0x21 ) ?
unicode[ i ] :
QChar( 0x1001F - unicode[ i ].unicode() );
{
result += ( unicode[ i ].unicode() <= 0x21 ) ? unicode[ i ] : QChar( 0x1001F - unicode[ i ].unicode() );
}
return result;
}
}
} // namespace CalamaresUtils

2
src/libcalamares/utils/String.h
View File

@ -48,6 +48,6 @@ namespace CalamaresUtils
* @return the obfuscated string.
*/
DLLEXPORT QString obscure( const QString& string );
} // namespace
} // namespace CalamaresUtils
#endif

34
src/libcalamares/utils/Units.h
View File

@ -43,59 +43,71 @@ constexpr qint64 operator ""_GiB( unsigned long long m )
return operator""_MiB(m)*1024;
}
constexpr qint64 KiBtoBytes( unsigned long long m )
constexpr qint64
KiBtoBytes( unsigned long long m )
{
return operator""_KiB( m );
}
constexpr qint64 MiBtoBytes( unsigned long long m )
constexpr qint64
MiBtoBytes( unsigned long long m )
{
return operator""_MiB( m );
}
constexpr qint64 GiBtoBytes( unsigned long long m )
constexpr qint64
GiBtoBytes( unsigned long long m )
{
return operator""_GiB( m );
}
constexpr qint64 KiBtoBytes( double m )
constexpr qint64
KiBtoBytes( double m )
{
return qint64( m * 1024 );
}
constexpr qint64 MiBtoBytes( double m )
constexpr qint64
MiBtoBytes( double m )
{
return qint64( m * 1024 * 1024 );
}
constexpr qint64 GiBtoBytes( double m )
constexpr qint64
GiBtoBytes( double m )
{
return qint64( m * 1024 * 1024 * 1024 );
}
constexpr int BytesToMiB( qint64 b )
constexpr int
BytesToMiB( qint64 b )
{
return int( b / 1024 / 1024 );
}
constexpr int BytesToGiB( qint64 b )
constexpr int
BytesToGiB( qint64 b )
{
return int( b / 1024 / 1024 / 1024 );
}
constexpr qint64 alignBytesToBlockSize( qint64 bytes, qint64 blocksize )
constexpr qint64
alignBytesToBlockSize( qint64 bytes, qint64 blocksize )
{
qint64 blocks = bytes / blocksize;
if ( blocks * blocksize != bytes )
{
++blocks;
}
return blocks * blocksize;
}
constexpr qint64 bytesToSectors( qint64 bytes, qint64 blocksize )
constexpr qint64
bytesToSectors( qint64 bytes, qint64 blocksize )
{
return alignBytesToBlockSize( alignBytesToBlockSize( bytes, blocksize ), MiBtoBytes( 1ULL ) ) / blocksize;
}
} // namespace
} // namespace CalamaresUtils
#endif

12
src/libcalamares/utils/Variant.cpp
View File

@ -39,8 +39,10 @@ getBool( const QVariantMap& map, const QString& key, bool d )
{
auto v = map.value( key );
if ( v.type() == QVariant::Bool )
{
result = v.toBool();
}
}
return result;
}
@ -52,8 +54,10 @@ getString(const QVariantMap& map, const QString& key)
{
auto v = map.value( key );
if ( v.type() == QVariant::String )
{
return v.toString();
}
}
return QString();
}
@ -65,8 +69,10 @@ getInteger( const QVariantMap& map, const QString& key, int d )
{
auto v = map.value( key );
if ( v.type() == QVariant::Int )
{
result = v.toInt();
}
}
return result;
}
@ -79,10 +85,14 @@ getDouble( const QVariantMap& map, const QString& key, double d )
{
auto v = map.value( key );
if ( v.type() == QVariant::Int )
{
result = v.toInt();
}
else if ( v.type() == QVariant::Double )
{
result = v.toDouble();
}
}
return result;
}
@ -104,4 +114,4 @@ getSubMap( const QVariantMap& map, const QString& key, bool& success )
return QVariantMap();
}
}
} // namespace CalamaresUtils

2
src/libcalamares/utils/Variant.h
View File

@ -57,6 +57,6 @@ namespace CalamaresUtils
* (e.g. if @p success is false).
*/
DLLEXPORT QVariantMap getSubMap( const QVariantMap& map, const QString& key, bool& success );
} // namespace
} // namespace CalamaresUtils
#endif

47
src/libcalamares/utils/Yaml.cpp
View File

@ -70,13 +70,21 @@ yamlScalarToVariant( const YAML::Node& scalarNode )
std::string stdScalar = scalarNode.as< std::string >();
QString scalarString = QString::fromStdString( stdScalar );
if ( _yamlScalarTrueValues.exactMatch( scalarString ) )
{
return QVariant( true );
}
if ( _yamlScalarFalseValues.exactMatch( scalarString ) )
{
return QVariant( false );
}
if ( QRegExp( "[-+]?\\d+" ).exactMatch( scalarString ) )
{
return QVariant( scalarString.toInt() );
}
if ( QRegExp( "[-+]?\\d*\\.?\\d+" ).exactMatch( scalarString ) )
{
return QVariant( scalarString.toDouble() );
}
return QVariant( scalarString );
}
@ -85,8 +93,7 @@ QVariant
yamlSequenceToVariant( const YAML::Node& sequenceNode )
{
QVariantList vl;
for ( YAML::const_iterator it = sequenceNode.begin();
it != sequenceNode.end(); ++it )
for ( YAML::const_iterator it = sequenceNode.begin(); it != sequenceNode.end(); ++it )
{
vl << yamlToVariant( *it );
}
@ -98,11 +105,9 @@ QVariant
yamlMapToVariant( const YAML::Node& mapNode )
{
QVariantMap vm;
for ( YAML::const_iterator it = mapNode.begin();
it != mapNode.end(); ++it )
for ( YAML::const_iterator it = mapNode.begin(); it != mapNode.end(); ++it )
{
vm.insert( QString::fromStdString( it->first.as< std::string >() ),
yamlToVariant( it->second ) );
vm.insert( QString::fromStdString( it->first.as< std::string >() ), yamlToVariant( it->second ) );
}
return vm;
}
@ -142,7 +147,9 @@ explainYamlException( const YAML::Exception& e, const QByteArray& yamlData )
linestart = yamlData.indexOf( '\n', linestart );
// No more \ns found, weird
if ( linestart < 0 )
{
break;
}
linestart += 1; // Skip that \n
}
int lineend = linestart;
@ -150,20 +157,27 @@ explainYamlException( const YAML::Exception& e, const QByteArray& yamlData )
{
lineend = yamlData.indexOf( '\n', linestart );
if ( lineend < 0 )
{
lineend = yamlData.length();
}
}
int rangestart = linestart;
int rangeend = lineend;
// Adjust range (linestart..lineend) so it's not too long
if ( ( linestart >= 0 ) && ( e.mark.column > 30 ) )
{
rangestart += ( e.mark.column - 30 );
}
if ( ( linestart >= 0 ) && ( rangeend - rangestart > 40 ) )
{
rangeend = rangestart + 40;
}
if ( linestart >= 0 )
{
cWarning() << "offending YAML data:" << yamlData.mid( rangestart, rangeend - rangestart ).constData();
}
}
}
@ -177,7 +191,9 @@ QVariantMap
loadYaml( const QString& filename, bool* ok )
{
if ( ok )
{
*ok = false;
}
QFile yamlFile( filename );
QVariant yamlContents;
@ -197,12 +213,12 @@ loadYaml(const QString& filename, bool* ok)
}
if ( yamlContents.isValid() &&
!yamlContents.isNull() &&
yamlContents.type() == QVariant::Map )
if ( yamlContents.isValid() && !yamlContents.isNull() && yamlContents.type() == QVariant::Map )
{
if ( ok )
{
*ok = true;
}
return yamlContents.toMap();
}
@ -214,8 +230,10 @@ static void
writeIndent( QFile& f, int indent )
{
while ( indent-- > 0 )
{
f.write( " " );
}
}
// forward declaration
static bool dumpYaml( QFile& f, const QVariantMap& map, int indent );
@ -229,7 +247,9 @@ static void
dumpYamlElement( QFile& f, const QVariant& value, int indent )
{
if ( value.type() == QVariant::Type::Bool )
{
f.write( value.toBool() ? "true" : "false" );
}
else if ( value.type() == QVariant::Type::String )
{
f.write( quote );
@ -256,8 +276,10 @@ dumpYamlElement( QFile& f, const QVariant& value, int indent )
dumpYamlElement( f, it, indent + 1 );
}
if ( !c ) // i.e. list was empty
{
f.write( "[]" );
}
}
else if ( value.type() == QVariant::Type::Map )
{
f.write( newline );
@ -293,12 +315,13 @@ saveYaml( const QString& filename, const QVariantMap& map )
{
QFile f( filename );
if ( !f.open( QFile::WriteOnly ) )
{
return false;
}
f.write( "# YAML dump\n---\n" );
return dumpYaml( f, map, 0 );
}
} // namespace
} // namespace CalamaresUtils

2
src/libcalamares/utils/Yaml.h
View File

@ -77,6 +77,6 @@ void explainYamlException( const YAML::Exception& e, const QByteArray& data, con
void explainYamlException( const YAML::Exception& e, const QByteArray& data, const QString& label );
void explainYamlException( const YAML::Exception& e, const QByteArray& data );
} // namespace
} // namespace CalamaresUtils
#endif