X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=4003783f202f5a09e727187d9f27ddcfa1bbe170;hp=cd75f660c3edb410963764364470fae5051b9a8e;hb=444e91f948b435e652205c4d0f1148906e9e86dc;hpb=21d8d7f0a79eeeb541664aa80ce481fdbfc41f09

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index cd75f660..4003783f 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -18,13 +18,19 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <QtScript>
+
+#include "core.h"
 #include "coresession.h"
-#include "server.h"
+#include "networkconnection.h"
 
 #include "signalproxy.h"
+#include "buffersyncer.h"
+#include "corebacklogmanager.h"
+#include "corebufferviewmanager.h"
 #include "storage.h"
 
-#include "networkinfo.h"
+#include "network.h"
 #include "ircuser.h"
 #include "ircchannel.h"
 #include "identity.h"
@@ -32,209 +38,265 @@
 #include "util.h"
 #include "coreusersettings.h"
 
-#include <QtScript>
-
-CoreSession::CoreSession(UserId uid, Storage *_storage, QObject *parent)
+CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
   : QObject(parent),
-    user(uid),
+    _user(uid),
     _signalProxy(new SignalProxy(SignalProxy::Server, 0, this)),
-    storage(_storage),
+    _bufferSyncer(new BufferSyncer(this)),
+    _backlogManager(new CoreBacklogManager(this)),
+    _bufferViewManager(new CoreBufferViewManager(_signalProxy, this)),
     scriptEngine(new QScriptEngine(this))
 {
 
   SignalProxy *p = signalProxy();
+  connect(p, SIGNAL(peerRemoved(QIODevice *)), this, SLOT(removeClient(QIODevice *)));
+  
+  //p->attachSlot(SIGNAL(disconnectFromNetwork(NetworkId)), this, SLOT(disconnectFromNetwork(NetworkId))); // FIXME
+  p->attachSlot(SIGNAL(sendInput(BufferInfo, QString)), this, SLOT(msgFromClient(BufferInfo, QString)));
+  p->attachSignal(this, SIGNAL(displayMsg(Message)));
+  p->attachSignal(this, SIGNAL(displayStatusMsg(QString, QString)));
+  p->attachSignal(this, SIGNAL(bufferInfoUpdated(BufferInfo)));
+
+  p->attachSignal(this, SIGNAL(identityCreated(const Identity &)));
+  p->attachSignal(this, SIGNAL(identityRemoved(IdentityId)));
+  p->attachSlot(SIGNAL(createIdentity(const Identity &)), this, SLOT(createIdentity(const Identity &)));
+  p->attachSlot(SIGNAL(updateIdentity(const Identity &)), this, SLOT(updateIdentity(const Identity &)));
+  p->attachSlot(SIGNAL(removeIdentity(IdentityId)), this, SLOT(removeIdentity(IdentityId)));
+
+  p->attachSignal(this, SIGNAL(networkCreated(NetworkId)));
+  p->attachSignal(this, SIGNAL(networkRemoved(NetworkId)));
+  p->attachSlot(SIGNAL(createNetwork(const NetworkInfo &)), this, SLOT(createNetwork(const NetworkInfo &)));
+  p->attachSlot(SIGNAL(updateNetwork(const NetworkInfo &)), this, SLOT(updateNetwork(const NetworkInfo &)));
+  p->attachSlot(SIGNAL(removeNetwork(NetworkId)), this, SLOT(removeNetwork(NetworkId)));
+
+  loadSettings();
+  initScriptEngine();
+
+  // init BufferSyncer
+  QHash<BufferId, MsgId> lastSeenHash = Core::bufferLastSeenMsgIds(user());
+  foreach(BufferId id, lastSeenHash.keys())
+    _bufferSyncer->requestSetLastSeenMsg(id, lastSeenHash[id]);
+  
+  connect(_bufferSyncer, SIGNAL(lastSeenMsgSet(BufferId, MsgId)), this, SLOT(storeBufferLastSeenMsg(BufferId, MsgId)));
+  connect(_bufferSyncer, SIGNAL(removeBufferRequested(BufferId)), this, SLOT(removeBufferRequested(BufferId)));
+  connect(this, SIGNAL(bufferRemoved(BufferId)), _bufferSyncer, SLOT(removeBuffer(BufferId)));
+  connect(this, SIGNAL(bufferRenamed(BufferId, QString)), _bufferSyncer, SLOT(renameBuffer(BufferId, QString)));
+  p->synchronize(_bufferSyncer);
+
+
+  // init BacklogManager;
+  p->synchronize(_backlogManager);
+    
+  // Restore session state
+  if(restoreState) restoreSessionState();
+
+  emit initialized();
+}
+
+CoreSession::~CoreSession() {
+  saveSessionState();
+  foreach(NetworkConnection *conn, _connections.values()) {
+    delete conn;
+  }
+  foreach(Network *net, _networks.values()) {
+    delete net;
+  }
+}
+
+UserId CoreSession::user() const {
+  return _user;
+}
+
+Network *CoreSession::network(NetworkId id) const {
+  if(_networks.contains(id)) return _networks[id];
+  return 0;
+}
+
+NetworkConnection *CoreSession::networkConnection(NetworkId id) const {
+  if(_connections.contains(id)) return _connections[id];
+  return 0;
+}
+
+Identity *CoreSession::identity(IdentityId id) const {
+  if(_identities.contains(id)) return _identities[id];
+  return 0;
+}
+
+void CoreSession::loadSettings() {
+  CoreUserSettings s(user());
 
-  CoreUserSettings s(user);
-  sessionData = s.sessionData();
-#ifdef SPUTDEV
   foreach(IdentityId id, s.identityIds()) {
     Identity *i = new Identity(s.identity(id), this);
     if(!i->isValid()) {
-      qDebug() << QString("Invalid identity!");
+      qWarning() << QString("Invalid identity! Removing...");
+      s.removeIdentity(id);
       delete i;
       continue;
     }
     if(_identities.contains(i->id())) {
-      qDebug() << "Duplicate identity, ignoring!";
+      qWarning() << "Duplicate identity, ignoring!";
       delete i;
       continue;
     }
     _identities[i->id()] = i;
+    signalProxy()->synchronize(i);
   }
   if(!_identities.count()) {
     Identity i(1);
     i.setToDefaults();
+    i.setIdentityName(tr("Default Identity"));
     createIdentity(i);
   }
-#endif
-
-  p->attachSlot(SIGNAL(requestNetworkStates()), this, SLOT(serverStateRequested()));
-  p->attachSlot(SIGNAL(requestConnect(QString)), this, SLOT(connectToNetwork(QString)));
-  p->attachSlot(SIGNAL(sendInput(BufferInfo, QString)), this, SLOT(msgFromGui(BufferInfo, QString)));
-  p->attachSlot(SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)), this, SLOT(sendBacklog(BufferInfo, QVariant, QVariant)));
-  p->attachSignal(this, SIGNAL(displayMsg(Message)));
-  p->attachSignal(this, SIGNAL(displayStatusMsg(QString, QString)));
-  p->attachSignal(this, SIGNAL(backlogData(BufferInfo, QVariantList, bool)));
-  p->attachSignal(this, SIGNAL(bufferInfoUpdated(BufferInfo)));
-  p->attachSignal(storage, SIGNAL(bufferInfoUpdated(BufferInfo)));
-  p->attachSignal(this, SIGNAL(sessionDataChanged(const QString &, const QVariant &)), SIGNAL(coreSessionDataChanged(const QString &, const QVariant &)));
-  p->attachSlot(SIGNAL(clientSessionDataChanged(const QString &, const QVariant &)), this, SLOT(storeSessionData(const QString &, const QVariant &)));
 
