/***************************************************************************
-* Copyright (C) 2005-08 by the Quassel Project *
+* Copyright (C) 2005-09 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
QtUiMessageProcessor::QtUiMessageProcessor(QObject *parent)
: AbstractMessageProcessor(parent),
_processing(false),
- _processMode(TimerBased),
- _msgsProcessed(0),
- _msgCount(0)
+ _processMode(TimerBased)
{
NotificationSettings notificationSettings;
_nicksCaseSensitive = notificationSettings.nicksCaseSensitive();
_highlightNick = notificationSettings.highlightNick();
highlightListChanged(notificationSettings.highlightList());
notificationSettings.notify("Highlights/NicksCaseSensitive", this, SLOT(nicksCaseSensitiveChanged(const QVariant &)));
- notificationSettings.notify("highlightList", this, SLOT(highlightListChanged(const QVariant &)));
- notificationSettings.notify("highlightNick", this, SLOT(highlightNickChanged(const QVariant &)));
+ notificationSettings.notify("Highlights/CustomList", this, SLOT(highlightListChanged(const QVariant &)));
+ notificationSettings.notify("Highlights/HighlightNick", this, SLOT(highlightNickChanged(const QVariant &)));
_processTimer.setInterval(0);
connect(&_processTimer, SIGNAL(timeout()), this, SLOT(processNextMessage()));
void QtUiMessageProcessor::process(Message &msg) {
checkForHighlight(msg);
+ preProcess(msg);
Client::messageModel()->insertMessage(msg);
- postProcess(msg);
}
void QtUiMessageProcessor::process(QList<Message> &msgs) {
QList<Message>::iterator msgIterEnd = msgs.end();
while(msgIter != msgIterEnd) {
checkForHighlight(*msgIter);
- postProcess(*msgIter);
+ preProcess(*msgIter);
msgIter++;
}
Client::messageModel()->insertMessages(msgs);
if(msgs.isEmpty()) return;
_processQueue.append(msgs);
- _msgCount += msgs.count();
- if(!isProcessing()) startProcessing();
- else updateProgress();
+ if(!isProcessing())
+ startProcessing();
}
void QtUiMessageProcessor::startProcessing() {
if(processMode() == TimerBased) {
- if(_currentBatch.isEmpty() && _processQueue.isEmpty()) return;
+ if(_currentBatch.isEmpty() && _processQueue.isEmpty())
+ return;
_processing = true;
- _msgsProcessed = 0;
- _msgCount = _currentBatch.count();
- foreach(QList<Message> msglist, _processQueue) _msgCount += msglist.count();
- updateProgress();
- if(!_processTimer.isActive()) _processTimer.start();
+ if(!_processTimer.isActive())
+ _processTimer.start();
}
}
if(_processQueue.isEmpty()) {
_processTimer.stop();
_processing = false;
- _msgsProcessed = _msgCount = 0;
- updateProgress();
return;
}
_currentBatch = _processQueue.takeFirst();
}
Message msg = _currentBatch.takeFirst();
process(msg);
- _msgsProcessed++;
- updateProgress();
-}
-
-void QtUiMessageProcessor::updateProgress(bool start) {
- if(start) {
- _progressTimer.start();
- emit progressUpdated(_msgsProcessed, _msgCount);
- } else {
- if(_msgCount == 0 || _progressTimer.elapsed() >= progressUpdateDelay) {
- _progressTimer.restart();
- emit progressUpdated(_msgsProcessed, _msgCount);
- }
- }
}
void QtUiMessageProcessor::checkForHighlight(Message &msg) {
nickList = myIdentity->nicks();
}
foreach(QString nickname, nickList) {
- QRegExp nickRegExp("\\b" + QRegExp::escape(nickname) + "\\b",
+ QRegExp nickRegExp("\\b" + QRegExp::escape(nickname) + "(\\W|\\b|$)", // + "\\b", this does not seem to work for trailing ` -> upstream bug?
_nicksCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);
if(nickRegExp.indexIn(msg.contents()) >= 0) {
msg.setFlags(msg.flags() | Message::Highlight);
if(!rule.isEnabled)
continue;
- QRegExp userRegExp;
+ bool match = false;
if(rule.isRegExp) {
- userRegExp = QRegExp(rule.name, rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
+ QRegExp rx(rule.name, rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
+ match = rx.exactMatch(msg.contents());
} else {
- userRegExp = QRegExp("\\b" + QRegExp::escape(rule.name) + "\\b", rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
+ QRegExp rx("\\b" + QRegExp::escape(rule.name) + "\\b", rule.caseSensitive? Qt::CaseSensitive : Qt::CaseInsensitive);
+ match = (rx.indexIn(msg.contents()) >= 0);
}
- if(userRegExp.exactMatch(msg.contents())) {
+ if(match) {
msg.setFlags(msg.flags() | Message::Highlight);
return;
}
_highlightRules.clear();
QVariantList::const_iterator iter = varList.constBegin();
- QVariantList::const_iterator iterEnd = varList.constEnd();
- while(iter != iterEnd) {
- QVariantMap rule;
- _highlightRules << HighlightRule(rule["name"].toString(),
- rule["enable"].toBool(),
- rule["cs"].toBool() ? Qt::CaseSensitive : Qt::CaseInsensitive,
- rule["regex"].toBool());
+ while(iter != varList.constEnd()) {
+ QVariantMap rule = iter->toMap();
+ _highlightRules << HighlightRule(rule["Name"].toString(),
+ rule["Enable"].toBool(),
+ rule["CS"].toBool() ? Qt::CaseSensitive : Qt::CaseInsensitive,
+ rule["RegEx"].toBool());
iter++;
}
}