#include "quassel.h"
// 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 */;
+static QList<int> utf8DetectionBlacklist = QList<int>() << 39 /* ISO-2022-JP */;
-QString nickFromMask(const QString &mask)
+QString nickFromMask(const QString& mask)
{
return mask.left(mask.indexOf('!'));
}
-
-QString userFromMask(const QString &mask)
+QString userFromMask(const QString& mask)
{
const int offset = mask.indexOf('!') + 1;
if (offset <= 0)
return mask.mid(offset, length >= 0 ? length : -1);
}
-
-QString hostFromMask(const QString &mask)
+QString hostFromMask(const QString& mask)
{
const int excl = mask.indexOf('!');
if (excl < 0)
return offset > 0 && offset < mask.size() ? mask.mid(offset) : QString{};
}
-
-bool isChannelName(const QString &str)
+bool isChannelName(const QString& str)
{
if (str.isEmpty())
return false;
return std::any_of(prefixes.cbegin(), prefixes.cend(), [&str](quint8 c) { return c == str[0]; });
}
-
QString stripFormatCodes(QString message)
{
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 stripAcceleratorMarkers(const QString &label_)
+QString stripAcceleratorMarkers(const QString& label_)
{
QString label = label_;
int p = 0;
- forever {
+ forever
+ {
p = label.indexOf('&', p);
if (p < 0 || p + 1 >= label.length())
break;
return label;
}
-
-QString decodeString(const QByteArray &input, QTextCodec *codec)
+QString decodeString(const QByteArray& input, QTextCodec* codec)
{
if (codec && utf8DetectionBlacklist.contains(codec->mibEnum()))
return codec->toUnicode(input);
// Q_ASSERT(sizeof(const char) == sizeof(quint8)); // In God we trust...
bool isUtf8 = true;
int cnt = 0;
- for (int i = 0; i < input.size(); i++) {
+ for (uchar c : input) {
if (cnt) {
// We check a part of a multibyte char. These need to be of the form 10yyyyyy.
- if ((input[i] & 0xc0) != 0x80) { isUtf8 = false; break; }
+ if ((c & 0xc0) != 0x80) {
+ isUtf8 = false;
+ break;
+ }
cnt--;
continue;
}
- if ((input[i] & 0x80) == 0x00) continue; // 7 bit is always ok
- if ((input[i] & 0xf8) == 0xf0) { cnt = 3; continue; } // 4-byte char 11110xxx 10yyyyyy 10zzzzzz 10vvvvvv
- if ((input[i] & 0xf0) == 0xe0) { cnt = 2; continue; } // 3-byte char 1110xxxx 10yyyyyy 10zzzzzz
- if ((input[i] & 0xe0) == 0xc0) { cnt = 1; continue; } // 2-byte char 110xxxxx 10yyyyyy
- isUtf8 = false; break; // 8 bit char, but not utf8!
+ if ((c & 0x80) == 0x00)
+ continue; // 7 bit is always ok
+ if ((c & 0xf8) == 0xf0) {
+ cnt = 3;
+ continue;
+ } // 4-byte char 11110xxx 10yyyyyy 10zzzzzz 10vvvvvv
+ if ((c & 0xf0) == 0xe0) {
+ cnt = 2;
+ continue;
+ } // 3-byte char 1110xxxx 10yyyyyy 10zzzzzz
+ if ((c & 0xe0) == 0xc0) {
+ cnt = 1;
+ continue;
+ } // 2-byte char 110xxxxx 10yyyyyy
+ isUtf8 = false;
+ break; // 8 bit char, but not utf8!
}
if (isUtf8 && cnt == 0) {
QString s = QString::fromUtf8(input);
- //qDebug() << "Detected utf8:" << s;
+ // qDebug() << "Detected utf8:" << s;
return s;
}
- //QTextCodec *codec = QTextCodec::codecForName(encoding.toLatin1());
- if (!codec) return QString::fromLatin1(input);
+ // QTextCodec *codec = QTextCodec::codecForName(encoding.toLatin1());
+ if (!codec)
+ return QString::fromLatin1(input);
return codec->toUnicode(input);
}
-
-uint editingDistance(const QString &s1, const QString &s2)
+uint editingDistance(const QString& s1, const QString& s2)
{
- uint n = s1.size()+1;
- uint m = s2.size()+1;
- QVector<QVector<uint> > matrix(n, QVector<uint>(m, 0));
+ uint n = s1.size() + 1;
+ uint m = s2.size() + 1;
+ QVector<QVector<uint>> matrix(n, QVector<uint>(m, 0));
for (uint i = 0; i < n; i++)
matrix[i][0] = i;
uint min;
for (uint i = 1; i < n; i++) {
for (uint j = 1; j < m; j++) {
- uint deleteChar = matrix[i-1][j] + 1;
- uint insertChar = matrix[i][j-1] + 1;
+ uint deleteChar = matrix[i - 1][j] + 1;
+ uint insertChar = matrix[i][j - 1] + 1;
if (deleteChar < insertChar)
min = deleteChar;
else
min = insertChar;
- if (s1[i-1] == s2[j-1]) {
- uint inheritChar = matrix[i-1][j-1];
+ if (s1[i - 1] == s2[j - 1]) {
+ uint inheritChar = matrix[i - 1][j - 1];
if (inheritChar < min)
min = inheritChar;
}
matrix[i][j] = min;
}
}
- return matrix[n-1][m-1];
+ return matrix[n - 1][m - 1];
}
-
QString secondsToString(int timeInSeconds)
{
- 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"))
- };
+ 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;
- for (int i = 0; i < timeUnit.size(); i++) {
- int n = timeInSeconds / timeUnit[i].first;
+ for (const auto& tu : timeUnit) {
+ int n = timeInSeconds / tu.first;
if (n > 0) {
- returnString += QString("%1 %2").arg(QString::number(n), timeUnit[i].second);
+ returnString += QString("%1 %2").arg(QString::number(n), tu.second);
}
- timeInSeconds = timeInSeconds % timeUnit[i].first;
+ timeInSeconds = timeInSeconds % tu.first;
}
return returnString.join(", ");
}
- else {
- return QString("%1 %2").arg(QString::number(timeInSeconds), timeUnit.last().second);
- }
-}
+ return QString("%1 %2").arg(QString::number(timeInSeconds), timeUnit.last().second);
+}
-QByteArray prettyDigest(const QByteArray &digest)
+QByteArray prettyDigest(const QByteArray& digest)
{
QByteArray hexDigest = digest.toHex().toUpper();
QByteArray prettyDigest;
return prettyDigest;
}
-
-QString formatCurrentDateTimeInString(const QString &formatStr)
+QString formatCurrentDateTimeInString(const QString& formatStr)
{
// Work on a copy of the string to avoid modifying the input string
QString formattedStr = QString(formatStr);
if (matchedFormat.length() > 0) {
// Format the string according to the current date and time. Invalid time format
// strings are ignored.
- formattedStr.replace(index, matchLength,
- QDateTime::currentDateTime().toString(matchedFormat));
+ formattedStr.replace(index, matchLength, QDateTime::currentDateTime().toString(matchedFormat));
// Subtract the length of the removed % signs
// E.g. "%%h:mm ap%%" turns into "h:mm ap", removing four % signs, thus -4. This is
// used below to determine how far to advance when looking for the next formatting code.
matchLength -= 4;
- } else if (matchLength == 4) {
+ }
+ else if (matchLength == 4) {
// Remove two of the four percent signs, so '%%%%' escapes to '%%'
formattedStr.remove(index, 2);
// Subtract the length of the removed % signs, this time removing two % signs, thus -2.
matchLength -= 2;
- } else {
+ }
+ else {
// If neither of these match, something went wrong. Don't modify it to be safe.
qDebug() << "Unexpected time format when parsing string, no matchedFormat, matchLength "
- "should be 4, actually is" << matchLength;
+ "should be 4, actually is"
+ << matchLength;
}
// Find the next group of %%text here%% starting from where the last group ended
return formattedStr;
}
-
-bool scopeMatch(const QString &string, const QString &scopeRule, const bool &isRegEx,
- const bool &isCaseSensitive)
-{
- // When isRegEx is false:
- // A match happens when the string does NOT match ANY inverted rules and matches AT LEAST one
- // normal rule, unless no normal rules exist (implicit wildcard match). This gives inverted
- // rules higher priority regardless of ordering.
- //
- // When isRegEx is true:
- // A match happens when the normal regular expression matches. If prefixed with '!', the match
- // happens UNLESS the following regular expression matches.
-
- // TODO: After switching to Qt 5, use of this should be split into two parts, one part that
- // would generate compiled QRegularExpressions for match/inverted match, regenerating it on any
- // rule changes, and another part that would check each message against these compiled rules.
-
- // Cache case sensitivity
- Qt::CaseSensitivity ruleExactCase = (isCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);
-
- if (isRegEx) {
- // Regular expression tests
- // -------
- // Check if this is an inverted rule (starts with '!')
- if (scopeRule.startsWith("!")) {
- // Take the reminder of the string
- QRegExp ruleRx(scopeRule.mid(1), ruleExactCase);
- // Matching an inverted rule: matched (true) implies rule failure (false)
- return !ruleRx.exactMatch(string);
- } else {
- QRegExp ruleRx(scopeRule, ruleExactCase);
- // Matching a normal rule: matched (true) implies rule success (true)
- return ruleRx.exactMatch(string);
- }
- } else {
- // Wildcard expression tests
- // -------
- // Keep track if any matches are found
- bool matches = false;
- // Keep track if normal rules and inverted rules are found, allowing for implicit wildcard
- bool normalRuleFound = false, invertedRuleFound = false;
-
- // Split each scope rule by separator, ignoring empty parts
- foreach(QString rule, scopeRule.split(";", QString::SkipEmptyParts)) {
- // Trim whitespace from the start/end of the rule
- rule = rule.trimmed();
- // Ignore empty rules
- if (rule.isEmpty())
- continue;
-
- // Check if this is an inverted rule (starts with '!')
- if (rule.startsWith("!")) {
- // Inverted rule found
- invertedRuleFound = true;
-
- // Take the reminder of the string
- QRegExp ruleRx(rule.mid(1), ruleExactCase);
- ruleRx.setPatternSyntax(QRegExp::Wildcard);
- if (ruleRx.exactMatch(string)) {
- // Matches an inverted rule, full rule cannot match
- return false;
- }
- } else {
- // Normal rule found
- normalRuleFound = true;
-
- QRegExp ruleRx(rule, ruleExactCase);
- ruleRx.setPatternSyntax(QRegExp::Wildcard);
- if (ruleRx.exactMatch(string)) {
- // Matches a normal rule, full rule might match
- matches = true;
- // Continue checking in case other inverted rules negate this
- }
- }
- }
- // No inverted rules matched, okay to match normally
- // Return true if...
- // ...we found a normal match
- // ...implicit wildcard: we had inverted rules (that didn't match) and no normal rules
- return matches || (invertedRuleFound && !normalRuleFound);
- }
-}
-
-
-QString tryFormatUnixEpoch(const QString &possibleEpochDate)
+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();
#endif
// Return the localized date/time
- return date.toString();
+ 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
}
projects / quassel.git / blobdiff