-  p->attachSignal(this, SIGNAL(identityCreated(const Identity &)));
-  p->attachSignal(this, SIGNAL(identityRemoved(IdentityId)));
-  p->attachSlot(SIGNAL(createIdentity(const Identity &)), this, SLOT(createIdentity(const Identity &)));
-  p->attachSlot(SIGNAL(updateIdentity(const Identity &)), this, SLOT(updateIdentity(const Identity &)));
-  p->attachSlot(SIGNAL(removeIdentity(IdentityId)), this, SLOT(removeIdentity(IdentityId)));
+  foreach(NetworkInfo info, Core::networks(user())) {
+    createNetwork(info);
+  }
+}
 
-  initScriptEngine();
+void CoreSession::saveSessionState() const {
 
-  foreach(Identity *id, _identities.values()) {
-    p->synchronize(id);
-  }
 }
 
-CoreSession::~CoreSession() {
+void CoreSession::restoreSessionState() {
+  QList<NetworkId> nets = Core::connectedNetworks(user());
+  foreach(NetworkId id, nets) {
+    connectToNetwork(id);
+  }
 }
 
-UserId CoreSession::userId() const {
-  return user;
+void CoreSession::updateBufferInfo(UserId uid, const BufferInfo &bufinfo) {
+  if(uid == user()) emit bufferInfoUpdated(bufinfo);
 }
 
-QVariant CoreSession::state() const {
-  QVariantMap res;
-  QList<QVariant> conn;
-  foreach(Server *server, servers.values()) {
-    if(server->isConnected()) {
-      QVariantMap m;
-      m["Network"] = server->networkName();
-      m["State"] = server->state();
-      conn << m;
-    }
+void CoreSession::connectToNetwork(NetworkId id) {
+  Network *net = network(id);
+  if(!net) {
+    qWarning() << "Connect to unknown network requested! net:" << id << "user:" << user();
+    return;
   }
-  res["ConnectedServers"] = conn;
-  return res;
-}
-
-void CoreSession::restoreState(const QVariant &previousState) {
-  // Session restore
-  QVariantMap state = previousState.toMap();
-  if(state.contains("ConnectedServers")) {
-    foreach(QVariant v, state["ConnectedServers"].toList()) {
-      QVariantMap m = v.toMap();
-      QString net = m["Network"].toString();
-      if(!net.isEmpty()) connectToNetwork(net, m["State"]);
-    }
+
+  NetworkConnection *conn = networkConnection(id);
+  if(!conn) {
+    conn = new NetworkConnection(net, this);
+    _connections[id] = conn;
+    attachNetworkConnection(conn);
   }
+  conn->connectToIrc();
 }
 
+void CoreSession::attachNetworkConnection(NetworkConnection *conn) {
+  connect(conn, SIGNAL(connected(NetworkId)), this, SLOT(networkConnected(NetworkId)));
+  connect(conn, SIGNAL(quitRequested(NetworkId)), this, SLOT(networkDisconnected(NetworkId)));
+
+  // I guess we don't need these anymore, client-side can just connect the network's signals directly
+  //signalProxy()->attachSignal(conn, SIGNAL(connected(NetworkId)), SIGNAL(networkConnected(NetworkId)));
+  //signalProxy()->attachSignal(conn, SIGNAL(disconnected(NetworkId)), SIGNAL(networkDisconnected(NetworkId)));
 
-void CoreSession::storeSessionData(const QString &key, const QVariant &data) {
-  CoreUserSettings s(user);
-  mutex.lock();
-  s.setSessionValue(key, data);
-  sessionData[key] = data;
-  mutex.unlock();
-  emit sessionDataChanged(key, data);
-  emit sessionDataChanged(key);
+  connect(conn, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)),
+	  this, SLOT(recvMessageFromServer(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)));
+  connect(conn, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString)));
+
+  connect(conn, SIGNAL(nickChanged(const NetworkId &, const QString &, const QString &)),
+	  this, SLOT(renameBuffer(const NetworkId &, const QString &, const QString &)));
+  connect(conn, SIGNAL(channelJoined(NetworkId, const QString &, const QString &)),
+          this, SLOT(channelJoined(NetworkId, const QString &, const QString &)));
+  connect(conn, SIGNAL(channelParted(NetworkId, const QString &)),
+          this, SLOT(channelParted(NetworkId, const QString &)));
 }
 
-QVariant CoreSession::retrieveSessionData(const QString &key, const QVariant &def) {
-  QVariant data;
-  mutex.lock();
-  if(!sessionData.contains(key)) data = def;
-  else data = sessionData[key];
-  mutex.unlock();
-  return data;
+void CoreSession::disconnectFromNetwork(NetworkId id) {
+  if(!_connections.contains(id)) return;
+  _connections[id]->disconnectFromIrc();
 }
 
-// FIXME switch to NetworkIDs
-void CoreSession::connectToNetwork(QString network, const QVariant &previousState) {
-  uint networkid = getNetworkId(network);
-  if(networkid == 0) {
-    qWarning() << "unable to connect to Network" << network << "(User:" << userId() << "): unable to determine NetworkId";
-    return;
-  }
-  if(!servers.contains(networkid)) {
-    Server *server = new Server(userId(), networkid, network, previousState);
-    servers[networkid] = server;
-    attachServer(server);
-    server->start();
+void CoreSession::networkStateRequested() {
+}
+
+void CoreSession::addClient(QObject *dev) { // this is QObject* so we can use it in signal connections
+  QIODevice *device = qobject_cast<QIODevice *>(dev);
+  if(!device) {
+    qWarning() << "Invoking CoreSession::addClient with a QObject that is not a QIODevice!";
+  } else {
+    signalProxy()->addPeer(device);
+    QVariantMap reply;
+    reply["MsgType"] = "SessionInit";
+    reply["SessionState"] = sessionState();
+    SignalProxy::writeDataToDevice(device, reply);
   }
-  emit connectToIrc(network);
 }
 
-void CoreSession::attachServer(Server *server) {
-  connect(this, SIGNAL(connectToIrc(QString)), server, SLOT(connectToIrc(QString)));
-  connect(this, SIGNAL(disconnectFromIrc(QString)), server, SLOT(disconnectFromIrc(QString)));
-  connect(this, SIGNAL(msgFromGui(uint, QString, QString)), server, SLOT(userInput(uint, QString, QString)));
-  
-  connect(server, SIGNAL(connected(uint)), this, SLOT(serverConnected(uint)));
-  connect(server, SIGNAL(disconnected(uint)), this, SLOT(serverDisconnected(uint)));
-  connect(server, SIGNAL(displayMsg(Message::Type, QString, QString, QString, quint8)), this, SLOT(recvMessageFromServer(Message::Type, QString, QString, QString, quint8)));
-  connect(server, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString)));
+void CoreSession::removeClient(QIODevice *iodev) {
+  // no checks for validity check - privateslot...
+  QTcpSocket *socket = qobject_cast<QTcpSocket *>(iodev);
+  if(socket)
+    qDebug() << qPrintable(tr("Client %1 disconnected (UserId: %2).").arg(socket->peerAddress().toString()).arg(user().toInt()));
+  else
+    qDebug() << "Local client disconnedted.";
+  disconnect(socket, 0, this, 0);
+  socket->deleteLater();
+}
 
-  // connect serversignals to proxy
-  signalProxy()->attachSignal(server, SIGNAL(serverState(QString, QVariantMap)), SIGNAL(networkState(QString, QVariantMap)));
-  signalProxy()->attachSignal(server, SIGNAL(connected(uint)), SIGNAL(networkConnected(uint)));
-  signalProxy()->attachSignal(server, SIGNAL(disconnected(uint)), SIGNAL(networkDisconnected(uint)));
-  // TODO add error handling
+SignalProxy *CoreSession::signalProxy() const {
+  return _signalProxy;
 }
 
-void CoreSession::serverStateRequested() {
+// FIXME we need a sane way for creating buffers!
+void CoreSession::networkConnected(NetworkId networkid) {
+  Core::bufferInfo(user(), networkid, BufferInfo::StatusBuffer); // create status buffer
+  Core::setNetworkConnected(user(), networkid, true);
 }
 
-void CoreSession::addClient(QIODevice *device) {
-  signalProxy()->addPeer(device);
+// called now only on /quit and requested disconnects, not on normal disconnects!
+void CoreSession::networkDisconnected(NetworkId networkid) {
+  Core::setNetworkConnected(user(), networkid, false);
+  if(_connections.contains(networkid)) _connections.take(networkid)->deleteLater();
 }
 
-SignalProxy *CoreSession::signalProxy() const {
-  return _signalProxy;
+void CoreSession::channelJoined(NetworkId id, const QString &channel, const QString &key) {
+  Core::setChannelPersistent(user(), id, channel, true);
+  Core::setPersistentChannelKey(user(), id, channel, key);
 }
 
-void CoreSession::serverConnected(uint networkid) {
-  storage->getBufferInfo(userId(), servers[networkid]->networkName()); // create status buffer
+void CoreSession::channelParted(NetworkId id, const QString &channel) {
+  Core::setChannelPersistent(user(), id, channel, false);
 }
 
-void CoreSession::serverDisconnected(uint networkid) {
-  Q_ASSERT(servers.contains(networkid));
-  servers.take(networkid)->deleteLater();
-  Q_ASSERT(!servers.contains(networkid));
+QHash<QString, QString> CoreSession::persistentChannels(NetworkId id) const {
+  return Core::persistentChannels(user(), id);
+  return QHash<QString, QString>();
 }
 
-void CoreSession::msgFromGui(BufferInfo bufid, QString msg) {
-  emit msgFromGui(bufid.networkId(), bufid.buffer(), msg);
+// FIXME switch to BufferId
+void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg) {
+  NetworkConnection *conn = networkConnection(bufinfo.networkId());
+  if(conn) {
+    conn->userInput(bufinfo, msg);
+  } else {
+    qWarning() << "Trying to send to unconnected network!";
+  }
 }
 
 // ALL messages coming pass through these functions before going to the GUI.
 // So this is the perfect place for storing the backlog and log stuff.
-void CoreSession::recvMessageFromServer(Message::Type type, QString target, QString text, QString sender, quint8 flags) {
-  Server *s = qobject_cast<Server*>(this->sender());
-  Q_ASSERT(s);
-  BufferInfo buf;
-  if((flags & Message::PrivMsg) && !(flags & Message::Self)) {
-    buf = storage->getBufferInfo(user, s->networkName(), nickFromMask(sender));
-  } else {
-    buf = storage->getBufferInfo(user, s->networkName(), target);
-  }
-  Message msg(buf, type, text, sender, flags);
-  msg.setMsgId(storage->logMessage(msg));
-  Q_ASSERT(msg.msgId());
+void CoreSession::recvMessageFromServer(Message::Type type, BufferInfo::Type bufferType, QString target, QString text, QString sender, quint8 flags) {
+  NetworkConnection *netCon = qobject_cast<NetworkConnection*>(this->sender());
+  Q_ASSERT(netCon);
+  
+  BufferInfo bufferInfo = Core::bufferInfo(user(), netCon->networkId(), bufferType, target);
+  Message msg(bufferInfo, type, text, sender, flags);
+  msg.setMsgId(Core::storeMessage(msg));
+  Q_ASSERT(msg.msgId() != 0);
   emit displayMsg(msg);
 }
 
 void CoreSession::recvStatusMsgFromServer(QString msg) {
-  Server *s = qobject_cast<Server*>(sender());
+  NetworkConnection *s = qobject_cast<NetworkConnection*>(sender());
   Q_ASSERT(s);
   emit displayStatusMsg(s->networkName(), msg);
 }
 
-
-uint CoreSession::getNetworkId(const QString &net) const {
-  return storage->getNetworkId(user, net);
-}
-
 QList<BufferInfo> CoreSession::buffers() const {
-  return storage->requestBuffers(user);
+  return Core::requestBuffers(user());
 }
 
 
@@ -242,61 +304,48 @@ QVariant CoreSession::sessionState() {
   QVariantMap v;
 
   QVariantList bufs;
-  foreach(BufferInfo id, storage->requestBuffers(user))
-    bufs.append(QVariant::fromValue(id));
-  v["Buffers"] = bufs;
-
-  mutex.lock();
-  v["SessionData"] = sessionData;
-  mutex.unlock();
-
-  QVariantList networks;
-  foreach(NetworkId networkid, servers.keys())
-    networks.append(QVariant(networkid));
-  v["Networks"] = QVariant(networks);
+  foreach(BufferInfo id, buffers()) bufs << qVariantFromValue(id);
+  v["BufferInfos"] = bufs;
+  QVariantList networkids;
+  foreach(NetworkId id, _networks.keys()) networkids << qVariantFromValue(id);
+  v["NetworkIds"] = networkids;
+
+  quint32 ircusercount = 0;
+  quint32 ircchannelcount = 0;
+  foreach(Network *net, _networks.values()) {
+    ircusercount += net->ircUserCount();
+    ircchannelcount += net->ircChannelCount();
+  }
+  v["IrcUserCount"] = ircusercount;
+  v["IrcChannelCount"] = ircchannelcount;
 
   QList<QVariant> idlist;
-  foreach(Identity *i, _identities.values()) idlist << QVariant::fromValue<Identity>(*i);
+  foreach(Identity *i, _identities.values()) idlist << qVariantFromValue(*i);
   v["Identities"] = idlist;
 
-  // v["Payload"] = QByteArray(100000000, 'a');  // for testing purposes
+  //v["Payload"] = QByteArray(100000000, 'a');  // for testing purposes
   return v;
 }
 
-void CoreSession::sendBacklog(BufferInfo id, QVariant v1, QVariant v2) {
-  QList<QVariant> log;
-  QList<Message> msglist;
-  if(v1.type() == QVariant::DateTime) {
-
-
-  } else {
-    msglist = storage->requestMsgs(id, v1.toInt(), v2.toInt());
-  }
-
-  // Send messages out in smaller packages - we don't want to make the signal data too large!
-  for(int i = 0; i < msglist.count(); i++) {
-    log.append(QVariant::fromValue(msglist[i]));
-    if(log.count() >= 5) {
-      emit backlogData(id, log, i >= msglist.count() - 1);
-      log.clear();
-    }
-  }
-  if(log.count() > 0) emit backlogData(id, log, true);
+void CoreSession::storeBufferLastSeenMsg(BufferId buffer, const MsgId &msgId) {
+  Core::setBufferLastSeenMsg(user(), buffer, msgId);
 }
 
-
 void CoreSession::initScriptEngine() {
   signalProxy()->attachSlot(SIGNAL(scriptRequest(QString)), this, SLOT(scriptRequest(QString)));
   signalProxy()->attachSignal(this, SIGNAL(scriptResult(QString)));
-  
-  QScriptValue storage_ = scriptEngine->newQObject(storage);
-  scriptEngine->globalObject().setProperty("storage", storage_);
+
+  // FIXME
+  //QScriptValue storage_ = scriptEngine->newQObject(storage);
+  //scriptEngine->globalObject().setProperty("storage", storage_);
 }
 
 void CoreSession::scriptRequest(QString script) {
   emit scriptResult(scriptEngine->evaluate(script).toString());
 }
 
+/*** Identity Handling ***/
+
 void CoreSession::createIdentity(const Identity &id) {
   // find free ID
   int i;
@@ -308,9 +357,9 @@ void CoreSession::createIdentity(const Identity &id) {
   newId->setId(i);
   _identities[i] = newId;
   signalProxy()->synchronize(newId);
-  CoreUserSettings s(user);
+  CoreUserSettings s(user());
   s.storeIdentity(*newId);
-  emit identityCreated(i);
+  emit identityCreated(*newId);
 }
 
 void CoreSession::updateIdentity(const Identity &id) {
@@ -320,7 +369,7 @@ void CoreSession::updateIdentity(const Identity &id) {
   }
   _identities[id.id()]->update(id);
 
-  CoreUserSettings s(user);
+  CoreUserSettings s(user());
   s.storeIdentity(id);
 }
 
@@ -328,9 +377,98 @@ void CoreSession::removeIdentity(IdentityId id) {
   Identity *i = _identities.take(id);
   if(i) {
     emit identityRemoved(id);
-    CoreUserSettings s(user);
+    CoreUserSettings s(user());
     s.removeIdentity(id);
     i->deleteLater();
   }
 }
 
+/*** Network Handling ***/
+
+void CoreSession::createNetwork(const NetworkInfo &info_) {
+  NetworkInfo info = info_;
+  int id;
+
+  if(!info.networkId.isValid())
+    Core::createNetwork(user(), info);
+
+  Q_ASSERT(info.networkId.isValid());
+
+  id = info.networkId.toInt();
+  Q_ASSERT(!_networks.contains(id));
+  
+  Network *net = new Network(id, this);
+  connect(net, SIGNAL(connectRequested(NetworkId)), this, SLOT(connectToNetwork(NetworkId)));
+  connect(net, SIGNAL(disconnectRequested(NetworkId)), this, SLOT(disconnectFromNetwork(NetworkId)));
+  net->setNetworkInfo(info);
+  net->setProxy(signalProxy());
+  _networks[id] = net;
+  signalProxy()->synchronize(net);
+  emit networkCreated(id);
+}
+
+void CoreSession::updateNetwork(const NetworkInfo &info) {
+  if(!_networks.contains(info.networkId)) {
+    qWarning() << "Update request for unknown network received!";
+    return;
+  }
+  _networks[info.networkId]->setNetworkInfo(info);
+  Core::updateNetwork(user(), info);
+}
+
+void CoreSession::removeNetwork(NetworkId id) {
+  // Make sure the network is disconnected!
+  NetworkConnection *conn = _connections.value(id, 0);
+  if(conn) {
+    if(conn->connectionState() != Network::Disconnected) {
+      connect(conn, SIGNAL(disconnected(NetworkId)), this, SLOT(destroyNetwork(NetworkId)));
+      conn->disconnectFromIrc();
+    } else {
+      _connections.take(id)->deleteLater();  // TODO make this saner
+      destroyNetwork(id);
+    }
+  } else {
+    destroyNetwork(id);
+  }
+}
+
+void CoreSession::destroyNetwork(NetworkId id) {
+  Q_ASSERT(!_connections.contains(id));
+  Network *net = _networks.take(id);
+  if(net && Core::removeNetwork(user(), id)) {
+    emit networkRemoved(id);
+    net->deleteLater();
+  }
+}
+
+void CoreSession::removeBufferRequested(BufferId bufferId) {
+  BufferInfo bufferInfo = Core::getBufferInfo(user(), bufferId);
+  if(!bufferInfo.isValid()) {
+    qWarning() << "CoreSession::removeBufferRequested(): invalid BufferId:" << bufferId << "for User:" << user();
+    return;
+  }
+  
+  if(bufferInfo.type() == BufferInfo::StatusBuffer) {
+    qWarning() << "CoreSession::removeBufferRequested(): Status Buffers cannot be removed!";
+    return;
+  }
+  
+  if(bufferInfo.type() == BufferInfo::ChannelBuffer) {
+    Network *net = network(bufferInfo.networkId());
+    Q_ASSERT(net);
+    IrcChannel *chan = net->ircChannel(bufferInfo.bufferName());
+    if(chan) {
+      qWarning() << "CoreSession::removeBufferRequested(): Unable to remove Buffer for joined Channel:" << bufferInfo.bufferName();
+      return;
+    }
+  }
+  if(Core::removeBuffer(user(), bufferId))
+    emit bufferRemoved(bufferId);
+}
+
+void CoreSession::renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName) {
+  BufferId bufferId = Core::renameBuffer(user(), networkId, newName, oldName);
+  if(bufferId.isValid()) {
+    emit bufferRenamed(bufferId, newName);
+  }
+}