X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=d57678dd49905ad9bfa8ad35d8b816750555bab2;hp=e65006ecf989c0cef3c5731d6015de9418ffa969;hb=f953257711e147661ce79e4da4c8b84f083e3e95;hpb=6261af690fbf7f3aca06acc8f1268488cdfb566f

diff --git a/src/client/client.cpp b/src/client/client.cpp
index e65006ec..d57678dd 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -21,6 +21,7 @@
 #include "client.h"
 
 #include "bufferinfo.h"
+#include "buffersyncer.h"
 #include "global.h"
 #include "identity.h"
 #include "ircchannel.h"
@@ -61,6 +62,7 @@ Client::Client(QObject *parent)
     mainUi(0),
     _networkModel(0),
     _bufferModel(0),
+    _bufferSyncer(0),
     _connectedToCore(false),
     _syncedToCore(false)
 {
@@ -76,12 +78,14 @@ void Client::init() {
   _networkModel = new NetworkModel(this);
   connect(this, SIGNAL(bufferUpdated(BufferInfo)),
           _networkModel, SLOT(bufferUpdated(BufferInfo)));
+  connect(this, SIGNAL(networkRemoved(NetworkId)),
+	  _networkModel, SLOT(networkRemoved(NetworkId)));
 
   _bufferModel = new BufferModel(_networkModel);
 
   SignalProxy *p = signalProxy();
 
-  p->attachSlot(SIGNAL(displayMsg(const Message &)), this, SLOT(recvMessage(Message &)));
+  p->attachSlot(SIGNAL(displayMsg(const Message &)), this, SLOT(recvMessage(const Message &)));
   p->attachSlot(SIGNAL(displayStatusMsg(QString, QString)), this, SLOT(recvStatusMsg(QString, QString)));
 
   p->attachSlot(SIGNAL(backlogData(BufferInfo, const QVariantList &, bool)), this, SLOT(recvBacklogData(BufferInfo, const QVariantList &, bool)));
@@ -162,23 +166,6 @@ Buffer *Client::buffer(BufferInfo bufferInfo) {
   return buff;
 }
 
-Buffer *Client::monitorBuffer() {
-  return instance()->_monitorBuffer;
-}
-
-
-NetworkModel *Client::networkModel() {
-  return instance()->_networkModel;
-}
-
-BufferModel *Client::bufferModel() {
-  return instance()->_bufferModel;
-}
-
-SignalProxy *Client::signalProxy() {
-  return instance()->_signalProxy;
-}
-
 bool Client::isConnected() {
   return instance()->_connectedToCore;
 }
@@ -293,12 +280,22 @@ void Client::setConnectedToCore(QIODevice *sock, AccountId id) {
 }
 
 void Client::setSyncedToCore() {
+  // create buffersyncer
+  Q_ASSERT(!_bufferSyncer);
+  _bufferSyncer = new BufferSyncer(this);
+  connect(bufferSyncer(), SIGNAL(lastSeenSet(BufferId, const QDateTime &)), this, SLOT(updateLastSeen(BufferId, const QDateTime &)));
+  connect(bufferSyncer(), SIGNAL(bufferRemoved(BufferId)), this, SLOT(bufferRemoved(BufferId)));
+  signalProxy()->synchronize(bufferSyncer());
+
   _syncedToCore = true;
   emit connected();
   emit coreConnectionStateChanged(true);
 }
 
 void Client::disconnectFromCore() {
+  if(!isConnected())
+    return;
+  
   if(socket) {
     socket->close();
     socket->deleteLater();
@@ -310,8 +307,21 @@ void Client::disconnectFromCore() {
   emit coreConnectionStateChanged(false);
 
   // Clear internal data. Hopefully nothing relies on it at this point.
+  if(_bufferSyncer) {
+    _bufferSyncer->deleteLater();
+    _bufferSyncer = 0;
+  }
   _networkModel->clear();
 
+  QHash<BufferId, Buffer *>::iterator bufferIter =  _buffers.begin();
+  while(bufferIter != _buffers.end()) {
+    Buffer *buffer = bufferIter.value();
+    disconnect(buffer, SIGNAL(destroyed()), this, 0);
+    bufferIter = _buffers.erase(bufferIter);
+    buffer->deleteLater();
+  }
+  Q_ASSERT(_buffers.isEmpty());
+
   QHash<NetworkId, Network*>::iterator netIter = _networks.begin();
   while(netIter != _networks.end()) {
     Network *net = netIter.value();
@@ -322,15 +332,6 @@ void Client::disconnectFromCore() {
   }
   Q_ASSERT(_networks.isEmpty());
 
-  QHash<BufferId, Buffer *>::iterator bufferIter =  _buffers.begin();
-  while(bufferIter != _buffers.end()) {
-    Buffer *buffer = bufferIter.value();
-    disconnect(buffer, SIGNAL(destroyed()), this, 0);
-    bufferIter = _buffers.erase(bufferIter);
-    buffer->deleteLater();
-  }
-  Q_ASSERT(_buffers.isEmpty());
-
   QHash<IdentityId, Identity*>::iterator idIter = _identities.begin();
   while(idIter != _identities.end()) {
     Identity *id = idIter.value();
@@ -379,7 +380,8 @@ void Client::networkDestroyed() {
   }
 }
 
-void Client::recvMessage(Message &msg) {
+void Client::recvMessage(const Message &message) {
+  Message msg = message;
   Buffer *b;
   
   if(msg.type() == Message::Error) {
@@ -391,11 +393,11 @@ void Client::recvMessage(Message &msg) {
   } else {
     b = buffer(msg.bufferInfo());
   }
-  
+
   checkForHighlight(msg);
   b->appendMsg(msg);
-  networkModel()->updateBufferActivity(msg);
-  
+  //bufferModel()->updateBufferActivity(msg);
+
   if(msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) {
     const Network *net = network(msg.bufferInfo().networkId());
     QString networkName = net != 0
@@ -405,7 +407,6 @@ void Client::recvMessage(Message &msg) {
     Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.text(), sender, msg.flags());
     monitorBuffer()->appendMsg(mmsg);
   }
-
 }
 
 void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
@@ -418,7 +419,7 @@ void Client::recvBacklogData(BufferInfo id, QVariantList msgs, bool /*done*/) {
     Message msg = v.value<Message>();
     checkForHighlight(msg);
     b->prependMsg(msg);
-    networkModel()->updateBufferActivity(msg);
+    //networkModel()->updateBufferActivity(msg);
     if(!layoutQueue.contains(b)) layoutQueue.append(b);
   }
   if(layoutQueue.count() && !layoutTimer->isActive()) layoutTimer->start();
@@ -439,11 +440,34 @@ AbstractUiMsg *Client::layoutMsg(const Message &msg) {
   return instance()->mainUi->layoutMsg(msg);
 }
 
-void Client::checkForHighlight(Message &msg) const {
+void Client::checkForHighlight(Message &msg) {
   const Network *net = network(msg.bufferInfo().networkId());
   if(net && !net->myNick().isEmpty()) {
     QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(net->myNick()) + "(\\W.*)?$");
-    if((msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) && nickRegExp.exactMatch(msg.text()))
+    if((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && nickRegExp.exactMatch(msg.text()))
       msg.setFlags(msg.flags() | Message::Highlight);
   }
 }
+
+void Client::updateLastSeen(BufferId id, const QDateTime &lastSeen) {
+  Buffer *b = buffer(id);
+  if(!b) {
+    qWarning() << "Client::updateLastSeen(): Unknown buffer" << id;
+    return;
+  }
+  b->setLastSeen(lastSeen);
+}
+
+void Client::setBufferLastSeen(BufferId id, const QDateTime &lastSeen) {
+  if(!bufferSyncer()) return;
+  bufferSyncer()->requestSetLastSeen(id, lastSeen);
+}
+
+void Client::bufferRemoved(BufferId bufferId) {
+  networkModel()->removeBuffer(bufferId);
+  if(_buffers.contains(bufferId)) {
+    Buffer *buff = _buffers.take(bufferId);
+    disconnect(buff, 0, this, 0);
+    buff->deleteLater();
+  }
+}