X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=491e99a882ff82c97deb4feb837042b37b06c1c5;hp=602ce78ea08303a075b0245e150255cd2f0432bb;hb=558260f52de5a9b1364f5672ace17554efc10a74;hpb=894d66d1d86ccebf9df99e03bc3c174959e7ce76 diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index 602ce78e..491e99a8 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-07 by The Quassel IRC Development Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * (at your option) version 3. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -18,172 +18,211 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "coresession.h" -#include "server.h" +#include +#include "core.h" +#include "coresession.h" +#include "userinputhandler.h" #include "signalproxy.h" +#include "corebuffersyncer.h" +#include "corebacklogmanager.h" +#include "corebufferviewmanager.h" +#include "coreirclisthelper.h" #include "storage.h" -#include "synchronizer.h" -#include "networkinfo.h" +#include "coreidentity.h" +#include "corenetwork.h" #include "ircuser.h" #include "ircchannel.h" #include "util.h" +#include "coreusersettings.h" +#include "logger.h" - -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) + _aliasManager(this), + _bufferSyncer(new CoreBufferSyncer(this)), + _backlogManager(new CoreBacklogManager(this)), + _bufferViewManager(new CoreBufferViewManager(_signalProxy, this)), + _ircListHelper(new CoreIrcListHelper(this)), + _coreInfo(this), + scriptEngine(new QScriptEngine(this)) { - - QSettings s; - s.beginGroup(QString("SessionData/%1").arg(user)); - mutex.lock(); - foreach(QString key, s.allKeys()) { - sessionData[key] = s.value(key); - } - mutex.unlock(); - 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(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(importOldBacklog()), storage, SLOT(importOldBacklog())); - p->attachSlot(SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)), this, SLOT(sendBacklog(BufferInfo, QVariant, QVariant))); + 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(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 &))); - /* Autoconnect. (When) do we actually do this? - QStringList list; - QVariantMap networks = retrieveSessionData("Networks").toMap(); - foreach(QString net, networks.keys()) { - if(networks[net].toMap()["AutoConnect"].toBool()) { - list << net; - } - } qDebug() << list; - if(list.count()) connectToIrc(list); - */ + + p->attachSignal(this, SIGNAL(identityCreated(const Identity &))); + p->attachSignal(this, SIGNAL(identityRemoved(IdentityId))); + 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(removeNetwork(NetworkId)), this, SLOT(removeNetwork(NetworkId))); + + loadSettings(); + initScriptEngine(); + + connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), _bufferSyncer, SLOT(storeDirtyIds())); + connect(&(Core::instance()->syncTimer()), SIGNAL(timeout()), _bufferViewManager, SLOT(saveBufferViews())); + + p->synchronize(_bufferSyncer); + p->synchronize(&aliasManager()); + p->synchronize(_backlogManager); + p->synchronize(ircListHelper()); + p->synchronize(&_coreInfo); + + // Restore session state + if(restoreState) + restoreSessionState(); + + emit initialized(); } CoreSession::~CoreSession() { + saveSessionState(); + foreach(CoreNetwork *net, _networks.values()) { + delete net; + } } -UserId CoreSession::userId() const { - return user; +CoreNetwork *CoreSession::network(NetworkId id) const { + if(_networks.contains(id)) return _networks[id]; + return 0; } -void CoreSession::storeSessionData(const QString &key, const QVariant &data) { - QSettings s; - s.beginGroup(QString("SessionData/%1").arg(user)); - mutex.lock(); - sessionData[key] = data; - s.setValue(key, data); - mutex.unlock(); - s.endGroup(); - emit sessionDataChanged(key, data); - emit sessionDataChanged(key); +CoreIdentity *CoreSession::identity(IdentityId id) const { + if(_identities.contains(id)) return _identities[id]; + return 0; } -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::loadSettings() { + CoreUserSettings s(user()); + + // 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++; + } + } + s.removeIdentity(id); + } + // end of migration -// FIXME switch to NetworkIDs -void CoreSession::connectToNetwork(QString network) { - uint networkid = getNetworkId(network); - if(!servers.contains(networkid)) { - Server *server = new Server(userId(), networkid, network); - servers[networkid] = server; - attachServer(server); - server->start(); + foreach(CoreIdentity identity, Core::identities(user())) { + createIdentity(identity); + } + if(!_identities.count()) { + Identity identity; + identity.setToDefaults(); + identity.setIdentityName(tr("Default Identity")); + createIdentity(identity, QVariantMap()); } - 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))); + foreach(NetworkInfo info, Core::networks(user())) { + createNetwork(info); + } +} - // 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 +void CoreSession::saveSessionState() const { + _bufferSyncer->storeDirtyIds(); + _bufferViewManager->saveBufferViews(); } -void CoreSession::serverStateRequested() { +void CoreSession::restoreSessionState() { + QList nets = Core::connectedNetworks(user()); + CoreNetwork *net = 0; + foreach(NetworkId id, nets) { + net = network(id); + Q_ASSERT(net); + net->connectToIrc(); + } } void CoreSession::addClient(QIODevice *device) { - signalProxy()->addPeer(device); + if(!device) { + 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"; + reply["SessionState"] = sessionState(); + SignalProxy::writeDataToDevice(device, reply); + } } -SignalProxy *CoreSession::signalProxy() const { - return _signalProxy; +void CoreSession::addClient(SignalProxy *proxy) { + signalProxy()->addPeer(proxy); + emit sessionState(sessionState()); } -void CoreSession::serverConnected(uint networkid) { - storage->getBufferInfo(userId(), servers[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::serverDisconnected(uint networkid) { - servers.remove(networkid); - delete servers[networkid]; +QHash CoreSession::persistentChannels(NetworkId id) const { + return Core::persistentChannels(user(), id); + return QHash(); } -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) { + CoreNetwork *net = network(bufinfo.networkId()); + if(net) { + net->userInput(bufinfo, msg); + } else { + 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) { - Server *s = qobject_cast(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, Message::Flags flags) { + CoreNetwork *net = qobject_cast(this->sender()); + Q_ASSERT(net); + + BufferInfo bufferInfo = Core::bufferInfo(user(), net->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(sender()); - Q_ASSERT(s); - emit displayStatusMsg(s->networkName(), msg); -} - - -uint CoreSession::getNetworkId(const QString &net) const { - return storage->getNetworkId(user, net); + CoreNetwork *net = qobject_cast(sender()); + Q_ASSERT(net); + emit displayStatusMsg(net->networkName(), msg); } QList CoreSession::buffers() const { - return storage->requestBuffers(user); + return Core::requestBuffers(user()); } @@ -191,40 +230,203 @@ 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(); + 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; - QVariantList networks; - foreach(uint networkid, servers.keys()) - networks.append(QVariant(networkid)); - v["Networks"] = QVariant(networks); + QList idlist; + 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 log; - QList msglist; - if(v1.type() == QVariant::DateTime) { +void CoreSession::initScriptEngine() { + signalProxy()->attachSlot(SIGNAL(scriptRequest(QString)), this, SLOT(scriptRequest(QString))); + signalProxy()->attachSignal(this, SIGNAL(scriptResult(QString))); + // 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 &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 + IdentityId id = Core::createIdentity(user(), coreIdentity); + if(!id.isValid()) + return; + else + createIdentity(coreIdentity); +} + +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(const QVariantMap &)), this, SLOT(updateIdentityBySender())); + emit identityCreated(*coreIdentity); +} + +void CoreSession::updateIdentityBySender() { + CoreIdentity *identity = qobject_cast(sender()); + if(!identity) + return; + Core::updateIdentity(user(), *identity); +} + +void CoreSession::removeIdentity(IdentityId id) { + CoreIdentity *identity = _identities.take(id); + if(identity) { + emit identityRemoved(id); + Core::removeIdentity(user(), id); + identity->deleteLater(); + } +} + +/*** Network Handling ***/ + +void CoreSession::createNetwork(const NetworkInfo &info_) { + NetworkInfo info = info_; + int id; + + 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)) { + CoreNetwork *net = new CoreNetwork(id, this); + connect(net, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags)), + this, SLOT(recvMessageFromServer(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags))); + connect(net, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString))); + + net->setNetworkInfo(info); + net->setProxy(signalProxy()); + _networks[id] = net; + signalProxy()->synchronize(net); + emit networkCreated(id); } else { - msglist = storage->requestMsgs(id, v1.toInt(), v2.toInt()); + qWarning() << qPrintable(tr("CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!")); + _networks[info.networkId]->requestSetNetworkInfo(info); } +} + +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); + } +} + +void CoreSession::destroyNetwork(NetworkId id) { + 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(); + } +} + +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; + 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()) { + net->userInputHandler()->handleAway(BufferInfo(), QString()); + } + } +} - // 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(); +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->detachAwayReasonEnabled()) + awayReason = identity->detachAwayReason(); + else + awayReason = identity->awayReason(); + net->setAutoAwayActive(true); + net->userInputHandler()->handleAway(BufferInfo(), awayReason); } } - if(log.count() > 0) emit backlogData(id, log, true); }