X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=0dd335876f69da4bfddfd7bd9bf7ce12ef8ed362;hb=eab5c456972d723fb3c67fe366548608f3bbeadc;hp=696825d6e6bc8d332d2e8a591b6c8da0e28cc0e1;hpb=6579cd49c867ce3fb6c99127851a881ea82d1b1b;p=quassel.git diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index 696825d6..0dd33587 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -39,6 +39,7 @@ #include "util.h" #include "coreusersettings.h" +#include "logger.h" CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObject(parent), @@ -55,7 +56,10 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) SignalProxy *p = signalProxy(); connect(p, SIGNAL(peerRemoved(QIODevice *)), this, SLOT(removeClient(QIODevice *))); - + + connect(p, SIGNAL(connected()), this, SLOT(clientsConnected())); + connect(p, SIGNAL(disconnected()), this, SLOT(clientsDisconnected())); + //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))); @@ -65,13 +69,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(); @@ -81,7 +83,7 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) QHash 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))); @@ -91,16 +93,16 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) // init alias manager p->synchronize(&aliasManager()); - + // init BacklogManager p->synchronize(_backlogManager); // init IrcListHelper p->synchronize(ircListHelper()); - + // init CoreInfo p->synchronize(&_coreInfo); - + // Restore session state if(restoreState) restoreSessionState(); @@ -117,10 +119,6 @@ CoreSession::~CoreSession() { } } -UserId CoreSession::user() const { - return _user; -} - CoreNetwork *CoreSession::network(NetworkId id) const { if(_networks.contains(id)) return _networks[id]; return 0; @@ -142,16 +140,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); } @@ -185,7 +184,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; } @@ -221,7 +220,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()); } @@ -229,11 +228,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(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"; @@ -242,15 +243,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(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 { @@ -293,7 +294,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; } } @@ -381,20 +382,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) { @@ -405,6 +396,16 @@ void CoreSession::removeIdentity(IdentityId id) { } } +void CoreSession::identityUpdated(const QVariantMap &data) { + IdentityId id = data.value("identityId", 0).value(); + 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_) { @@ -415,7 +416,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; } @@ -430,19 +431,9 @@ 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); - } -} - -// FIXME: move to CoreNetwork -void CoreSession::updateNetwork(const NetworkInfo &info) { - if(!_networks.contains(info.networkId)) { - qWarning() << "Update request for unknown network received!"; - return; + quWarning() << qPrintable(tr("CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!")); + _networks[info.networkId]->requestSetNetworkInfo(info); } - _networks[info.networkId]->setNetworkInfo(info); - Core::updateNetwork(user(), info); } void CoreSession::removeNetwork(NetworkId id) { @@ -480,24 +471,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; } } @@ -511,3 +502,65 @@ void CoreSession::renameBuffer(const NetworkId &networkId, const QString &newNam emit bufferRenamed(bufferId, newName); } } + +void CoreSession::clientsConnected() { + QHash::iterator conIter = _connections.begin(); + Identity *identity = 0; + NetworkConnection *con = 0; + Network *network = 0; + IrcUser *me = 0; + QString awayReason; + while(conIter != _connections.end()) { + con = *conIter; + conIter++; + + if(!con->isConnected()) + continue; + identity = con->identity(); + if(!identity) + continue; + network = con->network(); + if(!network) + continue; + me = network->me(); + if(!me) + continue; + + if(identity->detachAwayEnabled() && me->isAway()) { + con->userInputHandler()->handleAway(BufferInfo(), QString()); + } + } +} + +void CoreSession::clientsDisconnected() { + QHash::iterator conIter = _connections.begin(); + Identity *identity = 0; + NetworkConnection *con = 0; + Network *network = 0; + IrcUser *me = 0; + QString awayReason; + while(conIter != _connections.end()) { + con = *conIter; + conIter++; + + if(!con->isConnected()) + continue; + identity = con->identity(); + if(!identity) + continue; + network = con->network(); + if(!network) + continue; + me = network->me(); + if(!me) + continue; + + if(identity->detachAwayEnabled() && !me->isAway()) { + if(identity->detachAwayReasonEnabled()) + awayReason = identity->detachAwayReason(); + else + awayReason = identity->awayReason(); + con->userInputHandler()->handleAway(BufferInfo(), awayReason); + } + } +}