X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=b42f4fbf5781a616be1cefe5bcbf3bafec737ee2;hb=aa039e8cc1ecff15a406d03fb64ea28986b968e1;hp=b8adb361fb28c3fb9b4561ddfd2e731515bd2879;hpb=dcd6c362d77ab4cb5ea73b7e54ce944a68aa3f06;p=quassel.git diff --git a/src/common/util.cpp b/src/common/util.cpp index b8adb361..b42f4fbf 100644 --- a/src/common/util.cpp +++ b/src/common/util.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,57 +20,61 @@ #include "util.h" +#include +#include +#include + #include +#include #include -#include #include +#include #include "quassel.h" -class QMetaMethod; - // MIBenum values from http://www.iana.org/assignments/character-sets/character-sets.xml#table-character-sets-1 static QList utf8DetectionBlacklist = QList() << 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 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); } @@ -165,12 +169,13 @@ uint editingDistance(const QString &s1, const QString &s2) QString secondsToString(int timeInSeconds) { - QList > 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> 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; @@ -201,17 +206,160 @@ QByteArray prettyDigest(const QByteArray &digest) return prettyDigest; } -QString formatCurrentDateTimeInString(QString str) + +QString formatCurrentDateTimeInString(const QString &formatStr) { - /* - * Find %%%% in string. Repleace inside text which is format to QDateTime - * with current timestamp. - */ - QRegExp rx("\\%%(.*)\\%%"); - rx.setMinimal(true); - int s = rx.indexIn(str); - if (s >= 0) - str.replace(s, rx.cap(0).length(), QDateTime::currentDateTime().toString(rx.cap(1))); - - return str; + // Work on a copy of the string to avoid modifying the input string + QString formattedStr = QString(formatStr); + + // Exit early if there's nothing to format + if (formattedStr.isEmpty()) + return formattedStr; + + // Find %%%% in string. Replace inside text formatted to QDateTime with the current + // timestamp, using %%%% as an escape for multiple %% signs. + // For example: + // Simple: "All Quassel clients vanished from the face of the earth... %%hh:mm:ss%%" + // > Result: "All Quassel clients vanished from the face of the earth... 23:20:34" + // Complex: "Away since %%hh:mm%% on %%dd.MM%% - %%%% not here %%%%" + // > Result: "Away since 23:20 on 21.05 - %% not here %%" + // + // Match groups of double % signs - Some text %%inside here%%, and even %%%%: + // %%(.*)%% + // (...) marks a capturing group + // .* matches zero or more characters, not including newlines + // Note that '\' must be escaped as '\\' + // Helpful interactive website for debugging and explaining: https://regex101.com/ + QRegExp regExpMatchTime("%%(.*)%%"); + + // Preserve the smallest groups possible to allow for multiple %%blocks%% + regExpMatchTime.setMinimal(true); + + // NOTE: Move regExpMatchTime to a static regular expression if used anywhere that performance + // matters. + + // Don't allow a runaway regular expression to loop for too long. This might not happen.. but + // when dealing with user input, better to be safe..? + int numIterations = 0; + + // Find each group of %%text here%% starting from the beginning + int index = regExpMatchTime.indexIn(formattedStr); + int matchLength; + QString matchedFormat; + while (index >= 0 && numIterations < 512) { + // Get the total length of the matched expression + matchLength = regExpMatchTime.cap(0).length(); + // Get the format string, e.g. "this text here" from "%%this text here%%" + matchedFormat = regExpMatchTime.cap(1); + // Check that there's actual characters inside. A quadruple % (%%%%) represents two %% + // signs. + 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)); + // 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) { + // 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 { + // 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; + } + + // Find the next group of %%text here%% starting from where the last group ended + index = regExpMatchTime.indexIn(formattedStr, index + matchLength); + numIterations++; + } + + 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); + } }