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

[libcalamares] Simplify logging-manipulators

Browse Source 
Writing `Logger::NoQuote{}`` has annoyed me for a while, so
switch it to a constant, like SubEntry, so it looks more
like a regular manipulator object.
This commit is contained in:
Adriaan de Groot 2021-01-26 00:13:10 +01:00
parent 9a4c599e22
commit f0fd47eeb3
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -188,7 +188,7 @@ System::runCommand( System::RunLocation location,
: -1 ) ) : -1 ) )
{ {
cWarning() << "Process" << args.first() << "timed out after" << timeoutSec.count() << "s. Output so far:\n" cWarning() << "Process" << args.first() << "timed out after" << timeoutSec.count() << "s. Output so far:\n"
<< Logger::NoQuote {} << process.readAllStandardOutput(); << Logger::NoQuote << process.readAllStandardOutput();
return ProcessResult::Code::TimedOut; return ProcessResult::Code::TimedOut;
} }
@ -196,7 +196,7 @@ System::runCommand( System::RunLocation location,
if ( process.exitStatus() == QProcess::CrashExit ) if ( process.exitStatus() == QProcess::CrashExit )
{ {
cWarning() << "Process" << args.first() << "crashed. Output so far:\n" << Logger::NoQuote {} << output; cWarning() << "Process" << args.first() << "crashed. Output so far:\n" << Logger::NoQuote << output;
return ProcessResult::Code::Crashed; return ProcessResult::Code::Crashed;
} }
@ -206,7 +206,7 @@ System::runCommand( System::RunLocation location,
{ {
if ( showDebug && !output.isEmpty() ) if ( showDebug && !output.isEmpty() )
{ {
cDebug() << Logger::SubEntry << "Finished. Exit code:" << r << "output:\n" << Logger::NoQuote {} << output; cDebug() << Logger::SubEntry << "Finished. Exit code:" << r << "output:\n" << Logger::NoQuote << output;
} }
else else
{ {
@ -218,7 +218,7 @@ System::runCommand( System::RunLocation location,
if ( !output.isEmpty() ) if ( !output.isEmpty() )
{ {
cDebug() << Logger::SubEntry << "Target cmd:" << RedactedList( args ) << "Exit code:" << r << "output:\n" cDebug() << Logger::SubEntry << "Target cmd:" << RedactedList( args ) << "Exit code:" << r << "output:\n"
<< Logger::NoQuote {} << output; << Logger::NoQuote << output;
} }
else else
{ {

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

@ -207,6 +207,8 @@ constexpr FuncSuppressor::FuncSuppressor( const char s[] )
const constexpr FuncSuppressor Continuation( s_Continuation ); const constexpr FuncSuppressor Continuation( s_Continuation );
const constexpr FuncSuppressor SubEntry( s_SubEntry ); const constexpr FuncSuppressor SubEntry( s_SubEntry );
const constexpr NoQuote_t NoQuote {};
const constexpr Quote_t Quote {};
QString QString
toString( const QVariant& v ) toString( const QVariant& v )

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

@ -25,15 +25,17 @@ struct FuncSuppressor
const char* m_s; const char* m_s;
}; };
struct NoQuote struct NoQuote_t
{ {
}; };
struct Quote struct Quote_t
{ {
}; };
DLLEXPORT extern const FuncSuppressor Continuation; DLLEXPORT extern const FuncSuppressor Continuation;
DLLEXPORT extern const FuncSuppressor SubEntry; DLLEXPORT extern const FuncSuppressor SubEntry;
DLLEXPORT extern const NoQuote_t NoQuote;
DLLEXPORT extern const Quote_t Quote;
enum enum
{ {
@ -74,13 +76,13 @@ operator<<( QDebug& s, const FuncSuppressor& f )
} }
inline QDebug& inline QDebug&
operator<<( QDebug& s, const NoQuote& ) operator<<( QDebug& s, const NoQuote_t& )
{ {
return s.noquote().nospace(); return s.noquote().nospace();
} }
inline QDebug& inline QDebug&
operator<<( QDebug& s, const Quote& ) operator<<( QDebug& s, const Quote_t& )
{ {
return s.quote().space(); return s.quote().space();
} }
@ -254,7 +256,7 @@ operator<<( QDebug& s, const DebugMap& t )
inline QDebug& inline QDebug&
operator<<( QDebug& s, const Pointer& p ) operator<<( QDebug& s, const Pointer& p )
{ {
s << NoQuote {} << '@' << p.ptr << Quote {}; s << NoQuote << '@' << p.ptr << Quote;
return s; return s;
} }
} // namespace Logger } // namespace Logger

2
src/libcalamaresui/Branding.cpp
View File

@ -35,7 +35,7 @@
[[noreturn]] static void [[noreturn]] static void
bail( const QString& descriptorPath, const QString& message ) bail( const QString& descriptorPath, const QString& message )
{ {
cError() << "FATAL in" << descriptorPath << Logger::Continuation << Logger::NoQuote {} << message; cError() << "FATAL in" << descriptorPath << Logger::Continuation << Logger::NoQuote << message;
::exit( EXIT_FAILURE ); ::exit( EXIT_FAILURE );
} }

6
src/libcalamaresui/ViewManager.cpp
View File

@ -142,9 +142,9 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail
{ {
bool shouldOfferWebPaste = false; // TODO: config var bool shouldOfferWebPaste = false; // TODO: config var
cError() << "Installation failed:"; cError() << "Installation failed:" << message;
cDebug() << "- message:" << message; cDebug() << Logger::SubEntry << "- message:" << message;
cDebug() << "- details:" << details; cDebug() << Logger::SubEntry << "- details:" << Logger::NoQuote << details;
QString heading QString heading
= Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Failed" ) : tr( "Installation Failed" ); = Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Failed" ) : tr( "Installation Failed" );