#include "quassel.h"
+#include <algorithm>
#include <iostream>
+
#include <signal.h>
#if !defined Q_OS_WIN && !defined Q_OS_MAC
# include <sys/types.h>
instance()->setupEnvironment();
instance()->registerMetaTypes();
- Network::setDefaultCodecForServer("ISO-8859-1");
+ Network::setDefaultCodecForServer("UTF-8");
Network::setDefaultCodecForEncoding("UTF-8");
Network::setDefaultCodecForDecoding("ISO-8859-15");
return false;
}
- // set up logging
- if (Quassel::runMode() != Quassel::ClientOnly) {
- if (isOptionSet("loglevel")) {
- QString level = optionValue("loglevel");
-
- if (level == "Debug")
- setLogLevel(DebugLevel);
- else if (level == "Info")
- setLogLevel(InfoLevel);
- else if (level == "Warning")
- setLogLevel(WarningLevel);
- else if (level == "Error")
- setLogLevel(ErrorLevel);
- else {
- qWarning() << qPrintable(tr("Invalid log level %1; supported are Debug|Info|Warning|Error").arg(level));
- return false;
- }
+ // Set up logging
+ if (isOptionSet("loglevel")) {
+ QString level = optionValue("loglevel").toLower();
+
+ if (level == "debug")
+ setLogLevel(DebugLevel);
+ else if (level == "info")
+ setLogLevel(InfoLevel);
+ else if (level == "warning")
+ setLogLevel(WarningLevel);
+ else if (level == "error")
+ setLogLevel(ErrorLevel);
+ else {
+ qWarning() << qPrintable(tr("Invalid log level %1; supported are Debug|Info|Warning|Error").arg(level));
+ return false;
}
+ }
- QString logfilename = optionValue("logfile");
- if (!logfilename.isEmpty()) {
- instance()->_logFile.reset(new QFile{logfilename});
- if (!logFile()->open(QIODevice::Append | QIODevice::Text)) {
- qWarning() << "Could not open log file" << logfilename << ":" << logFile()->errorString();
- instance()->_logFile.reset();
- }
+ QString logfilename = optionValue("logfile");
+ if (!logfilename.isEmpty()) {
+ instance()->_logFile.reset(new QFile{logfilename});
+ if (!logFile()->open(QIODevice::Append | QIODevice::Text)) {
+ qWarning() << qPrintable(tr("Could not open log file \"%1\": %2").arg(logfilename, logFile()->errorString()));
+ instance()->_logFile.reset();
}
+ }
#ifdef HAVE_SYSLOG
- instance()->_logToSyslog = isOptionSet("syslog");
+ instance()->_logToSyslog = isOptionSet("syslog");
+#endif
+
+#if QT_VERSION < 0x050000
+ qInstallMsgHandler(Logger::logMessage);
+#else
+ qInstallMessageHandler(Logger::logMessage);
#endif
- }
return true;
}
// Check if we got a commit hash
if (!QString(GIT_HEAD).isEmpty()) {
buildInfo.commitHash = GIT_HEAD;
- QDateTime date;
- date.setTime_t(GIT_COMMIT_DATE);
- buildInfo.commitDate = date.toString();
+ // Set to Unix epoch, wrapped as a string for backwards-compatibility
+ buildInfo.commitDate = QString::number(GIT_COMMIT_DATE);
}
else if (!QString(DIST_HASH).contains("Format")) {
buildInfo.commitHash = DIST_HASH;
+ // Leave as Unix epoch if set as Unix epoch, but don't force this for
+ // backwards-compatibility with existing packaging/release tools that might set strings.
buildInfo.commitDate = QString(DIST_DATE);
}
#endif /* Q_OS_MAC */
}
+ path = QFileInfo{path}.absoluteFilePath();
+
if (!path.endsWith(QDir::separator()) && !path.endsWith('/'))
path += QDir::separator();
}
instance()->_configDirPath = path;
-
return path;
}
QStringList Quassel::Features::toStringList(bool enabled) const
{
+ // Check if any feature is enabled
+ if (!enabled && std::all_of(_features.cbegin(), _features.cend(), [](bool feature) { return !feature; })) {
+ return QStringList{} << "NoFeatures";
+ }
+
QStringList result;
+
// TODO Qt5: Use QMetaEnum::fromType()
auto featureEnum = Quassel::staticMetaObject.enumerator(Quassel::staticMetaObject.indexOfEnumerator("Feature"));
for (quint32 i = 0; i < _features.size(); ++i) {