X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=07ba5a16b79083f5b047a9ea10994b241aa14791;hp=94cf39eb8fa8bb2a62f4024f74c8b2f099e478cc;hb=52a7b4d0f289f075aa386445a47d876743bcb6d0;hpb=464a20552a20ff976ef4d696f69bc73b389886ad diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index 94cf39eb..07ba5a16 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -23,14 +23,16 @@ #include "core.h" #include "coresession.h" #include "networkconnection.h" +#include "userinputhandler.h" #include "signalproxy.h" #include "buffersyncer.h" #include "corebacklogmanager.h" #include "corebufferviewmanager.h" +#include "coreirclisthelper.h" #include "storage.h" -#include "network.h" +#include "corenetwork.h" #include "ircuser.h" #include "ircchannel.h" #include "identity.h" @@ -45,6 +47,7 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) _bufferSyncer(new BufferSyncer(this)), _backlogManager(new CoreBacklogManager(this)), _bufferViewManager(new CoreBufferViewManager(_signalProxy, this)), + _ircListHelper(new CoreIrcListHelper(this)), scriptEngine(new QScriptEngine(this)) { @@ -86,7 +89,10 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) // init BacklogManager; p->synchronize(_backlogManager); - + + // init IrcListHelper; + p->synchronize(ircListHelper()); + // Restore session state if(restoreState) restoreSessionState(); @@ -98,7 +104,7 @@ CoreSession::~CoreSession() { foreach(NetworkConnection *conn, _connections.values()) { delete conn; } - foreach(Network *net, _networks.values()) { + foreach(CoreNetwork *net, _networks.values()) { delete net; } } @@ -107,7 +113,7 @@ UserId CoreSession::user() const { return _user; } -Network *CoreSession::network(NetworkId id) const { +CoreNetwork *CoreSession::network(NetworkId id) const { if(_networks.contains(id)) return _networks[id]; return 0; } @@ -169,7 +175,7 @@ void CoreSession::updateBufferInfo(UserId uid, const BufferInfo &bufinfo) { } void CoreSession::connectToNetwork(NetworkId id) { - Network *net = network(id); + CoreNetwork *net = network(id); if(!net) { qWarning() << "Connect to unknown network requested! net:" << id << "user:" << user(); return; @@ -192,8 +198,8 @@ void CoreSession::attachNetworkConnection(NetworkConnection *conn) { //signalProxy()->attachSignal(conn, SIGNAL(connected(NetworkId)), SIGNAL(networkConnected(NetworkId))); //signalProxy()->attachSignal(conn, SIGNAL(disconnected(NetworkId)), SIGNAL(networkDisconnected(NetworkId))); - 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(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)), + this, SLOT(recvMessageFromServer(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags))); connect(conn, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString))); connect(conn, SIGNAL(nickChanged(const NetworkId &, const QString &, const QString &)), @@ -205,8 +211,11 @@ void CoreSession::attachNetworkConnection(NetworkConnection *conn) { } void CoreSession::disconnectFromNetwork(NetworkId id) { - if(!_connections.contains(id)) return; - _connections[id]->disconnectFromIrc(); + if(!_connections.contains(id)) + return; + + //_connections[id]->disconnectFromIrc(); + _connections[id]->userInputHandler()->handleQuit(BufferInfo(), QString()); } void CoreSession::networkStateRequested() { @@ -248,8 +257,12 @@ void CoreSession::networkConnected(NetworkId networkid) { // 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(); + // if the network has already been removed, we don't have a networkconnection left either, so we don't do anything + // make sure to not depend on the network still existing when calling this function! + if(_connections.contains(networkid)) { + Core::setNetworkConnected(user(), networkid, false); + _connections.take(networkid)->deleteLater(); + } } void CoreSession::channelJoined(NetworkId id, const QString &channel, const QString &key) { @@ -278,10 +291,11 @@ void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg) { // 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, BufferInfo::Type bufferType, QString target, QString text, QString sender, quint8 flags) { +void CoreSession::recvMessageFromServer(Message::Type type, BufferInfo::Type bufferType, + QString target, QString text, QString sender, Message::Flags flags) { NetworkConnection *netCon = qobject_cast(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)); @@ -392,21 +406,28 @@ void CoreSession::createNetwork(const NetworkInfo &info_) { if(!info.networkId.isValid()) Core::createNetwork(user(), info); - Q_ASSERT(info.networkId.isValid()); + if(!info.networkId.isValid()) { + qWarning() << qPrintable(tr("CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!").arg(info.networkName)); + return; + } 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); + if(!_networks.contains(id)) { + CoreNetwork *net = new CoreNetwork(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); + } 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!"; @@ -433,9 +454,16 @@ void CoreSession::removeNetwork(NetworkId id) { } void CoreSession::destroyNetwork(NetworkId id) { - Q_ASSERT(!_connections.contains(id)); + if(_connections.contains(id)) { + // this can happen if the network was reconnecting while being removed + _connections.take(id)->deleteLater(); + } + QList removedBuffers = Core::requestBufferIdsForNetwork(user(), id); Network *net = _networks.take(id); if(net && Core::removeNetwork(user(), id)) { + foreach(BufferId bufferId, removedBuffers) { + _bufferSyncer->removeBuffer(bufferId); + } emit networkRemoved(id); net->deleteLater(); } @@ -454,8 +482,11 @@ void CoreSession::removeBufferRequested(BufferId bufferId) { } if(bufferInfo.type() == BufferInfo::ChannelBuffer) { - Network *net = network(bufferInfo.networkId()); - Q_ASSERT(net); + CoreNetwork *net = network(bufferInfo.networkId()); + if(!net) { + qWarning() << "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();