X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=c34e89888710d41026c141ddff595e14d166ca14;hp=92eeafe34f69f5f82814f6a4c63e3edc8ba0459e;hb=a9b3edc811552b39dafb8fb01699490e5bcfb014;hpb=b797e5f581b10a517c30f78cb53f813af741e261 diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index 92eeafe3..c34e8988 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -18,13 +18,14 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include "core.h" #include "coresession.h" -#include "server.h" +#include "networkconnection.h" #include "signalproxy.h" #include "storage.h" -#include "networkinfo.h" +#include "network.h" #include "ircuser.h" #include "ircchannel.h" #include "identity.h" @@ -34,29 +35,27 @@ #include -CoreSession::CoreSession(UserId uid, Storage *_storage, QObject *parent) - : QObject(parent), - user(uid), +CoreSession::CoreSession(UserId uid, QObject *parent) : QObject(parent), + _user(uid), _signalProxy(new SignalProxy(SignalProxy::Server, 0, this)), - storage(_storage), scriptEngine(new QScriptEngine(this)) { SignalProxy *p = signalProxy(); - CoreUserSettings s(user); + CoreUserSettings s(user()); sessionData = s.sessionData(); -#ifdef SPUTDEV + foreach(IdentityId id, s.identityIds()) { Identity *i = new Identity(s.identity(id), this); if(!i->isValid()) { - qDebug() << QString("Invalid identity! Removing..."); + qWarning() << QString("Invalid identity! Removing..."); s.removeIdentity(id); delete i; continue; } if(_identities.contains(i->id())) { - qDebug() << "Duplicate identity, ignoring!"; + qWarning() << "Duplicate identity, ignoring!"; delete i; continue; } @@ -65,19 +64,19 @@ CoreSession::CoreSession(UserId uid, Storage *_storage, QObject *parent) if(!_identities.count()) { Identity i(1); i.setToDefaults(); + i.setIdentityName(tr("Default Identity")); createIdentity(i); } -#endif - p->attachSlot(SIGNAL(requestNetworkStates()), this, SLOT(serverStateRequested())); + //p->attachSlot(SIGNAL(requestNetworkStates()), this, SLOT(networkStateRequested())); p->attachSlot(SIGNAL(requestConnect(QString)), this, SLOT(connectToNetwork(QString))); - p->attachSlot(SIGNAL(sendInput(BufferInfo, QString)), this, SLOT(msgFromGui(BufferInfo, QString))); + 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(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 &))); @@ -92,32 +91,73 @@ CoreSession::CoreSession(UserId uid, Storage *_storage, QObject *parent) foreach(Identity *id, _identities.values()) { p->synchronize(id); } + + // 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); + } + + emit initialized(); } CoreSession::~CoreSession() { } -UserId CoreSession::userId() const { - return user; +UserId CoreSession::user() const { + return _user; } -QVariant CoreSession::state() const { +Network *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 { + if(_identities.contains(id)) return _identities[id]; + return 0; +} + +QVariant CoreSession::state() const { // FIXME QVariantMap res; + /* QList conn; - foreach(Server *server, servers.values()) { - if(server->isConnected()) { + foreach(NetworkConnection *net, connections.values()) { + if(net->isConnected()) { QVariantMap m; - m["Network"] = server->networkName(); - m["State"] = server->state(); + m["Network"] = net->networkName(); + m["State"] = net->state(); conn << m; } } res["ConnectedServers"] = conn; + */ return res; } -void CoreSession::restoreState(const QVariant &previousState) { +void CoreSession::restoreState(const QVariant &previousState) { // FIXME // Session restore + /* QVariantMap state = previousState.toMap(); if(state.contains("ConnectedServers")) { foreach(QVariant v, state["ConnectedServers"].toList()) { @@ -126,116 +166,143 @@ void CoreSession::restoreState(const QVariant &previousState) { if(!net.isEmpty()) connectToNetwork(net, m["State"]); } } + */ } void CoreSession::storeSessionData(const QString &key, const QVariant &data) { - CoreUserSettings s(user); - mutex.lock(); + CoreUserSettings s(user()); s.setSessionValue(key, data); sessionData[key] = data; - mutex.unlock(); emit sessionDataChanged(key, data); emit sessionDataChanged(key); } 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; } -// FIXME switch to NetworkIDs -void CoreSession::connectToNetwork(QString network, const QVariant &previousState) { - uint networkid = getNetworkId(network); - if(networkid == 0) { - qWarning() << "unable to connect to Network" << network << "(User:" << userId() << "): unable to determine NetworkId"; +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; } - if(!servers.contains(networkid)) { - Server *server = new Server(userId(), networkid, network, previousState); - servers[networkid] = server; - attachServer(server); - server->start(); + + NetworkConnection *conn = networkConnection(id); + if(!conn) { + conn = new NetworkConnection(net, this, previousState); + _connections[id] = conn; + attachNetworkConnection(conn); + conn->connectToIrc(); } - 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))); - - // 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))); +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))); + 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))); + // TODO add error handling } -void CoreSession::serverStateRequested() { +void CoreSession::networkStateRequested() { } -void CoreSession::addClient(QIODevice *device) { - signalProxy()->addPeer(device); +void CoreSession::addClient(QObject *dev) { // this is QObject* so we can use it in signal connections + QIODevice *device = qobject_cast(dev); + if(!device) { + qWarning() << "Invoking CoreSession::addClient with a QObject that is not a QIODevice!"; + } else { + signalProxy()->addPeer(device); + QVariantMap reply; + reply["MsgType"] = "SessionInit"; + reply["SessionState"] = sessionState(); + SignalProxy::writeDataToDevice(device, reply); + } } SignalProxy *CoreSession::signalProxy() const { return _signalProxy; } -void CoreSession::serverConnected(uint networkid) { - storage->getBufferInfo(userId(), servers[networkid]->networkName()); // create status buffer +void CoreSession::networkConnected(uint networkid) { + Core::bufferInfo(user(), networkConnection(networkid)->networkName()); // create status buffer } -void CoreSession::serverDisconnected(uint networkid) { - Q_ASSERT(servers.contains(networkid)); - servers.take(networkid)->deleteLater(); - Q_ASSERT(!servers.contains(networkid)); +void CoreSession::networkDisconnected(uint 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)); } -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) { + NetworkConnection *conn = networkConnection(bufinfo.networkId()); + if(conn) { + conn->userInput(bufinfo.buffer(), msg); + } else { + qWarning() << "Trying to send to unconnected network!"; + } } // 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()); + NetworkConnection *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)); + buf = Core::bufferInfo(user(), s->networkName(), nickFromMask(sender)); } else { - buf = storage->getBufferInfo(user, s->networkName(), target); + buf = Core::bufferInfo(user(), s->networkName(), target); } Message msg(buf, type, text, sender, flags); - msg.setMsgId(storage->logMessage(msg)); - Q_ASSERT(msg.msgId()); + msg.setMsgId(Core::storeMessage(msg)); + Q_ASSERT(msg.msgId() != 0); emit displayMsg(msg); } void CoreSession::recvStatusMsgFromServer(QString msg) { - Server *s = qobject_cast(sender()); + NetworkConnection *s = qobject_cast(sender()); Q_ASSERT(s); emit displayStatusMsg(s->networkName(), msg); } - -uint CoreSession::getNetworkId(const QString &net) const { - return storage->getNetworkId(user, net); -} - QList CoreSession::buffers() const { - return storage->requestBuffers(user); + return Core::requestBuffers(user()); } @@ -243,24 +310,28 @@ 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(); - - QVariantList networks; - foreach(NetworkId networkid, servers.keys()) - networks.append(QVariant(networkid)); - v["Networks"] = QVariant(networks); + 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; QList idlist; - foreach(Identity *i, _identities.values()) idlist << QVariant::fromValue(*i); + foreach(Identity *i, _identities.values()) idlist << qVariantFromValue(*i); v["Identities"] = idlist; - // v["Payload"] = QByteArray(100000000, 'a'); // for testing purposes + v["SessionData"] = sessionData; + + //v["Payload"] = QByteArray(100000000, 'a'); // for testing purposes return v; } @@ -271,12 +342,12 @@ void CoreSession::sendBacklog(BufferInfo id, QVariant v1, QVariant v2) { } else { - msglist = storage->requestMsgs(id, v1.toInt(), v2.toInt()); + 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(QVariant::fromValue(msglist[i])); + log.append(qVariantFromValue(msglist[i])); if(log.count() >= 5) { emit backlogData(id, log, i >= msglist.count() - 1); log.clear(); @@ -289,15 +360,16 @@ void CoreSession::sendBacklog(BufferInfo id, QVariant v1, QVariant v2) { void CoreSession::initScriptEngine() { signalProxy()->attachSlot(SIGNAL(scriptRequest(QString)), this, SLOT(scriptRequest(QString))); signalProxy()->attachSignal(this, SIGNAL(scriptResult(QString))); - - QScriptValue storage_ = scriptEngine->newQObject(storage); - scriptEngine->globalObject().setProperty("storage", storage_); + + // FIXME + //QScriptValue storage_ = scriptEngine->newQObject(storage); + //scriptEngine->globalObject().setProperty("storage", storage_); } void CoreSession::scriptRequest(QString script) { emit scriptResult(scriptEngine->evaluate(script).toString()); } - +#include void CoreSession::createIdentity(const Identity &id) { // find free ID int i; @@ -309,9 +381,9 @@ void CoreSession::createIdentity(const Identity &id) { newId->setId(i); _identities[i] = newId; signalProxy()->synchronize(newId); - CoreUserSettings s(user); + CoreUserSettings s(user()); s.storeIdentity(*newId); - emit identityCreated(i); + emit identityCreated(*newId); } void CoreSession::updateIdentity(const Identity &id) { @@ -321,7 +393,7 @@ void CoreSession::updateIdentity(const Identity &id) { } _identities[id.id()]->update(id); - CoreUserSettings s(user); + CoreUserSettings s(user()); s.storeIdentity(id); } @@ -329,7 +401,7 @@ void CoreSession::removeIdentity(IdentityId id) { Identity *i = _identities.take(id); if(i) { emit identityRemoved(id); - CoreUserSettings s(user); + CoreUserSettings s(user()); s.removeIdentity(id); i->deleteLater(); }