X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=4a9165a3f0fd69222ca1f8c864a4b26486776d9a;hp=a2c4e25ed76b89eb11f17106b761fbc2212aeb46;hb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;hpb=fa56ee7fc1b94ea27da6b27c919d6df1c0e0490d diff --git a/src/common/util.cpp b/src/common/util.cpp index a2c4e25e..4a9165a3 100644 --- a/src/common/util.cpp +++ b/src/common/util.cpp @@ -282,90 +282,7 @@ QString formatCurrentDateTimeInString(const QString &formatStr) } -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(); @@ -387,5 +304,78 @@ QString tryFormatUnixEpoch(const QString &possibleEpochDate) #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 }