X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=8bbafb24d6fa9fcf0f75383e802abc47ad427b24;hp=94119f5ea7e3591ab2ce50657061a63af9036fa3;hb=a84b3ab2b92bc8c5ac504e5430eb81d05efc690e;hpb=38db2f48a30f697ef8c0b61dfa6345e8a53336fd

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 94119f5e..8bbafb24 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -20,86 +20,164 @@
 
 #include "client.h"
 
-#include "buffer.h"
+#include "networkinfo.h"
+#include "ircuser.h"
+#include "ircchannel.h"
+
+#include "message.h"
+
+#include "bufferinfo.h"
 #include "buffertreemodel.h"
-#include "clientproxy.h"
 #include "quasselui.h"
+#include "signalproxy.h"
+#include "synchronizer.h"
 #include "util.h"
 
-Client * Client::instanceptr = 0;
-
-bool Client::connectedToCore = false;
-Client::ClientMode Client::clientMode;
-VarMap Client::coreConnectionInfo;
-QHash<BufferId, Buffer *> Client::buffers;
-QHash<uint, BufferId> Client::bufferIds;
-QHash<QString, QHash<QString, VarMap> > Client::nicks;
-QHash<QString, bool> Client::netConnected;
-QStringList Client::netsAwaitingInit;
-QHash<QString, QString> Client::ownNick;
+QPointer<Client> Client::instanceptr = 0;
 
+// ==============================
+//  public Static Methods
+// ==============================
 Client *Client::instance() {
-  if(instanceptr) return instanceptr;
-  instanceptr = new Client();
+  if(!instanceptr)
+    instanceptr = new Client();
   return instanceptr;
 }
 
 void Client::destroy() {
   delete instanceptr;
-  instanceptr = 0;
 }
 
-Client::Client() {
-  clientProxy = ClientProxy::instance();
+void Client::init(AbstractUi *ui) {
+  instance()->mainUi = ui;
+  instance()->init();
+}
 
-  _bufferModel = new BufferTreeModel(this);
+QList<NetworkInfo *> Client::networkInfos() {
+  return instance()->_networkInfo.values();
+}
 
-  connect(this, SIGNAL(bufferSelected(Buffer *)), _bufferModel, SLOT(selectBuffer(Buffer *)));
-  connect(this, SIGNAL(bufferUpdated(Buffer *)), _bufferModel, SLOT(bufferUpdated(Buffer *)));
-  connect(this, SIGNAL(bufferActivity(Buffer::ActivityLevel, Buffer *)), _bufferModel, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *)));
+NetworkInfo *Client::networkInfo(uint networkid) {
+  if(instance()->_networkInfo.contains(networkid))
+    return instance()->_networkInfo[networkid];
+  else
+    return 0;
+}
 
-    // TODO: make this configurable (allow monolithic client to connect to remote cores)
-  if(Global::runMode == Global::Monolithic) clientMode = LocalCore;
-  else clientMode = RemoteCore;
-  connectedToCore = false;
+QList<BufferInfo> Client::allBufferInfos() {
+  QList<BufferInfo> bufferids;
+  foreach(Buffer *buffer, buffers()) {
+    bufferids << buffer->bufferInfo();
+  }
+  return bufferids;
 }
 
