X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=020950f6de73ee110f10f1ba6ed4da3d65023848;hp=2956d88c8133b1d4cdaddf7d9a9473c2378acaf4;hb=0d49f7e83bd1055711e66aa880f3a0d62f7eefc9;hpb=52df0969e22249e6758714eec9e5afd7d4fe9b83

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 2956d88c..020950f6 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -39,11 +39,13 @@
 
 #include "util.h"
 #include "coreusersettings.h"
+#include "logger.h"
 
 CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
   : QObject(parent),
     _user(uid),
     _signalProxy(new SignalProxy(SignalProxy::Server, 0, this)),
+    _aliasManager(this),
     _bufferSyncer(new BufferSyncer(this)),
     _backlogManager(new CoreBacklogManager(this)),
     _bufferViewManager(new CoreBufferViewManager(_signalProxy, this)),
@@ -54,7 +56,7 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
 
   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)));
@@ -64,13 +66,11 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
   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();
@@ -80,7 +80,7 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
   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)));
@@ -88,15 +88,18 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent)
   p->synchronize(_bufferSyncer);
 
 
-  // init BacklogManager;
+  // init alias manager
+  p->synchronize(&aliasManager());
+
+  // init BacklogManager
   p->synchronize(_backlogManager);
 
-  // init IrcListHelper;
+  // init IrcListHelper
   p->synchronize(ircListHelper());
-  
-  // init CoreInfo;
+
+  // init CoreInfo
   p->synchronize(&_coreInfo);
-  
+
   // Restore session state
   if(restoreState) restoreSessionState();
 
