X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=7f2d808f46525824dcf5b6f75b9c766cf38afec0;hp=2677559f47fc742e3664875c0c17fe3b010bbcf0;hb=789f2172629a19a76e2c30646efc31010d24cd8a;hpb=28e33cd3255a838a045303bed073f4f9c40a3af4 diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index 2677559f..7f2d808f 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,86 +18,102 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include + #include "core.h" #include "coresession.h" -#include "networkconnection.h" - +#include "userinputhandler.h" #include "signalproxy.h" +#include "corebuffersyncer.h" +#include "corebacklogmanager.h" +#include "corebufferviewmanager.h" +#include "coreirclisthelper.h" +#include "corenetworkconfig.h" #include "storage.h" -#include "network.h" +#include "coreidentity.h" +#include "corenetwork.h" #include "ircuser.h" #include "ircchannel.h" -#include "identity.h" #include "util.h" #include "coreusersettings.h" +#include "logger.h" +#include "coreignorelistmanager.h" -#include +class ProcessMessagesEvent : public QEvent { +public: + ProcessMessagesEvent() : QEvent(QEvent::User) {} +}; -CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObject(parent), +CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) + : QObject(parent), _user(uid), _signalProxy(new SignalProxy(SignalProxy::Server, 0, this)), - scriptEngine(new QScriptEngine(this)) + _aliasManager(this), + _bufferSyncer(new CoreBufferSyncer(this)), + _backlogManager(new CoreBacklogManager(this)), + _bufferViewManager(new CoreBufferViewManager(_signalProxy, this)), + _ircListHelper(new CoreIrcListHelper(this)), + _networkConfig(new CoreNetworkConfig("GlobalNetworkConfig", this)), + _coreInfo(this), + scriptEngine(new QScriptEngine(this)), + _processMessages(false), + _ignoreListManager(this) { - 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(requestConnect(QString)), this, SLOT(connectToNetwork(QString))); - p->attachSlot(SIGNAL(disconnectFromNetwork(NetworkId)), this, SLOT(disconnectFromNetwork(NetworkId))); // FIXME p->attachSlot(SIGNAL(sendInput(BufferInfo, QString)), this, SLOT(msgFromClient(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(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(createIdentity(const Identity &, const QVariantMap &)), this, SLOT(createIdentity(const Identity &, const QVariantMap &))); 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(createNetwork(const NetworkInfo &, const QStringList &)), this, SLOT(createNetwork(const NetworkInfo &, const QStringList &))); p->attachSlot(SIGNAL(removeNetwork(NetworkId)), this, SLOT(removeNetwork(NetworkId))); loadSettings(); initScriptEngine(); + // periodically save our session state + connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), this, SLOT(saveSessionState())); + + p->synchronize(_bufferSyncer); + p->synchronize(&aliasManager()); + p->synchronize(_backlogManager); + p->synchronize(ircListHelper()); + p->synchronize(networkConfig()); + p->synchronize(&_coreInfo); + p->synchronize(&_ignoreListManager); // Restore session state - if(restoreState) restoreSessionState(); + if(restoreState) + restoreSessionState(); emit initialized(); } CoreSession::~CoreSession() { saveSessionState(); - foreach(NetworkConnection *conn, _connections.values()) { - conn->deleteLater(); - } - foreach(Network *net, _networks.values()) { - net->deleteLater(); + foreach(CoreNetwork *net, _networks.values()) { + delete net; } } -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; } -NetworkConnection *CoreSession::networkConnection(NetworkId id) const { - if(_connections.contains(id)) return _connections[id]; - return 0; -} - -Identity *CoreSession::identity(IdentityId id) const { +CoreIdentity *CoreSession::identity(IdentityId id) const { if(_identities.contains(id)) return _identities[id]; return 0; } @@ -105,152 +121,60 @@ Identity *CoreSession::identity(IdentityId id) const { void CoreSession::loadSettings() { CoreUserSettings s(user()); - foreach(IdentityId id, s.identityIds()) { - Identity *i = new Identity(s.identity(id), this); - if(!i->isValid()) { - qWarning() << QString("Invalid identity! Removing..."); - s.removeIdentity(id); - delete i; - continue; - } - if(_identities.contains(i->id())) { - qWarning() << "Duplicate identity, ignoring!"; - delete i; - continue; + // migrate to db + QList ids = s.identityIds(); + QList networkInfos = Core::networks(user()); + foreach(IdentityId id, ids) { + CoreIdentity identity(s.identity(id)); + IdentityId newId = Core::createIdentity(user(), identity); + QList::iterator networkIter = networkInfos.begin(); + while(networkIter != networkInfos.end()) { + if(networkIter->identity == id) { + networkIter->identity = newId; + Core::updateNetwork(user(), *networkIter); + networkIter = networkInfos.erase(networkIter); + } else { + networkIter++; + } } - _identities[i->id()] = i; - signalProxy()->synchronize(i); - } - if(!_identities.count()) { - Identity i(1); - i.setToDefaults(); - i.setIdentityName(tr("Default Identity")); - createIdentity(i); + s.removeIdentity(id); } + // end of migration - foreach(NetworkId id, s.networkIds()) { - NetworkInfo info = s.networkInfo(id); - createNetwork(info, true); + foreach(CoreIdentity identity, Core::identities(user())) { + createIdentity(identity); } - // FIXME Migrate old settings if available... - if(!_networks.count()) { - QVariantMap networks = s.sessionValue("Networks").toMap(); - if(networks.keys().count()) { - qWarning() << "Migrating your old network settings to the new format!"; - foreach(QString netname, networks.keys()) { - QVariantMap network = networks[netname].toMap(); - NetworkId netid = Core::networkId(user(), netname); - NetworkInfo info; - info.networkId = netid; - info.networkName = netname; - info.identity = 1; - info.codecForEncoding = "ISO-8859-15"; - info.codecForDecoding = "ISO-8859-15"; - QVariantList slist; - foreach(QVariant v, network["Servers"].toList()) { - QVariantMap server; - server["Host"] = v.toMap()["Address"]; - server["Port"] = v.toMap()["Port"]; - slist << server; - } - info.serverList = slist; - createNetwork(info, true); - } - } + foreach(NetworkInfo info, Core::networks(user())) { + createNetwork(info); } } void CoreSession::saveSessionState() const { - QVariantMap res; - QVariantList conn; - foreach(NetworkConnection *net, _connections.values()) { - QVariantMap m; - m["NetworkId"] = QVariant::fromValue(net->networkId()); - m["State"] = net->state(); - conn << m; - } - res["CoreBuild"] = Global::quasselBuild; - res["ConnectedNetworks"] = conn; - CoreUserSettings s(user()); - s.setSessionState(res); + _bufferSyncer->storeDirtyIds(); + _bufferViewManager->saveBufferViews(); + _networkConfig->save(); + _aliasManager.save(); + _ignoreListManager.save(); } void CoreSession::restoreSessionState() { - CoreUserSettings s(user()); - uint build = s.sessionState().toMap()["CoreBuild"].toUInt(); - if(build < 362) { - qWarning() << qPrintable(tr("Session state does not exist or is too old!")); - return; - } - QVariantList conn = s.sessionState().toMap()["ConnectedNetworks"].toList(); - foreach(QVariant v, conn) { - NetworkId id = v.toMap()["NetworkId"].value(); - if(_networks.keys().contains(id)) connectToNetwork(id, v.toMap()["State"]); + QList nets = Core::connectedNetworks(user()); + CoreNetwork *net = 0; + foreach(NetworkId id, nets) { + net = network(id); + Q_ASSERT(net); + net->connectToIrc(); } } -void CoreSession::updateBufferInfo(UserId uid, const BufferInfo &bufinfo) { - if(uid == user()) emit bufferInfoUpdated(bufinfo); -} - -// FIXME remove -void CoreSession::connectToNetwork(QString netname, const QVariant &previousState) { - Network *net = 0; - foreach(Network *n, _networks.values()) { - if(n->networkName() == netname) { - net = n; break; - } - } - if(!net) { - qWarning() << "Connect to unknown network requested, ignoring!"; - return; - } - connectToNetwork(net->networkId(), previousState); -} - -void CoreSession::connectToNetwork(NetworkId id, const QVariant &previousState) { - Network *net = network(id); - if(!net) { - qWarning() << "Connect to unknown network requested! net:" << id << "user:" << user(); - return; - } - - NetworkConnection *conn = networkConnection(id); - if(!conn) { - conn = new NetworkConnection(net, this, previousState); - _connections[id] = conn; - attachNetworkConnection(conn); - } - conn->connectToIrc(); -} - -void CoreSession::attachNetworkConnection(NetworkConnection *conn) { - connect(conn, SIGNAL(connected(NetworkId)), this, SLOT(networkConnected(NetworkId))); - connect(conn, SIGNAL(disconnected(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))); - - connect(conn, SIGNAL(displayMsg(Message::Type, QString, QString, QString, quint8)), this, SLOT(recvMessageFromServer(Message::Type, QString, QString, QString, quint8))); - connect(conn, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString))); - -} - -void CoreSession::disconnectFromNetwork(NetworkId id) { - if(!_connections.contains(id)) return; - _connections[id]->disconnectFromIrc(); -} - -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!"; + qCritical() << "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"; @@ -259,60 +183,111 @@ void CoreSession::addClient(QObject *dev) { // this is QObject* so we can use it } } -SignalProxy *CoreSession::signalProxy() const { - return _signalProxy; +void CoreSession::addClient(SignalProxy *proxy) { + signalProxy()->addPeer(proxy); + emit sessionState(sessionState()); } -// FIXME we need a sane way for creating buffers! -void CoreSession::networkConnected(NetworkId networkid) { - Core::bufferInfo(user(), networkConnection(networkid)->networkName()); // create status buffer +void CoreSession::removeClient(QIODevice *iodev) { + QTcpSocket *socket = qobject_cast(iodev); + if(socket) + quInfo() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("disconnected (UserId: %1).").arg(user().toInt())); } -void CoreSession::networkDisconnected(NetworkId networkid) { - // FIXME - // connection should only go away on explicit /part, and handle reconnections etcpp internally otherwise - - Q_ASSERT(_connections.contains(networkid)); - _connections.take(networkid)->deleteLater(); +QHash CoreSession::persistentChannels(NetworkId id) const { + return Core::persistentChannels(user(), id); } // FIXME switch to BufferId void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg) { - NetworkConnection *conn = networkConnection(bufinfo.networkId()); - if(conn) { - conn->userInput(bufinfo.buffer(), msg); + CoreNetwork *net = network(bufinfo.networkId()); + if(net) { + net->userInput(bufinfo, msg); } else { - qWarning() << "Trying to send to unconnected network!"; + qWarning() << "Trying to send to unconnected network:" << 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, QString target, QString text, QString sender, quint8 flags) { - NetworkConnection *s = qobject_cast(this->sender()); - Q_ASSERT(s); - BufferInfo buf; - if((flags & Message::PrivMsg) && !(flags & Message::Self)) { - buf = Core::bufferInfo(user(), s->networkName(), nickFromMask(sender)); - } else { - buf = Core::bufferInfo(user(), s->networkName(), target); +void CoreSession::recvMessageFromServer(NetworkId networkId, Message::Type type, BufferInfo::Type bufferType, + const QString &target, const QString &text_, const QString &sender, Message::Flags flags) { + + // U+FDD0 and U+FDD1 are special characters for Qt's text engine, specifically they mark the boundaries of + // text frames in a QTextDocument. This might lead to problems in widgets displaying QTextDocuments (such as + // KDE's notifications), hence we remove those just to be safe. + QString text = text_; + text.remove(QChar(0xfdd0)).remove(QChar(0xfdd1)); + + _messageQueue << RawMessage(networkId, type, bufferType, target, text, sender, flags); + if(!_processMessages) { + _processMessages = true; + QCoreApplication::postEvent(this, new ProcessMessagesEvent()); } - Message msg(buf, type, text, sender, flags); - msg.setMsgId(Core::storeMessage(msg)); - Q_ASSERT(msg.msgId() != 0); - emit displayMsg(msg); } void CoreSession::recvStatusMsgFromServer(QString msg) { - NetworkConnection *s = qobject_cast(sender()); - Q_ASSERT(s); - emit displayStatusMsg(s->networkName(), msg); + CoreNetwork *net = qobject_cast(sender()); + Q_ASSERT(net); + emit displayStatusMsg(net->networkName(), msg); } QList CoreSession::buffers() const { return Core::requestBuffers(user()); } +void CoreSession::customEvent(QEvent *event) { + if(event->type() != QEvent::User) + return; + + processMessages(); + event->accept(); +} + +void CoreSession::processMessages() { + QString networkName; + if(_messageQueue.count() == 1) { + const RawMessage &rawMsg = _messageQueue.first(); + BufferInfo bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target); + Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags); + + CoreNetwork *currentNetwork = network(bufferInfo.networkId()); + networkName = currentNetwork ? currentNetwork->networkName() : QString(""); + // if message is ignored with "HardStrictness" we discard it here + if(_ignoreListManager.match(msg, networkName) != IgnoreListManager::HardStrictness) { + Core::storeMessage(msg); + emit displayMsg(msg); + } + } else { + QHash > bufferInfoCache; + MessageList messages; + BufferInfo bufferInfo; + for(int i = 0; i < _messageQueue.count(); i++) { + const RawMessage &rawMsg = _messageQueue.at(i); + if(bufferInfoCache.contains(rawMsg.networkId) && bufferInfoCache[rawMsg.networkId].contains(rawMsg.target)) { + bufferInfo = bufferInfoCache[rawMsg.networkId][rawMsg.target]; + } else { + bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target); + bufferInfoCache[rawMsg.networkId][rawMsg.target] = bufferInfo; + } + + Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags); + CoreNetwork *currentNetwork = network(bufferInfo.networkId()); + networkName = currentNetwork ? currentNetwork->networkName() : QString(""); + // if message is ignored with "HardStrictness" we discard it here + if(_ignoreListManager.match(msg, networkName) == IgnoreListManager::HardStrictness) + continue; + messages << msg; + } + Core::storeMessages(messages); + // FIXME: extend protocol to a displayMessages(MessageList) + for(int i = 0; i < messages.count(); i++) { + emit displayMsg(messages[i]); + } + } + _processMessages = false; + _messageQueue.clear(); +} QVariant CoreSession::sessionState() { QVariantMap v; @@ -341,28 +316,6 @@ QVariant CoreSession::sessionState() { return v; } -void CoreSession::sendBacklog(BufferInfo id, QVariant v1, QVariant v2) { - QList log; - QList msglist; - if(v1.type() == QVariant::DateTime) { - - - } else { - msglist = Core::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(qVariantFromValue(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::initScriptEngine() { signalProxy()->attachSlot(SIGNAL(scriptRequest(QString)), this, SLOT(scriptRequest(QString))); signalProxy()->attachSignal(this, SIGNAL(scriptResult(QString))); @@ -377,85 +330,178 @@ void CoreSession::scriptRequest(QString script) { } /*** Identity Handling ***/ +void CoreSession::createIdentity(const Identity &identity, const QVariantMap &additional) { +#ifndef HAVE_SSL + Q_UNUSED(additional) +#endif + + CoreIdentity coreIdentity(identity); +#ifdef HAVE_SSL + if(additional.contains("KeyPem")) + coreIdentity.setSslKey(additional["KeyPem"].toByteArray()); + if(additional.contains("CertPem")) + coreIdentity.setSslCert(additional["CertPem"].toByteArray()); +#endif + qDebug() << Q_FUNC_INFO; + IdentityId id = Core::createIdentity(user(), coreIdentity); + if(!id.isValid()) + return; + else + createIdentity(coreIdentity); +} -void CoreSession::createIdentity(const Identity &id) { - // find free ID - int i; - for(i = 1; i <= _identities.count(); i++) { - if(!_identities.keys().contains(i)) break; - } - //qDebug() << "found free id" << i; - Identity *newId = new Identity(id, this); - newId->setId(i); - _identities[i] = newId; - signalProxy()->synchronize(newId); - CoreUserSettings s(user()); - s.storeIdentity(*newId); - emit identityCreated(*newId); +void CoreSession::createIdentity(const CoreIdentity &identity) { + CoreIdentity *coreIdentity = new CoreIdentity(identity, this); + _identities[identity.id()] = coreIdentity; + // CoreIdentity has it's own synchronize method since it's "private" sslManager needs to be synced aswell + coreIdentity->synchronize(signalProxy()); + connect(coreIdentity, SIGNAL(updated()), this, SLOT(updateIdentityBySender())); + emit identityCreated(*coreIdentity); } -void CoreSession::updateIdentity(const Identity &id) { - if(!_identities.contains(id.id())) { - qWarning() << "Update request for unknown identity received!"; +void CoreSession::updateIdentityBySender() { + CoreIdentity *identity = qobject_cast(sender()); + if(!identity) return; - } - _identities[id.id()]->update(id); - - CoreUserSettings s(user()); - s.storeIdentity(id); + Core::updateIdentity(user(), *identity); } void CoreSession::removeIdentity(IdentityId id) { - Identity *i = _identities.take(id); - if(i) { + CoreIdentity *identity = _identities.take(id); + if(identity) { emit identityRemoved(id); - CoreUserSettings s(user()); - s.removeIdentity(id); - i->deleteLater(); + Core::removeIdentity(user(), id); + identity->deleteLater(); } } /*** Network Handling ***/ -void CoreSession::createNetwork(const NetworkInfo &_info, bool useId) { - NetworkInfo info = _info; +void CoreSession::createNetwork(const NetworkInfo &info_, const QStringList &persistentChans) { + NetworkInfo info = info_; int id; - if(useId && info.networkId > 0) id = info.networkId.toInt(); - else { - for(id = 1; id <= _networks.count(); id++) { - if(!_networks.keys().contains(id)) break; + + if(!info.networkId.isValid()) + 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)); + return; + } + + id = info.networkId.toInt(); + if(!_networks.contains(id)) { + + // create persistent chans + QRegExp rx("\\s*(\\S+)(?:\\s*(\\S+))?\\s*"); + foreach(QString channel, persistentChans) { + if(!rx.exactMatch(channel)) { + qWarning() << QString("Invalid persistent channel declaration: %1").arg(channel); + continue; + } + Core::bufferInfo(user(), info.networkId, BufferInfo::ChannelBuffer, rx.cap(1), true); + Core::setChannelPersistent(user(), info.networkId, rx.cap(1), true); + if(!rx.cap(2).isEmpty()) + Core::setPersistentChannelKey(user(), info.networkId, rx.cap(1), rx.cap(2)); } - //qDebug() << "found free id" << i; - info.networkId = id; + + CoreNetwork *net = new CoreNetwork(id, this); + connect(net, SIGNAL(displayMsg(NetworkId, Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags)), + SLOT(recvMessageFromServer(NetworkId, Message::Type, BufferInfo::Type, const QString &, const QString &, const QString &, Message::Flags))); + connect(net, SIGNAL(displayStatusMsg(QString)), SLOT(recvStatusMsgFromServer(QString))); + + 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!")); + _networks[info.networkId]->requestSetNetworkInfo(info); } - 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); - CoreUserSettings s(user()); - s.storeNetworkInfo(info); - emit networkCreated(id); } -void CoreSession::updateNetwork(const NetworkInfo &info) { - if(!_networks.contains(info.networkId)) { - qWarning() << "Update request for unknown network received!"; +void CoreSession::removeNetwork(NetworkId id) { + // Make sure the network is disconnected! + CoreNetwork *net = network(id); + if(!net) return; + + if(net->connectionState() != Network::Disconnected) { + connect(net, SIGNAL(disconnected(NetworkId)), this, SLOT(destroyNetwork(NetworkId))); + net->disconnectFromIrc(); + } else { + destroyNetwork(id); } - _networks[info.networkId]->setNetworkInfo(info); - CoreUserSettings s(user()); - s.storeNetworkInfo(info); } -void CoreSession::removeNetwork(NetworkId id) { +void CoreSession::destroyNetwork(NetworkId id) { + QList removedBuffers = Core::requestBufferIdsForNetwork(user(), id); Network *net = _networks.take(id); - if(net) { + if(net && Core::removeNetwork(user(), id)) { + foreach(BufferId bufferId, removedBuffers) { + _bufferSyncer->removeBuffer(bufferId); + } emit networkRemoved(id); - CoreUserSettings s(user()); - s.removeNetworkInfo(id); net->deleteLater(); } } + +void CoreSession::renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName) { + BufferInfo bufferInfo = Core::bufferInfo(user(), networkId, BufferInfo::QueryBuffer, oldName, false); + if(bufferInfo.isValid()) { + _bufferSyncer->renameBuffer(bufferInfo.bufferId(), newName); + } +} + +void CoreSession::clientsConnected() { + QHash::iterator netIter = _networks.begin(); + Identity *identity = 0; + CoreNetwork *net = 0; + IrcUser *me = 0; + while(netIter != _networks.end()) { + net = *netIter; + netIter++; + + if(!net->isConnected()) + continue; + identity = net->identityPtr(); + if(!identity) + continue; + me = net->me(); + if(!me) + continue; + + if(identity->detachAwayEnabled() && me->isAway()) { + net->userInputHandler()->handleAway(BufferInfo(), QString()); + } + } +} + +void CoreSession::clientsDisconnected() { + QHash::iterator netIter = _networks.begin(); + Identity *identity = 0; + CoreNetwork *net = 0; + IrcUser *me = 0; + QString awayReason; + while(netIter != _networks.end()) { + net = *netIter; + netIter++; + + if(!net->isConnected()) + continue; + identity = net->identityPtr(); + if(!identity) + continue; + me = net->me(); + if(!me) + continue; + + if(identity->detachAwayEnabled() && !me->isAway()) { + if(!identity->detachAwayReason().isEmpty()) + awayReason = identity->detachAwayReason(); + net->setAutoAwayActive(true); + net->userInputHandler()->handleAway(BufferInfo(), awayReason); + } + } +}