-void Client::init(AbstractUi *ui) {
-  instance()->mainUi = ui;
-  instance()->init();
+QList<Buffer *> Client::buffers() {
+  return instance()->_buffers.values();
+}
+
+Buffer *Client::buffer(uint bufferUid) {
+  if(instance()->_buffers.contains(bufferUid))
+    return instance()->_buffers[bufferUid];
+  else
+    return 0;
+}
+
+Buffer *Client::buffer(BufferInfo id) {
+  Buffer *buff = buffer(id.uid());
+
+  if(!buff) {
+    Client *client = Client::instance();
+    buff = new Buffer(id, client);
+
+    connect(buff, SIGNAL(userInput(BufferInfo, QString)),
+	    client, SLOT(userInput(BufferInfo, QString)));
+    connect(buff, SIGNAL(bufferUpdated(Buffer *)),
+	    client, SIGNAL(bufferUpdated(Buffer *)));
+    connect(buff, SIGNAL(destroyed()),
+	    client, SLOT(bufferDestroyed()));
+    client->_buffers[id.uid()] = buff;
+    emit client->bufferUpdated(buff);
+  }
+  Q_ASSERT(buff);
+  return buff;
+}
+
+// FIXME switch to netids!
+// WHEN IS THIS NEEDED ANYHOW!?
+BufferInfo Client::bufferInfo(QString net, QString buf) {
+  foreach(Buffer *buffer_, buffers()) {
+    BufferInfo bufferInfo = buffer_->bufferInfo();
+    if(bufferInfo.network() == net && bufferInfo.buffer() == buf)
+      return bufferInfo;
+  }
+  Q_ASSERT(false);  // should never happen!
+  return BufferInfo();
+}
+
+BufferInfo Client::statusBufferInfo(QString net) {
+  return bufferInfo(net, "");
+}
+
+BufferTreeModel *Client::bufferModel() {
+  return instance()->_bufferModel;
+}
+
+SignalProxy *Client::signalProxy() {
+  return instance()->_signalProxy;
+}
+
+// ==============================
+//  Constructor / Decon
+// ==============================
+Client::Client(QObject *parent)
+  : QObject(parent),
+    socket(0),
+    _signalProxy(new SignalProxy(SignalProxy::Client, this)),
+    mainUi(0),
+    _bufferModel(0),
+    connectedToCore(false)
+{
+}
+
+Client::~Client() {
 }
 
 void Client::init() {
   blockSize = 0;
 
-  connect(&socket, SIGNAL(readyRead()), this, SLOT(serverHasData()));
-  connect(&socket, SIGNAL(connected()), this, SLOT(coreSocketConnected()));
-  connect(&socket, SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
-  connect(&socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(serverError(QAbstractSocket::SocketError)));
-
-  connect(this, SIGNAL(sendSessionData(const QString &, const QVariant &)), clientProxy, SLOT(gsSessionDataChanged(const QString &, const QVariant &)));
-  connect(clientProxy, SIGNAL(csSessionDataChanged(const QString &, const QVariant &)), this, SLOT(recvSessionData(const QString &, const QVariant &)));
-
-  connect(clientProxy, SIGNAL(send(ClientSignal, QVariant, QVariant, QVariant)), this, SLOT(recvProxySignal(ClientSignal, QVariant, QVariant, QVariant)));
-  connect(clientProxy, SIGNAL(csCoreState(QVariant)), this, SLOT(recvCoreState(const QVariant &)));
-  connect(clientProxy, SIGNAL(csServerState(QString, QVariant)), this, SLOT(recvNetworkState(QString, QVariant)));
-  connect(clientProxy, SIGNAL(csServerConnected(QString)), this, SLOT(networkConnected(QString)));
-  connect(clientProxy, SIGNAL(csServerDisconnected(QString)), this, SLOT(networkDisconnected(QString)));
-  connect(clientProxy, SIGNAL(csDisplayMsg(Message)), this, SLOT(recvMessage(const Message &)));
-  connect(clientProxy, SIGNAL(csDisplayStatusMsg(QString, QString)), this, SLOT(recvStatusMsg(QString, QString)));
-  connect(clientProxy, SIGNAL(csTopicSet(QString, QString, QString)), this, SLOT(setTopic(QString, QString, QString)));
-  connect(clientProxy, SIGNAL(csNickAdded(QString, QString, VarMap)), this, SLOT(addNick(QString, QString, VarMap)));
-  connect(clientProxy, SIGNAL(csNickRemoved(QString, QString)), this, SLOT(removeNick(QString, QString)));
-  connect(clientProxy, SIGNAL(csNickRenamed(QString, QString, QString)), this, SLOT(renameNick(QString, QString, QString)));
-  connect(clientProxy, SIGNAL(csNickUpdated(QString, QString, VarMap)), this, SLOT(updateNick(QString, QString, VarMap)));
-  connect(clientProxy, SIGNAL(csOwnNickSet(QString, QString)), this, SLOT(setOwnNick(QString, QString)));
-  connect(clientProxy, SIGNAL(csBacklogData(BufferId, const QList<QVariant> &, bool)), this, SLOT(recvBacklogData(BufferId, QList<QVariant>, bool)));
-  connect(clientProxy, SIGNAL(csUpdateBufferId(BufferId)), this, SLOT(updateBufferId(BufferId)));
-  connect(this, SIGNAL(sendInput(BufferId, QString)), clientProxy, SLOT(gsUserInput(BufferId, QString)));
-  connect(this, SIGNAL(requestBacklog(BufferId, QVariant, QVariant)), clientProxy, SLOT(gsRequestBacklog(BufferId, QVariant, QVariant)));
-  connect(this, SIGNAL(requestNetworkStates()), clientProxy, SLOT(gsRequestNetworkStates()));
-
-  connect(mainUi, SIGNAL(connectToCore(const VarMap &)), this, SLOT(connectToCore(const VarMap &)));
+  _bufferModel = new BufferTreeModel(this);
+
+  connect(this, SIGNAL(bufferSelected(Buffer *)),
+	  _bufferModel, SLOT(selectBuffer(Buffer *)));
+  connect(this, SIGNAL(bufferUpdated(Buffer *)),
+	  _bufferModel, SLOT(bufferUpdated(Buffer *)));
+  connect(this, SIGNAL(bufferActivity(Buffer::ActivityLevel, Buffer *)),
+	  _bufferModel, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *)));
+
+  SignalProxy *p = signalProxy();
+  p->attachSignal(this, SIGNAL(sendSessionData(const QString &, const QVariant &)),
+		  SIGNAL(clientSessionDataChanged(const QString &, const QVariant &)));
+  p->attachSlot(SIGNAL(coreSessionDataChanged(const QString &, const QVariant &)),
+		this, SLOT(recvSessionData(const QString &, const QVariant &)));
+  p->attachSlot(SIGNAL(coreState(const QVariant &)),
+		this, SLOT(recvCoreState(const QVariant &)));
+  p->attachSlot(SIGNAL(networkConnected(uint)),
+		this, SLOT(networkConnected(uint)));
+  p->attachSlot(SIGNAL(networkDisconnected(uint)),
+		this, SLOT(networkDisconnected(uint)));
+  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)));
+  p->attachSlot(SIGNAL(bufferInfoUpdated(BufferInfo)), this, SLOT(updateBufferInfo(BufferInfo)));
+  p->attachSignal(this, SIGNAL(sendInput(BufferInfo, QString)));
+  p->attachSignal(this, SIGNAL(requestNetworkStates()));
+
+  connect(mainUi, SIGNAL(connectToCore(const QVariantMap &)), this, SLOT(connectToCore(const QVariantMap &)));
   connect(mainUi, SIGNAL(disconnectFromCore()), this, SLOT(disconnectFromCore()));
   connect(this, SIGNAL(connected()), mainUi, SLOT(connectedToCore()));
   connect(this, SIGNAL(disconnected()), mainUi, SLOT(disconnectedFromCore()));
