/***************************************************************************
- * 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 *
#include "util.h"
+#include <algorithm>
+#include <array>
+#include <utility>
+
#include <QCoreApplication>
+#include <QDateTime>
#include <QDebug>
-#include <QFile>
#include <QTextCodec>
+#include <QVector>
#include "quassel.h"
-class QMetaMethod;
-
// MIBenum values from http://www.iana.org/assignments/character-sets/character-sets.xml#table-character-sets-1
static QList<int> utf8DetectionBlacklist = QList<int>()
<< 39 /* ISO-2022-JP */;
-QString nickFromMask(QString mask)
+QString nickFromMask(const QString &mask)
{
- return mask.section('!', 0, 0);
+ return mask.left(mask.indexOf('!'));
}
-QString userFromMask(QString mask)
+QString userFromMask(const QString &mask)
{
- QString userhost = mask.section('!', 1);
- if (userhost.isEmpty()) return QString();
- return userhost.section('@', 0, 0);
+ const int offset = mask.indexOf('!') + 1;
+ if (offset <= 0)
+ return {};
+ const int length = mask.indexOf('@', offset) - offset;
+ return mask.mid(offset, length >= 0 ? length : -1);
}
-QString hostFromMask(QString mask)
+QString hostFromMask(const QString &mask)
{
- QString userhost = mask.section('!', 1);
- if (userhost.isEmpty()) return QString();
- return userhost.section('@', 1);
+ const int excl = mask.indexOf('!');
+ if (excl < 0)
+ return {};
+ const int offset = mask.indexOf('@', excl + 1) + 1;
+ return offset > 0 && offset < mask.size() ? mask.mid(offset) : QString{};
}
-bool isChannelName(QString str)
+bool isChannelName(const QString &str)
{
- return QString("#&!+").contains(str[0]);
+ if (str.isEmpty())
+ return false;
+ static constexpr std::array<quint8, 4> prefixes{{'#', '&', '!', '+'}};
+ return std::any_of(prefixes.cbegin(), prefixes.cend(), [&str](quint8 c) { return c == str[0]; });
}
-QString stripFormatCodes(QString str)
+QString stripFormatCodes(QString message)
{
- str.remove(QRegExp("\x03(\\d\\d?(,\\d\\d?)?)?"));
- str.remove('\x02');
- str.remove('\x0f');
- str.remove('\x12');
- str.remove('\x16');
- str.remove('\x1d');
- str.remove('\x1f');
- return str;
+ static QRegExp regEx{"\x03(\\d\\d?(,\\d\\d?)?)?|\x04([\\da-fA-F]{6}(,[\\da-fA-F]{6})?)?|[\x02\x0f\x11\x12\x16\x1d\x1e\x1f]"};
+ return message.remove(regEx);
}
QString secondsToString(int timeInSeconds)
{
- QList<QPair<int, QString> > timeUnit;
- timeUnit.append(qMakePair(365*24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "year")));
- timeUnit.append(qMakePair(24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "day")));
- timeUnit.append(qMakePair(60*60, QCoreApplication::translate("Quassel::secondsToString()", "h")));
- timeUnit.append(qMakePair(60, QCoreApplication::translate("Quassel::secondsToString()", "min")));
- timeUnit.append(qMakePair(1, QCoreApplication::translate("Quassel::secondsToString()", "sec")));
+ static QVector<std::pair<int, QString>> timeUnit {
+ std::make_pair(365*24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "year")),
+ std::make_pair(24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "day")),
+ std::make_pair(60*60, QCoreApplication::translate("Quassel::secondsToString()", "h")),
+ std::make_pair(60, QCoreApplication::translate("Quassel::secondsToString()", "min")),
+ std::make_pair(1, QCoreApplication::translate("Quassel::secondsToString()", "sec"))
+ };
if (timeInSeconds != 0) {
QStringList returnString;
return formattedStr;
}
+
+
+QString tryFormatUnixEpoch(const QString &possibleEpochDate, Qt::DateFormat dateFormat, bool useUTC)
+{
+ // Does the string resemble a Unix epoch? Parse as 64-bit time
+ qint64 secsSinceEpoch = possibleEpochDate.toLongLong();
+ if (secsSinceEpoch == 0) {
+ // Parsing either failed, or '0' was sent. No need to distinguish; either way, it's not
+ // useful as epoch.
+ // See https://doc.qt.io/qt-5/qstring.html#toLongLong
+ return possibleEpochDate;
+ }
+
+ // Time checks out, parse it
+ QDateTime date;
+#if QT_VERSION >= 0x050800
+ date.setSecsSinceEpoch(secsSinceEpoch);
+#else
+ // toSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for now.
+ // See https://doc.qt.io/qt-5/qdatetime.html#toMSecsSinceEpoch
+ date.setMSecsSinceEpoch(secsSinceEpoch * 1000);
+#endif
+
+ // Return the localized date/time
+ if (useUTC) {
+ // Return UTC time
+ if (dateFormat == Qt::DateFormat::ISODate) {
+ // Replace the "T" date/time separator with " " for readability. This isn't quite the
+ // ISO 8601 spec (it specifies omitting the "T" entirely), but RFC 3339 allows this.
+ // Go with RFC 3339 for human readability that's still machine-parseable, too.
+ //
+ // Before: 2018-06-21T21:35:52Z
+ // After: 2018-06-21 21:35:52Z
+ // ..........^ (10th character)
+ //
+ // See https://en.wikipedia.org/wiki/ISO_8601#cite_note-32
+ // And https://www.ietf.org/rfc/rfc3339.txt
+ return date.toUTC().toString(dateFormat).replace(10, 1, " ");
+ } else {
+ return date.toUTC().toString(dateFormat);
+ }
+ } else if (dateFormat == Qt::DateFormat::ISODate) {
+ // Add in ISO local timezone information via special handling below
+ // formatDateTimeToOffsetISO() handles converting "T" to " "
+ return formatDateTimeToOffsetISO(date);
+ } else {
+ // Return local time
+ return date.toString(dateFormat);
+ }
+}
+
+
+QString formatDateTimeToOffsetISO(const QDateTime &dateTime)
+{
+ if (!dateTime.isValid()) {
+ // Don't try to do anything with invalid date/time
+ return "formatDateTimeToISO() invalid date/time";
+ }
+
+ // Replace the "T" date/time separator with " " for readability. This isn't quite the ISO 8601
+ // spec (it specifies omitting the "T" entirely), but RFC 3339 allows this. Go with RFC 3339
+ // for human readability that's still machine-parseable, too.
+ //
+ // Before: 2018-08-22T18:43:10-05:00
+ // After: 2018-08-22 18:43:10-05:00
+ // ..........^ (10th character)
+ //
+ // See https://en.wikipedia.org/wiki/ISO_8601#cite_note-32
+ // And https://www.ietf.org/rfc/rfc3339.txt
+
+#if 0
+ // The expected way to get a UTC offset on ISO 8601 dates
+ // Remove the "T" date/time separator
+ return dateTime.toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate).replace(10, 1, " ");
+#else
+ // Work around Qt bug that converts to UTC instead of including timezone information
+ // See https://bugreports.qt.io/browse/QTBUG-26161
+ //
+ // NOTE: Despite the bug report marking as fixed in Qt 5.2.0 (QT_VERSION >= 0x050200), this
+ // still appears broken in Qt 5.5.1.
+ //
+ // Credit to "user362638" for the solution below, modified to fit Quassel's needs
+ // https://stackoverflow.com/questions/18750569/qdatetime-isodate-with-timezone
+
+ // Get the local and UTC time
+ QDateTime local = QDateTime(dateTime);
+ QDateTime utc = local.toUTC();
+ utc.setTimeSpec(Qt::LocalTime);
+
+ // Find the UTC offset
+ int utcOffset = utc.secsTo(local);
+
+ // Force the local time to follow this offset
+ local.setUtcOffset(utcOffset);
+ // Now the output should be correct
+ // Remove the "T" date/time separator
+ return local.toString(Qt::ISODate).replace(10, 1, " ");
+#endif
+}