X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=bce4cf70fa27e1997185ed3f1040e0cfbb478848;hp=6b28d71e942ae2397912ab0be6ca50e435a59644;hb=2dd7667489021341267d316472d375e8c89c79c0;hpb=e733408e4759473bf38831f498f48a0f2f5e6dc7 diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index 6b28d71e..bce4cf70 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -35,7 +35,7 @@ #include -CoreSession::CoreSession(UserId uid, 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)) @@ -43,33 +43,8 @@ CoreSession::CoreSession(UserId uid, QObject *parent) : QObject(parent), SignalProxy *p = signalProxy(); - CoreUserSettings s(user()); - sessionData = s.sessionData(); - - 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; - } - _identities[i->id()] = i; - } - if(!_identities.count()) { - Identity i(1); - i.setToDefaults(); - i.setIdentityName(tr("Default Identity")); - createIdentity(i); - } - - //p->attachSlot(SIGNAL(requestNetworkStates()), this, SLOT(networkStateRequested())); 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))); @@ -77,46 +52,35 @@ CoreSession::CoreSession(UserId uid, QObject *parent) : QObject(parent), p->attachSignal(this, SIGNAL(backlogData(BufferInfo, QVariantList, bool))); p->attachSignal(this, 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 &))); - 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))); - initScriptEngine(); + 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))); - foreach(Identity *id, _identities.values()) { - p->synchronize(id); - } + loadSettings(); + initScriptEngine(); - // Load and init networks. - // FIXME For now we use the old info from sessionData... - - QVariantMap networks = retrieveSessionData("Networks").toMap(); - foreach(QString netname, networks.keys()) { - QVariantMap network = networks[netname].toMap(); - NetworkId netid = Core::networkId(user(), netname); - Network *net = new Network(netid, this); - connect(net, SIGNAL(connectRequested(NetworkId)), this, SLOT(connectToNetwork(NetworkId))); - net->setNetworkName(netname); - net->setIdentity(1); // FIXME default identity for now - net->setCodecForEncoding("ISO-8859-15"); // FIXME - net->setCodecForDecoding("ISO-8859-15"); // FIXME - QList slist; - foreach(QVariant v, network["Servers"].toList()) slist << v.toMap(); - net->setServerList(slist); - net->setProxy(p); - _networks[netid] = net; - p->synchronize(net); - } + // Restore session state + if(restoreState) restoreSessionState(); emit initialized(); } CoreSession::~CoreSession() { + saveSessionState(); + foreach(NetworkConnection *conn, _connections.values()) { + delete conn; + } + foreach(Network *net, _networks.values()) { + delete net; + } } UserId CoreSession::user() const { @@ -138,51 +102,86 @@ Identity *CoreSession::identity(IdentityId id) const { return 0; } -QVariant CoreSession::state() const { // FIXME - QVariantMap res; - /* - QList conn; - foreach(NetworkConnection *net, connections.values()) { - if(net->isConnected()) { - QVariantMap m; - m["Network"] = net->networkName(); - m["State"] = net->state(); - conn << m; +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; } + _identities[i->id()] = i; + signalProxy()->synchronize(i); + } + if(!_identities.count()) { + Identity i(1); + i.setToDefaults(); + i.setIdentityName(tr("Default Identity")); + createIdentity(i); } - res["ConnectedServers"] = conn; - */ - return res; -} - -void CoreSession::restoreState(const QVariant &previousState) { // FIXME - // Session restore - /* - QVariantMap state = previousState.toMap(); - if(state.contains("ConnectedServers")) { - foreach(QVariant v, state["ConnectedServers"].toList()) { - QVariantMap m = v.toMap(); - QString net = m["Network"].toString(); - if(!net.isEmpty()) connectToNetwork(net, m["State"]); + + + // migration to pure DB storage + QList netIds = s.networkIds(); + if(!netIds.isEmpty()) { + qDebug() << "Migrating Networksettings to DB Storage for User:" << user(); + foreach(NetworkId id, netIds) { + NetworkInfo info = s.networkInfo(id); + + // default new options + info.useRandomServer = false; + info.useAutoReconnect = true; + info.autoReconnectInterval = 60; + info.autoReconnectRetries = 20; + info.useAutoIdentify = false; + info.autoIdentifyService = "NickServ"; + info.rejoinChannels = true; + + Core::updateNetwork(user(), info); + s.removeNetworkInfo(id); } } - */ -} + foreach(NetworkInfo info, Core::networks(user())) { + createNetwork(info); + } +} -void CoreSession::storeSessionData(const QString &key, const QVariant &data) { +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.setSessionValue(key, data); - sessionData[key] = data; - emit sessionDataChanged(key, data); - emit sessionDataChanged(key); + s.setSessionState(res); } -QVariant CoreSession::retrieveSessionData(const QString &key, const QVariant &def) { - QVariant data; - if(!sessionData.contains(key)) data = def; - else data = sessionData[key]; - return data; +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"]); + } } void CoreSession::updateBufferInfo(UserId uid, const BufferInfo &bufinfo) { @@ -216,24 +215,27 @@ void CoreSession::connectToNetwork(NetworkId id, const QVariant &previousState) conn = new NetworkConnection(net, this, previousState); _connections[id] = conn; attachNetworkConnection(conn); - conn->connectToIrc(); } + conn->connectToIrc(); } void CoreSession::attachNetworkConnection(NetworkConnection *conn) { - //connect(this, SIGNAL(connectToIrc(QString)), network, SLOT(connectToIrc(QString))); - //connect(this, SIGNAL(disconnectFromIrc(QString)), network, SLOT(disconnectFromIrc(QString))); - //connect(this, SIGNAL(msgFromGui(uint, QString, QString)), network, SLOT(userInput(uint, QString, QString))); + connect(conn, SIGNAL(connected(NetworkId)), this, SLOT(networkConnected(NetworkId))); + connect(conn, SIGNAL(disconnected(NetworkId)), this, SLOT(networkDisconnected(NetworkId))); - //connect(conn, SIGNAL(connected(NetworkId)), this, SLOT(networkConnected(NetworkId))); - //connect(conn, SIGNAL(disconnected(NetworkId)), this, SLOT(networkDisconnected(NetworkId))); - signalProxy()->attachSignal(conn, SIGNAL(connected(NetworkId)), SIGNAL(networkConnected(NetworkId))); - signalProxy()->attachSignal(conn, SIGNAL(disconnected(NetworkId)), SIGNAL(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(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)), + this, SLOT(recvMessageFromServer(Message::Type, BufferInfo::Type, QString, QString, QString, quint8))); connect(conn, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString))); - // TODO add error handling +} + +void CoreSession::disconnectFromNetwork(NetworkId id) { + if(!_connections.contains(id)) return; + _connections[id]->disconnectFromIrc(); } void CoreSession::networkStateRequested() { @@ -256,23 +258,24 @@ SignalProxy *CoreSession::signalProxy() const { return _signalProxy; } -void CoreSession::networkConnected(uint networkid) { - Core::bufferInfo(user(), networkConnection(networkid)->networkName()); // create status buffer +// FIXME we need a sane way for creating buffers! +void CoreSession::networkConnected(NetworkId networkid) { + Core::bufferInfo(user(), networkid, BufferInfo::StatusBuffer); // create status buffer } -void CoreSession::networkDisconnected(uint networkid) { +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(); - Q_ASSERT(!_connections.contains(networkid)); } // FIXME switch to BufferId void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg) { NetworkConnection *conn = networkConnection(bufinfo.networkId()); if(conn) { - conn->userInput(bufinfo.buffer(), msg); + conn->userInput(bufinfo, msg); } else { qWarning() << "Trying to send to unconnected network!"; } @@ -280,16 +283,12 @@ 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, 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); - } - Message msg(buf, type, text, sender, flags); +void CoreSession::recvMessageFromServer(Message::Type type, BufferInfo::Type bufferType, QString target, QString text, QString sender, quint8 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)); Q_ASSERT(msg.msgId() != 0); emit displayMsg(msg); @@ -310,10 +309,10 @@ QVariant CoreSession::sessionState() { QVariantMap v; QVariantList bufs; - foreach(BufferInfo id, buffers()) bufs << QVariant::fromValue(id); + foreach(BufferInfo id, buffers()) bufs << qVariantFromValue(id); v["BufferInfos"] = bufs; QVariantList networkids; - foreach(NetworkId id, _networks.keys()) networkids << QVariant::fromValue(id); + foreach(NetworkId id, _networks.keys()) networkids << qVariantFromValue(id); v["NetworkIds"] = networkids; quint32 ircusercount = 0; @@ -326,12 +325,10 @@ QVariant CoreSession::sessionState() { v["IrcChannelCount"] = ircchannelcount; QList idlist; - foreach(Identity *i, _identities.values()) idlist << QVariant::fromValue(*i); + foreach(Identity *i, _identities.values()) idlist << qVariantFromValue(*i); v["Identities"] = idlist; - v["SessionData"] = sessionData; - - //v["Payload"] = QByteArray(100000000, 'a'); // for testing purposes + //v["Payload"] = QByteArray(100000000, 'a'); // for testing purposes return v; } @@ -347,7 +344,7 @@ void CoreSession::sendBacklog(BufferInfo id, QVariant v1, QVariant v2) { // 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])); + log.append(qVariantFromValue(msglist[i])); if(log.count() >= 5) { emit backlogData(id, log, i >= msglist.count() - 1); log.clear(); @@ -369,7 +366,9 @@ void CoreSession::initScriptEngine() { void CoreSession::scriptRequest(QString script) { emit scriptResult(scriptEngine->evaluate(script).toString()); } -#include + +/*** Identity Handling ***/ + void CoreSession::createIdentity(const Identity &id) { // find free ID int i; @@ -407,3 +406,60 @@ void CoreSession::removeIdentity(IdentityId id) { } } +/*** Network Handling ***/ + +void CoreSession::createNetwork(const NetworkInfo &info_) { + NetworkInfo info = info_; + int id; + + if(!info.networkId.isValid()) + Core::createNetwork(user(), info); + + Q_ASSERT(info.networkId.isValid()); + + 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); +} + +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); + if(conn) { + if(conn->connectionState() != Network::Disconnected) { + connect(conn, SIGNAL(disconnected(NetworkId)), this, SLOT(destroyNetwork(NetworkId))); + conn->disconnectFromIrc(); + } else { + _connections.take(id)->deleteLater(); // TODO make this saner + destroyNetwork(id); + } + } else { + destroyNetwork(id); + } +} + +void CoreSession::destroyNetwork(NetworkId id) { + Q_ASSERT(!_connections.contains(id)); + Network *net = _networks.take(id); + if(net && Core::removeNetwork(user(), id)) { + emit networkRemoved(id); + net->deleteLater(); + } +}