@@ -111,101 +189,204 @@ void Client::init() {
 
 }
 
-Client::~Client() {
-  //delete mainUi;
-  //delete _bufferModel;
-  foreach(Buffer *buf, buffers.values()) delete buf;
-  ClientProxy::destroy();
-
+bool Client::isConnected() {
+  return instance()->connectedToCore;
 }
 
-BufferTreeModel *Client::bufferModel() {
-  return instance()->_bufferModel;
+void Client::fakeInput(uint bufferUid, QString message) {
+  Buffer *buff = buffer(bufferUid);
+  if(!buff)
+    qWarning() << "No Buffer with uid" << bufferUid << "can't send Input" << message;
+  else
+    emit instance()->sendInput(buff->bufferInfo(), message);
 }
 
-bool Client::isConnected() { return connectedToCore; }
+void Client::fakeInput(BufferInfo bufferInfo, QString message) {
+  fakeInput(bufferInfo, message);
+}
 
-void Client::connectToCore(const VarMap &conn) {
+void Client::connectToCore(const QVariantMap &conn) {
   // TODO implement SSL
   coreConnectionInfo = conn;
   if(isConnected()) {
     emit coreConnectionError(tr("Already connected to Core!"));
     return;
   }
+  
+  if(socket != 0)
+    socket->deleteLater();
+  
   if(conn["Host"].toString().isEmpty()) {
     clientMode = LocalCore;
-    QVariant state = connectToLocalCore(coreConnectionInfo["User"].toString(), coreConnectionInfo["Password"].toString());
-    syncToCore(state);
+    socket = new QBuffer(this);
+    connect(socket, SIGNAL(readyRead()), this, SLOT(coreHasData()));
+    socket->open(QIODevice::ReadWrite);
+    //QVariant state = connectToLocalCore(coreConnectionInfo["User"].toString(), coreConnectionInfo["Password"].toString());
+    //syncToCore(state);
+    coreSocketConnected();
   } else {
     clientMode = RemoteCore;
     emit coreConnectionMsg(tr("Connecting..."));
-    socket.connectToHost(conn["Host"].toString(), conn["Port"].toUInt());
+    Q_ASSERT(!socket);
+    QTcpSocket *sock = new QTcpSocket(this);
+    socket = sock;
+    connect(sock, SIGNAL(readyRead()), this, SLOT(coreHasData()));
+    connect(sock, SIGNAL(connected()), this, SLOT(coreSocketConnected()));
+    connect(sock, SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
+    connect(signalProxy(), SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
+    //connect(sock, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(coreSocketStateChanged(QAbstractSocket::SocketState)));
+    connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(coreSocketError(QAbstractSocket::SocketError)));
+    sock->connectToHost(conn["Host"].toString(), conn["Port"].toUInt());
   }
 }
 
 void Client::disconnectFromCore() {
-  if(clientMode == RemoteCore) {
-    socket.close();
-  } else {
-    disconnectFromLocalCore();
+  socket->close();
+  if(clientMode == LocalCore) {
     coreSocketDisconnected();
   }
-  /* Clear internal data. Hopefully nothing relies on it at this point. */
-  coreConnectionInfo.clear();
-  sessionData.clear();
-  //foreach(Buffer *buf, buffers.values()) delete buf;
-  qDebug() << "barfoo";
-  _bufferModel->clear();
-  //qDeleteAll(buffers);
-  qDebug() << "foobar";
+}
+
+void Client::setCoreConfiguration(const QVariantMap &settings) {
+  writeDataToDevice(socket, settings);
 }
 
 void Client::coreSocketConnected() {
-  connect(this, SIGNAL(recvPartialItem(quint32, quint32)), this, SIGNAL(coreConnectionProgress(uint, uint)));
+  connect(this, SIGNAL(recvPartialItem(uint, uint)), this, SIGNAL(coreConnectionProgress(uint, uint)));
   emit coreConnectionMsg(tr("Synchronizing to core..."));
-  VarMap clientInit;
+  QVariantMap clientInit;
   clientInit["GuiProtocol"] = GUI_PROTOCOL;
   clientInit["User"] = coreConnectionInfo["User"].toString();
   clientInit["Password"] = coreConnectionInfo["Password"].toString();
-  writeDataToDevice(&socket, clientInit);
+  writeDataToDevice(socket, clientInit);
 }
 
 void Client::coreSocketDisconnected() {
-  connectedToCore = false;
+  instance()->connectedToCore = false;
   emit disconnected();
+  socket->deleteLater();
+  blockSize = 0;
+
+  /* Clear internal data. Hopefully nothing relies on it at this point. */
+  _bufferModel->clear();
+  foreach(Buffer *buffer, _buffers.values()) {
+    buffer->deleteLater();
+  }
+  _buffers.clear();
+
+  foreach(NetworkInfo *networkinfo, _networkInfo.values()) {
+    networkinfo->deleteLater();
+  }
+  _networkInfo.clear();
+
+  coreConnectionInfo.clear();
+  sessionData.clear();
+  layoutQueue.clear();
+  layoutTimer->stop();
+}
+
+void Client::coreSocketStateChanged(QAbstractSocket::SocketState state) {
+  if(state == QAbstractSocket::UnconnectedState) coreSocketDisconnected();
 }
 
 void Client::recvCoreState(const QVariant &state) {
-  disconnect(this, SIGNAL(recvPartialItem(quint32, quint32)), this, SIGNAL(coreConnectionProgress(uint, uint)));
+  disconnect(this, SIGNAL(recvPartialItem(uint, uint)), this, SIGNAL(coreConnectionProgress(uint, uint)));
+  disconnect(socket, 0, this, 0);  // rest of communication happens through SignalProxy
+  signalProxy()->addPeer(socket);
   syncToCore(state);
-
 }
 
+// TODO: auth errors
 void Client::syncToCore(const QVariant &coreState) {
-  VarMap sessionState = coreState.toMap()["SessionState"].toMap();
-  VarMap sessData = sessionState["SessionData"].toMap();
+  if(!coreState.toMap().contains("SessionState")) {
+    emit coreConnectionError(tr("Invalid data received from core!"));
+    disconnectFromCore();
+    return;
+  }
+
+  QVariantMap sessionState = coreState.toMap()["SessionState"].toMap();
 
-  foreach(QString key, sessData.keys()) {
+  // store sessionData
+  QVariantMap sessData = sessionState["SessionData"].toMap();
+  foreach(QString key, sessData.keys())
     recvSessionData(key, sessData[key]);
-  }
-  QList<QVariant> coreBuffers = sessionState["Buffers"].toList();
+
+  // store Buffer details
+  QVariantList coreBuffers = sessionState["Buffers"].toList();
   /* make lookups by id faster */
   foreach(QVariant vid, coreBuffers) {
-    BufferId id = vid.value<BufferId>();
-    bufferIds[id.uid()] = id;  // make lookups by id faster
-    buffer(id);                // create all buffers, so we see them in the network views
+    buffer(vid.value<BufferInfo>()); // create all buffers, so we see them in the network views
   }
-  netsAwaitingInit = sessionState["Networks"].toStringList();
-  connectedToCore = true;
-  if(netsAwaitingInit.count()) {
+
+  // create networkInfo objects
+  QVariantList networkids = sessionState["Networks"].toList();
+  foreach(QVariant networkid, networkids) {
+    networkConnected(networkid.toUInt());
+  }
+  
+  instance()->connectedToCore = true;
+  updateCoreConnectionProgress();
+
+}
+
+void Client::updateCoreConnectionProgress() {
+  // we'll do this in three steps:
+  // 1.) networks
+  // 2.) channels
+  // 3.) ircusers
+
+  int numNets = networkInfos().count();
+  int numNetsWaiting = 0;
+
+  int numIrcUsers = 0;
+  int numIrcUsersWaiting = 0;
+
+  int numChannels = 0;
+  int numChannelsWaiting = 0;
+
+  foreach(NetworkInfo *net, networkInfos()) {
+    if(! net->initialized())
+      numNetsWaiting++;
+
+    numIrcUsers += net->ircUsers().count();
+    foreach(IrcUser *user, net->ircUsers()) {
+      if(! user->initialized())
+	numIrcUsersWaiting++;
+    }
+
+    numChannels += net->ircChannels().count();
+    foreach(IrcChannel *channel, net->ircChannels()) {
+      if(! channel->initialized())
+	numChannelsWaiting++;
+    }
+  }
+
+  if(numNetsWaiting > 0) {
     emit coreConnectionMsg(tr("Requesting network states..."));
-    emit coreConnectionProgress(0, netsAwaitingInit.count());
-    emit requestNetworkStates();
+    emit coreConnectionProgress(numNets - numNetsWaiting, numNets);
+    return;
+  }
+
+  if(numIrcUsersWaiting > 0) {
+    emit coreConnectionMsg(tr("Requesting User states..."));
+    emit coreConnectionProgress(numIrcUsers - numIrcUsersWaiting, numIrcUsers);
+    return;
+  }
+
+  if(numChannelsWaiting > 0) {
+    emit coreConnectionMsg(tr("Requesting Channel states..."));
+    emit coreConnectionProgress(numChannels - numChannelsWaiting, numChannels);
+    return;
   }
-  else {
-    emit coreConnectionProgress(1, 1);
-    emit connected();
+
+  emit coreConnectionProgress(1,1);
+  emit connected(); // FIXME EgS: This caused the double backlog... but... we shouldn't be calling this whole function all the time...
+
+  foreach(NetworkInfo *net, networkInfos()) {
+    disconnect(net, 0, this, SLOT(updateCoreConnectionProgress()));
   }
+
+  // signalProxy()->dumpProxyStats();
 }
 
 void Client::recvSessionData(const QString &key, const QVariant &data) {
@@ -230,122 +411,90 @@ QStringList Client::sessionDataKeys() {
   return instance()->sessionData.keys();
 }
 
-void Client::recvProxySignal(ClientSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
-  if(clientMode == LocalCore) return;
-  QList<QVariant> sigdata;
-  sigdata.append(sig); sigdata.append(arg1); sigdata.append(arg2); sigdata.append(arg3);
-  //qDebug() << "Sending signal: " << sigdata;
-  writeDataToDevice(&socket, QVariant(sigdata));
-}
-
-void Client::serverError(QAbstractSocket::SocketError) {
-  emit coreConnectionError(socket.errorString());
+void Client::coreSocketError(QAbstractSocket::SocketError) {
+  emit coreConnectionError(socket->errorString());
+  socket->deleteLater();
 }
 
-void Client::serverHasData() {
+void Client::coreHasData() {
   QVariant item;
-  while(readDataFromDevice(&socket, blockSize, item)) {
+  if(readDataFromDevice(socket, blockSize, item)) {
     emit recvPartialItem(1,1);
-    QList<QVariant> sigdata = item.toList();
-    Q_ASSERT(sigdata.size() == 4);
-    ClientProxy::instance()->recv((CoreSignal)sigdata[0].toInt(), sigdata[1], sigdata[2], sigdata[3]);
+    QVariantMap msg = item.toMap();
+    if (!msg["StartWizard"].toBool()) {
+      recvCoreState(msg["Reply"]);
+    } else {
+      qWarning("Core not configured!");
+      qDebug() << "Available storage providers: " << msg["StorageProviders"].toStringList();
+      emit showConfigWizard(msg);
+    }
     blockSize = 0;
+    return;
   }
   if(blockSize > 0) {
-    emit recvPartialItem(socket.bytesAvailable(), blockSize);
+    emit recvPartialItem(socket->bytesAvailable(), blockSize);
   }
 }
 
-void Client::networkConnected(QString net) {
-  Q_ASSERT(!netsAwaitingInit.contains(net));
-  netConnected[net] = true;
-  BufferId id = statusBufferId(net);
-  Buffer *b = buffer(id);
-  b->setActive(true);
-  //b->displayMsg(Message(id, Message::Server, tr("Connected.")));
-  // TODO buffersUpdated();
-}
+void Client::networkConnected(uint netid) {
+  // TODO: create statusBuffer / switch to networkids
+  //BufferInfo id = statusBufferInfo(net);
+  //Buffer *b = buffer(id);
+  //b->setActive(true);
 
-void Client::networkDisconnected(QString net) {
-  foreach(BufferId id, buffers.keys()) {
-    if(id.network() != net) continue;
-    Buffer *b = buffer(id);
-    //b->displayMsg(Message(id, Message::Server, tr("Server disconnected."))); FIXME
-    b->setActive(false);
-  }
-  netConnected[net] = false;
-  if(netsAwaitingInit.contains(net)) {
-    qDebug() << "Network" << net << "disconnected while not yet initialized!";
-    netsAwaitingInit.removeAll(net);
-    emit coreConnectionProgress(netConnected.count(), netConnected.count() + netsAwaitingInit.count());
-    if(!netsAwaitingInit.count()) emit connected();
+  // FIXME EgS: do we really need to call updateCoreConnectionProgress whenever a new network is connected?
+  NetworkInfo *netinfo = new NetworkInfo(netid, signalProxy(), this);
+  if(!isConnected()) {
+    connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress()));
+    connect(netinfo, SIGNAL(ircUserInitDone()), this, SLOT(updateCoreConnectionProgress()));
+    connect(netinfo, SIGNAL(ircChannelInitDone()), this, SLOT(updateCoreConnectionProgress()));
   }
+  connect(netinfo, SIGNAL(destroyed()), this, SLOT(networkInfoDestroyed()));
+  _networkInfo[netid] = netinfo;
 }
 
-void Client::updateBufferId(BufferId id) {
-  bufferIds[id.uid()] = id;  // make lookups by id faster
-  buffer(id);
-}
+void Client::networkDisconnected(uint networkid) {
+  foreach(Buffer *buffer, buffers()) {
+    if(buffer->bufferInfo().networkId() != networkid)
+      continue;
 
-BufferId Client::bufferId(QString net, QString buf) {
-  foreach(BufferId id, buffers.keys()) {
-    if(id.network() == net && id.buffer() == buf) return id;
+    //buffer->displayMsg(Message(bufferid, Message::Server, tr("Server disconnected."))); FIXME
+    buffer->setActive(false);
+  }
+  
+  Q_ASSERT(networkInfo(networkid));
+  if(!networkInfo(networkid)->initialized()) {
+    qDebug() << "Network" << networkid << "disconnected while not yet initialized!";
+    updateCoreConnectionProgress();
   }
-  Q_ASSERT(false);  // should never happen!
-  return BufferId();
-}
-
-BufferId Client::statusBufferId(QString net) {
-  return bufferId(net, "");
 }
 
-
-Buffer * Client::buffer(BufferId id) {
-  Client *client = Client::instance();
-  if(!buffers.contains(id)) {
-    Buffer *b = new Buffer(id);
-    b->setOwnNick(ownNick[id.network()]);
-    connect(b, SIGNAL(userInput(BufferId, QString)), client, SLOT(userInput(BufferId, QString)));
-    connect(b, SIGNAL(bufferUpdated(Buffer *)), client, SIGNAL(bufferUpdated(Buffer *)));
-    connect(b, SIGNAL(bufferDestroyed(Buffer *)), client, SIGNAL(bufferDestroyed(Buffer *)));
-    buffers[id] = b;
-    emit client->bufferUpdated(b);
-  }
-  return buffers[id];
+void Client::updateBufferInfo(BufferInfo id) {
+  buffer(id)->updateBufferInfo(id);
 }
 
-QList<BufferId> Client::allBufferIds() {
-  return buffers.keys();
+void Client::bufferDestroyed() {
+  Buffer *buffer = static_cast<Buffer *>(sender());
+  uint bufferUid = buffer->uid();
+  if(_buffers.contains(bufferUid))
+    _buffers.remove(bufferUid);
 }
 
-void Client::recvNetworkState(QString net, QVariant state) {
-  netsAwaitingInit.removeAll(net);
-  netConnected[net] = true;
-  setOwnNick(net, state.toMap()["OwnNick"].toString());
-  buffer(statusBufferId(net))->setActive(true);
-  VarMap t = state.toMap()["Topics"].toMap();
-  VarMap n = state.toMap()["Nicks"].toMap();
-  foreach(QVariant v, t.keys()) {
-    QString buf = v.toString();
-    BufferId id = bufferId(net, buf);
-    buffer(id)->setActive(true);
-    setTopic(net, buf, t[buf].toString());
-  }
-  foreach(QString nick, n.keys()) {
-    addNick(net, nick, n[nick].toMap());
-  }
-  emit coreConnectionProgress(netConnected.count(), netConnected.count() + netsAwaitingInit.count());
-  if(!netsAwaitingInit.count()) emit connected();
+void Client::networkInfoDestroyed() {
+  NetworkInfo *netinfo = static_cast<NetworkInfo *>(sender());
+  uint networkId = netinfo->networkId();
+  if(_networkInfo.contains(networkId))
+    _networkInfo.remove(networkId);
 }
 
 void Client::recvMessage(const Message &msg) {
-  Buffer *b = buffer(msg.buffer);
+  Buffer *b = buffer(msg.buffer());
 
   Buffer::ActivityLevel level = Buffer::OtherActivity;
-  if(msg.type == Message::Plain || msg.type == Message::Notice){
+  if(msg.type() == Message::Plain || msg.type() == Message::Notice){
     level |= Buffer::NewMessage;
   }
-  if(msg.flags & Message::Highlight){
+  if(msg.flags() & Message::Highlight){
     level |= Buffer::Highlight;
   }
   emit bufferActivity(level, b);
@@ -355,10 +504,9 @@ void Client::recvMessage(const Message &msg) {
 
 void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
   //recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg)));
-
 }
 
-void Client::recvBacklogData(BufferId id, const QList<QVariant> &msgs, bool /*done*/) {
+void Client::recvBacklogData(BufferInfo id, QVariantList msgs, bool /*done*/) {
   Buffer *b = buffer(id);
   foreach(QVariant v, msgs) {
     Message msg = v.value<Message>();
@@ -371,79 +519,19 @@ void Client::recvBacklogData(BufferId id, const QList<QVariant> &msgs, bool /*do
 void Client::layoutMsg() {
   if(layoutQueue.count()) {
     Buffer *b = layoutQueue.takeFirst();  // TODO make this the current buffer
-    if(b->layoutMsg()) layoutQueue.append(b);  // Buffer has more messages in its queue --> Round Robin
+    if(b->layoutMsg())
+      layoutQueue.append(b);  // Buffer has more messages in its queue --> Round Robin
   }
-  if(!layoutQueue.count()) layoutTimer->stop();
+  
+  if(!layoutQueue.count())
+    layoutTimer->stop();
 }
 
 AbstractUiMsg *Client::layoutMsg(const Message &msg) {
   return instance()->mainUi->layoutMsg(msg);
 }
 
-void Client::userInput(BufferId id, QString msg) {
+void Client::userInput(BufferInfo id, QString msg) {
   emit sendInput(id, msg);
 }
 
-void Client::setTopic(QString net, QString buf, QString topic) {
-  BufferId id = bufferId(net, buf);
-  if(!netConnected[id.network()]) return;
-  Buffer *b = buffer(id);
-  b->setTopic(topic);
-  //if(!b->isActive()) {
-  //  b->setActive(true);
-  //  buffersUpdated();
-  //}
-}
-
-void Client::addNick(QString net, QString nick, VarMap props) {
-  if(!netConnected[net]) return;
-  nicks[net][nick] = props;
-  VarMap chans = props["Channels"].toMap();
-  QStringList c = chans.keys();
-  foreach(QString bufname, c) {
-    buffer(bufferId(net, bufname))->addNick(nick, props);
-  }
-}
-
-void Client::renameNick(QString net, QString oldnick, QString newnick) {
-  if(!netConnected[net]) return;
-  QStringList chans = nicks[net][oldnick]["Channels"].toMap().keys();
-  foreach(QString c, chans) {
-    buffer(bufferId(net, c))->renameNick(oldnick, newnick);
-  }
-  nicks[net][newnick] = nicks[net].take(oldnick);
-}
-
-void Client::updateNick(QString net, QString nick, VarMap props) {
-  if(!netConnected[net]) return;
-  QStringList oldchans = nicks[net][nick]["Channels"].toMap().keys();
-  QStringList newchans = props["Channels"].toMap().keys();
-  foreach(QString c, newchans) {
-    if(oldchans.contains(c)) buffer(bufferId(net, c))->updateNick(nick, props);
-    else buffer(bufferId(net, c))->addNick(nick, props);
-  }
-  foreach(QString c, oldchans) {
-    if(!newchans.contains(c)) buffer(bufferId(net, c))->removeNick(nick);
-  }
-  nicks[net][nick] = props;
-}
-
-void Client::removeNick(QString net, QString nick) {
-  if(!netConnected[net]) return;
-  VarMap chans = nicks[net][nick]["Channels"].toMap();
-  foreach(QString bufname, chans.keys()) {
-    buffer(bufferId(net, bufname))->removeNick(nick);
-  }
-  nicks[net].remove(nick);
-}
-
-void Client::setOwnNick(QString net, QString nick) {
-  if(!netConnected[net]) return;
-  ownNick[net] = nick;
-  foreach(BufferId id, buffers.keys()) {
-    if(id.network() == net) {
-      buffers[id]->setOwnNick(nick);
-    }
-  }
-}
-