@@ -138,16 +141,17 @@ void CoreSession::loadSettings() {
   foreach(IdentityId id, s.identityIds()) {
     Identity *i = new Identity(s.identity(id), this);
     if(!i->isValid()) {
-      qWarning() << QString("Invalid identity! Removing...");
+      quWarning() << "Invalid identity! Removing...";
       s.removeIdentity(id);
       delete i;
       continue;
     }
     if(_identities.contains(i->id())) {
-      qWarning() << "Duplicate identity, ignoring!";
+      quWarning() << "Duplicate identity, ignoring!";
       delete i;
       continue;
     }
+    connect(i, SIGNAL(updated(const QVariantMap &)), this, SLOT(identityUpdated(const QVariantMap &)));
     _identities[i->id()] = i;
     signalProxy()->synchronize(i);
   }
@@ -181,7 +185,7 @@ void CoreSession::updateBufferInfo(UserId uid, const BufferInfo &bufinfo) {
 void CoreSession::connectToNetwork(NetworkId id) {
   CoreNetwork *net = network(id);
   if(!net) {
-    qWarning() << "Connect to unknown network requested! net:" << id << "user:" << user();
+    quWarning() << "Connect to unknown network requested! net:" << id << "user:" << user();
     return;
   }
 
@@ -217,7 +221,7 @@ void CoreSession::attachNetworkConnection(NetworkConnection *conn) {
 void CoreSession::disconnectFromNetwork(NetworkId id) {
   if(!_connections.contains(id))
     return;
-  
+
   //_connections[id]->disconnectFromIrc();
   _connections[id]->userInputHandler()->handleQuit(BufferInfo(), QString());
 }
@@ -225,11 +229,13 @@ void CoreSession::disconnectFromNetwork(NetworkId id) {
 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);
+void CoreSession::addClient(QIODevice *device) {
   if(!device) {
-    qWarning() << "Invoking CoreSession::addClient with a QObject that is not a QIODevice!";
+    quError() << "Invoking CoreSession::addClient with a QObject that is not a QIODevice!";
   } else {
+    // if the socket is an orphan, the signalProxy adopts it.
+    // -> we don't need to care about it anymore
+    device->setParent(0);
     signalProxy()->addPeer(device);
     QVariantMap reply;
     reply["MsgType"] = "SessionInit";
@@ -238,15 +244,15 @@ void CoreSession::addClient(QObject *dev) { // this is QObject* so we can use it
   }
 }
 
+void CoreSession::addClient(SignalProxy *proxy) {
+  signalProxy()->addPeer(proxy);
+  emit sessionState(sessionState());
+}
+
 void CoreSession::removeClient(QIODevice *iodev) {
-  // no checks for validity check - privateslot...
   QTcpSocket *socket = qobject_cast<QTcpSocket *>(iodev);
   if(socket)
-    qDebug() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("disconnected (UserId: %1).").arg(user().toInt()));
-  else
-    qDebug() << "Local client disconnedted.";
-  disconnect(socket, 0, this, 0);
-  socket->deleteLater();
+    quInfo() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("disconnected (UserId: %1).").arg(user().toInt()));
 }
 
 SignalProxy *CoreSession::signalProxy() const {
@@ -289,7 +295,7 @@ void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg) {
   if(conn) {
     conn->userInput(bufinfo, msg);
   } else {
-    qWarning() << "Trying to send to unconnected network:" << msg;
+    quWarning() << "Trying to send to unconnected network:" << msg;
   }
 }
 
@@ -377,20 +383,10 @@ void CoreSession::createIdentity(const Identity &id) {
   signalProxy()->synchronize(newId);
   CoreUserSettings s(user());
   s.storeIdentity(*newId);
+  connect(newId, SIGNAL(updated(const QVariantMap &)), this, SLOT(identityUpdated(const QVariantMap &)));
   emit identityCreated(*newId);
 }
 
-void CoreSession::updateIdentity(const Identity &id) {
-  if(!_identities.contains(id.id())) {
-    qWarning() << "Update request for unknown identity received!";
-    return;
-  }
-  _identities[id.id()]->update(id);
-
-  CoreUserSettings s(user());
-  s.storeIdentity(id);
-}
-
 void CoreSession::removeIdentity(IdentityId id) {
   Identity *i = _identities.take(id);
   if(i) {
@@ -401,6 +397,16 @@ void CoreSession::removeIdentity(IdentityId id) {
   }
 }
 
+void CoreSession::identityUpdated(const QVariantMap &data) {
+  IdentityId id = data.value("identityId", 0).value<IdentityId>();
+  if(!id.isValid() || !_identities.contains(id)) {
+    quWarning() << "Update request for unknown identity received!";
+    return;
+  }
+  CoreUserSettings s(user());
+  s.storeIdentity(*_identities.value(id));
+}
+
 /*** Network Handling ***/
 
 void CoreSession::createNetwork(const NetworkInfo &info_) {
@@ -411,7 +417,7 @@ void CoreSession::createNetwork(const NetworkInfo &info_) {
     Core::createNetwork(user(), info);
 
   if(!info.networkId.isValid()) {
-    qWarning() << qPrintable(tr("CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!").arg(info.networkName));
+    quWarning() << qPrintable(tr("CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!").arg(info.networkName));
     return;
   }
 
@@ -426,21 +432,11 @@ void CoreSession::createNetwork(const NetworkInfo &info_) {
     signalProxy()->synchronize(net);
     emit networkCreated(id);
   } else {
-    qWarning() << qPrintable(tr("CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!"));
-    updateNetwork(info);
+    quWarning() << qPrintable(tr("CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!"));
+    _networks[info.networkId]->requestSetNetworkInfo(info);
   }
 }
 
-// FIXME: move to CoreNetwork
-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);
@@ -476,24 +472,24 @@ void CoreSession::destroyNetwork(NetworkId id) {
 void CoreSession::removeBufferRequested(BufferId bufferId) {
   BufferInfo bufferInfo = Core::getBufferInfo(user(), bufferId);
   if(!bufferInfo.isValid()) {
-    qWarning() << "CoreSession::removeBufferRequested(): invalid BufferId:" << bufferId << "for User:" << user();
+    quWarning() << "CoreSession::removeBufferRequested(): invalid BufferId:" << bufferId << "for User:" << user();
     return;
   }
-  
+
   if(bufferInfo.type() == BufferInfo::StatusBuffer) {
-    qWarning() << "CoreSession::removeBufferRequested(): Status Buffers cannot be removed!";
+    quWarning() << "CoreSession::removeBufferRequested(): Status Buffers cannot be removed!";
     return;
   }
-  
+
   if(bufferInfo.type() == BufferInfo::ChannelBuffer) {
     CoreNetwork *net = network(bufferInfo.networkId());
     if(!net) {
-      qWarning() << "CoreSession::removeBufferRequested(): Received BufferInfo with unknown networkId!";
+      quWarning() << "CoreSession::removeBufferRequested(): Received BufferInfo with unknown networkId!";
       return;
     }
     IrcChannel *chan = net->ircChannel(bufferInfo.bufferName());
     if(chan) {
-      qWarning() << "CoreSession::removeBufferRequested(): Unable to remove Buffer for joined Channel:" << bufferInfo.bufferName();
+      quWarning() << "CoreSession::removeBufferRequested(): Unable to remove Buffer for joined Channel:" << bufferInfo.bufferName();
       return;
     }
   }