X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fquassel.cpp;h=5ceddb101eef6c8d48e9bf23bb8430fa19d5d753;hb=17fb652189fe89b446e672505cc8b0138f79e8b8;hp=16b8887ddf8b4ddc194f49e86b1c7024acebb3b0;hpb=b5dfd31e3d1ad7ca4bfe8262b62be259f6dc786a;p=quassel.git diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp index 16b8887d..5ceddb10 100644 --- a/src/common/quassel.cpp +++ b/src/common/quassel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,7 +20,9 @@ #include "quassel.h" +#include #include + #include #if !defined Q_OS_WIN && !defined Q_OS_MAC # include @@ -34,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -41,6 +44,7 @@ #include "bufferinfo.h" #include "identity.h" #include "logger.h" +#include "logmessage.h" #include "message.h" #include "network.h" #include "peer.h" @@ -58,7 +62,19 @@ Quassel *Quassel::instance() Quassel::Quassel() + : _logger{new Logger{this}} { +} + + +bool Quassel::init() +{ + if (instance()->_initialized) + return true; // allow multiple invocations because of MonolithicApplication + + // Setup signal handling + // TODO: Don't use unsafe methods, see handleSignal() + // We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel. signal(SIGTERM, handleSignal); signal(SIGINT, handleSignal); @@ -67,13 +83,6 @@ Quassel::Quassel() // Windows does not support SIGHUP signal(SIGHUP, handleSignal); #endif -} - - -bool Quassel::init() -{ - if (instance()->_initialized) - return true; // allow multiple invocations because of MonolithicApplication if (instance()->_handleCrashes) { // we have crashhandler for win32 and unix (based on execinfo). @@ -85,12 +94,12 @@ bool Quassel::init() if (rc == -1 || !((long)limit->rlim_cur > 0 || limit->rlim_cur == RLIM_INFINITY)) { # endif /* Q_OS_WIN */ - signal(SIGABRT, handleSignal); - signal(SIGSEGV, handleSignal); + signal(SIGABRT, handleSignal); + signal(SIGSEGV, handleSignal); # ifndef Q_OS_WIN - signal(SIGBUS, handleSignal); - } - free(limit); + signal(SIGBUS, handleSignal); + } + free(limit); # endif /* Q_OS_WIN */ #endif /* Q_OS_WIN || HAVE_EXECINFO */ } @@ -101,7 +110,7 @@ bool Quassel::init() instance()->setupEnvironment(); instance()->registerMetaTypes(); - Network::setDefaultCodecForServer("ISO-8859-1"); + Network::setDefaultCodecForServer("UTF-8"); Network::setDefaultCodecForEncoding("UTF-8"); Network::setDefaultCodecForDecoding("ISO-8859-15"); @@ -115,48 +124,19 @@ bool Quassel::init() 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; - } - } + // Don't keep a debug log on the core + return instance()->logger()->setup(runMode() != RunMode::CoreOnly); +} - 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(); - } - } -#ifdef HAVE_SYSLOG - instance()->_logToSyslog = isOptionSet("syslog"); -#endif - } - return true; +void Quassel::destroy() +{ } -void Quassel::destroy() +Logger *Quassel::logger() const { - if (logFile()) { - logFile()->close(); - instance()->_logFile.reset(); - } + return _logger; } @@ -292,12 +272,13 @@ void Quassel::setupBuildInfo() // 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); } @@ -348,6 +329,8 @@ const Quassel::BuildInfo &Quassel::buildInfo() //! Signal handler for graceful shutdown. +//! @todo: Ensure this doesn't use unsafe methods (it does currently) +//! cf. QSocketNotifier, UnixSignalWatcher void Quassel::handleSignal(int sig) { switch (sig) { @@ -415,58 +398,6 @@ bool Quassel::isOptionSet(const QString &key) } -Quassel::LogLevel Quassel::logLevel() -{ - return instance()->_logLevel; -} - - -void Quassel::setLogLevel(LogLevel logLevel) -{ - instance()->_logLevel = logLevel; -} - - -QFile *Quassel::logFile() { - return instance()->_logFile.get(); -} - - -bool Quassel::logToSyslog() -{ - return instance()->_logToSyslog; -} - - -void Quassel::logFatalMessage(const char *msg) -{ -#ifdef Q_OS_MAC - Q_UNUSED(msg) -#else - QFile dumpFile(instance()->coreDumpFileName()); - dumpFile.open(QIODevice::Append); - QTextStream dumpStream(&dumpFile); - - dumpStream << "Fatal: " << msg << '\n'; - dumpStream.flush(); - dumpFile.close(); -#endif -} - - -Quassel::Features Quassel::features() -{ - Features feats = 0; - for (int i = 1; i <= NumFeatures; i <<= 1) - feats |= (Feature)i; - - // Disable DCC until it is ready - feats &= ~Feature::DccFileTransfer; - - return feats; -} - - const QString &Quassel::coreDumpFileName() { if (_coreDumpFileName.isEmpty()) { @@ -515,6 +446,8 @@ QString Quassel::configDirPath() #endif /* Q_OS_MAC */ } + path = QFileInfo{path}.absoluteFilePath(); + if (!path.endsWith(QDir::separator()) && !path.endsWith('/')) path += QDir::separator(); @@ -527,7 +460,6 @@ QString Quassel::configDirPath() } instance()->_configDirPath = path; - return path; } @@ -678,3 +610,99 @@ void Quassel::loadTranslation(const QLocale &locale) quasselTranslator->load(QString("%1").arg(locale.name()), translationDirPath()); #endif } + + +// ---- Quassel::Features --------------------------------------------------------------------------------------------- + +Quassel::Features::Features() +{ + QStringList features; + + // TODO Qt5: Use QMetaEnum::fromType() + auto featureEnum = Quassel::staticMetaObject.enumerator(Quassel::staticMetaObject.indexOfEnumerator("Feature")); + _features.resize(featureEnum.keyCount(), true); // enable all known features to true +} + + +Quassel::Features::Features(const QStringList &features, LegacyFeatures legacyFeatures) +{ + // TODO Qt5: Use QMetaEnum::fromType() + auto featureEnum = Quassel::staticMetaObject.enumerator(Quassel::staticMetaObject.indexOfEnumerator("Feature")); + _features.resize(featureEnum.keyCount(), false); + + for (auto &&feature : features) { + int i = featureEnum.keyToValue(qPrintable(feature)); + if (i >= 0) { + _features[i] = true; + } + else { + _unknownFeatures << feature; + } + } + + if (legacyFeatures) { + // TODO Qt5: Use QMetaEnum::fromType() + auto legacyFeatureEnum = Quassel::staticMetaObject.enumerator(Quassel::staticMetaObject.indexOfEnumerator("LegacyFeature")); + for (quint32 mask = 0x0001; mask <= 0x8000; mask <<=1) { + if (static_cast(legacyFeatures) & mask) { + int i = featureEnum.keyToValue(legacyFeatureEnum.valueToKey(mask)); + if (i >= 0) { + _features[i] = true; + } + } + } + } +} + + +bool Quassel::Features::isEnabled(Feature feature) const +{ + size_t i = static_cast(feature); + return i < _features.size() ? _features[i] : false; +} + + +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) { + if (_features[i] == enabled) { + result << featureEnum.key(i); + } + } + return result; +} + + +Quassel::LegacyFeatures Quassel::Features::toLegacyFeatures() const +{ + // TODO Qt5: Use LegacyFeatures (flag operators for enum classes not supported in Qt4) + quint32 result{0}; + // TODO Qt5: Use QMetaEnum::fromType() + auto featureEnum = Quassel::staticMetaObject.enumerator(Quassel::staticMetaObject.indexOfEnumerator("Feature")); + auto legacyFeatureEnum = Quassel::staticMetaObject.enumerator(Quassel::staticMetaObject.indexOfEnumerator("LegacyFeature")); + + for (quint32 i = 0; i < _features.size(); ++i) { + if (_features[i]) { + int v = legacyFeatureEnum.keyToValue(featureEnum.key(i)); + if (v >= 0) { + result |= v; + } + } + } + return static_cast(result); +} + + +QStringList Quassel::Features::unknownFeatures() const +{ + return _unknownFeatures; +}