X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=94119f5ea7e3591ab2ce50657061a63af9036fa3;hp=8b954d395b8b074890408b707af19f9cbfdbb65c;hb=38db2f48a30f697ef8c0b61dfa6345e8a53336fd;hpb=6869909402a4dc807ee5261cc2a0999ac33053ee diff --git a/src/client/client.cpp b/src/client/client.cpp index 8b954d39..94119f5e 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -19,21 +19,24 @@ ***************************************************************************/ #include "client.h" -#include "clientproxy.h" + #include "buffer.h" #include "buffertreemodel.h" +#include "clientproxy.h" +#include "quasselui.h" #include "util.h" Client * Client::instanceptr = 0; +bool Client::connectedToCore = false; Client::ClientMode Client::clientMode; +VarMap Client::coreConnectionInfo; QHash Client::buffers; QHash Client::bufferIds; QHash > Client::nicks; -QHash Client::connected; +QHash Client::netConnected; +QStringList Client::netsAwaitingInit; QHash Client::ownNick; -QList Client::coreBuffers; - Client *Client::instance() { if(instanceptr) return instanceptr; @@ -58,6 +61,7 @@ Client::Client() { // TODO: make this configurable (allow monolithic client to connect to remote cores) if(Global::runMode == Global::Monolithic) clientMode = LocalCore; else clientMode = RemoteCore; + connectedToCore = false; } void Client::init(AbstractUi *ui) { @@ -69,14 +73,15 @@ void Client::init() { blockSize = 0; connect(&socket, SIGNAL(readyRead()), this, SLOT(serverHasData())); - connect(&socket, SIGNAL(connected()), this, SLOT(coreConnected())); - connect(&socket, SIGNAL(disconnected()), this, SLOT(coreDisconnected())); + connect(&socket, SIGNAL(connected()), this, SLOT(coreSocketConnected())); + connect(&socket, SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected())); connect(&socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(serverError(QAbstractSocket::SocketError))); - connect(Global::instance(), SIGNAL(dataPutLocally(UserId, QString)), this, SLOT(updateCoreData(UserId, QString))); - connect(clientProxy, SIGNAL(csUpdateGlobalData(QString, QVariant)), this, SLOT(updateLocalData(QString, QVariant))); + connect(this, SIGNAL(sendSessionData(const QString &, const QVariant &)), clientProxy, SLOT(gsSessionDataChanged(const QString &, const QVariant &))); + connect(clientProxy, SIGNAL(csSessionDataChanged(const QString &, const QVariant &)), this, SLOT(recvSessionData(const QString &, const QVariant &))); connect(clientProxy, SIGNAL(send(ClientSignal, QVariant, QVariant, QVariant)), this, SLOT(recvProxySignal(ClientSignal, QVariant, QVariant, QVariant))); + connect(clientProxy, SIGNAL(csCoreState(QVariant)), this, SLOT(recvCoreState(const QVariant &))); connect(clientProxy, SIGNAL(csServerState(QString, QVariant)), this, SLOT(recvNetworkState(QString, QVariant))); connect(clientProxy, SIGNAL(csServerConnected(QString)), this, SLOT(networkConnected(QString))); connect(clientProxy, SIGNAL(csServerDisconnected(QString)), this, SLOT(networkDisconnected(QString))); @@ -92,20 +97,18 @@ void Client::init() { connect(clientProxy, SIGNAL(csUpdateBufferId(BufferId)), this, SLOT(updateBufferId(BufferId))); connect(this, SIGNAL(sendInput(BufferId, QString)), clientProxy, SLOT(gsUserInput(BufferId, QString))); connect(this, SIGNAL(requestBacklog(BufferId, QVariant, QVariant)), clientProxy, SLOT(gsRequestBacklog(BufferId, QVariant, QVariant))); + connect(this, SIGNAL(requestNetworkStates()), clientProxy, SLOT(gsRequestNetworkStates())); - syncToCore(); + connect(mainUi, SIGNAL(connectToCore(const VarMap &)), this, SLOT(connectToCore(const VarMap &))); + connect(mainUi, SIGNAL(disconnectFromCore()), this, SLOT(disconnectFromCore())); + connect(this, SIGNAL(connected()), mainUi, SLOT(connectedToCore())); + connect(this, SIGNAL(disconnected()), mainUi, SLOT(disconnectedFromCore())); layoutTimer = new QTimer(this); layoutTimer->setInterval(0); layoutTimer->setSingleShot(false); connect(layoutTimer, SIGNAL(timeout()), this, SLOT(layoutMsg())); - /* make lookups by id faster */ - foreach(BufferId id, coreBuffers) { - bufferIds[id.uid()] = id; // make lookups by id faster - buffer(id); // create all buffers, so we see them in the network views - emit requestBacklog(id, -1, -1); // TODO: use custom settings for backlog request - } } Client::~Client() { @@ -120,22 +123,111 @@ BufferTreeModel *Client::bufferModel() { return instance()->_bufferModel; } -void Client::coreConnected() { +bool Client::isConnected() { return connectedToCore; } + +void Client::connectToCore(const VarMap &conn) { + // TODO implement SSL + coreConnectionInfo = conn; + if(isConnected()) { + emit coreConnectionError(tr("Already connected to Core!")); + return; + } + if(conn["Host"].toString().isEmpty()) { + clientMode = LocalCore; + QVariant state = connectToLocalCore(coreConnectionInfo["User"].toString(), coreConnectionInfo["Password"].toString()); + syncToCore(state); + } else { + clientMode = RemoteCore; + emit coreConnectionMsg(tr("Connecting...")); + socket.connectToHost(conn["Host"].toString(), conn["Port"].toUInt()); + } +} + +void Client::disconnectFromCore() { + if(clientMode == RemoteCore) { + socket.close(); + } else { + disconnectFromLocalCore(); + coreSocketDisconnected(); + } + /* Clear internal data. Hopefully nothing relies on it at this point. */ + coreConnectionInfo.clear(); + sessionData.clear(); + //foreach(Buffer *buf, buffers.values()) delete buf; + qDebug() << "barfoo"; + _bufferModel->clear(); + //qDeleteAll(buffers); + qDebug() << "foobar"; +} +void Client::coreSocketConnected() { + connect(this, SIGNAL(recvPartialItem(quint32, quint32)), this, SIGNAL(coreConnectionProgress(uint, uint))); + emit coreConnectionMsg(tr("Synchronizing to core...")); + VarMap clientInit; + clientInit["GuiProtocol"] = GUI_PROTOCOL; + clientInit["User"] = coreConnectionInfo["User"].toString(); + clientInit["Password"] = coreConnectionInfo["Password"].toString(); + writeDataToDevice(&socket, clientInit); } -void Client::coreDisconnected() { +void Client::coreSocketDisconnected() { + connectedToCore = false; + emit disconnected(); +} + +void Client::recvCoreState(const QVariant &state) { + disconnect(this, SIGNAL(recvPartialItem(quint32, quint32)), this, SIGNAL(coreConnectionProgress(uint, uint))); + syncToCore(state); } -void Client::updateCoreData(UserId, QString key) { - if(clientMode == LocalCore) return; - QVariant data = Global::data(key); - recvProxySignal(GS_UPDATE_GLOBAL_DATA, key, data, QVariant()); +void Client::syncToCore(const QVariant &coreState) { + VarMap sessionState = coreState.toMap()["SessionState"].toMap(); + VarMap sessData = sessionState["SessionData"].toMap(); + + foreach(QString key, sessData.keys()) { + recvSessionData(key, sessData[key]); + } + QList coreBuffers = sessionState["Buffers"].toList(); + /* make lookups by id faster */ + foreach(QVariant vid, coreBuffers) { + BufferId id = vid.value(); + bufferIds[id.uid()] = id; // make lookups by id faster + buffer(id); // create all buffers, so we see them in the network views + } + netsAwaitingInit = sessionState["Networks"].toStringList(); + connectedToCore = true; + if(netsAwaitingInit.count()) { + emit coreConnectionMsg(tr("Requesting network states...")); + emit coreConnectionProgress(0, netsAwaitingInit.count()); + emit requestNetworkStates(); + } + else { + emit coreConnectionProgress(1, 1); + emit connected(); + } +} + +void Client::recvSessionData(const QString &key, const QVariant &data) { + sessionData[key] = data; + emit sessionDataChanged(key, data); + emit sessionDataChanged(key); +} + +void Client::storeSessionData(const QString &key, const QVariant &data) { + // Not sure if this is a good idea, but we'll try it anyway: + // Calling this function only sends a signal to core. Data is stored upon reception of the update signal, + // rather than immediately. + emit instance()->sendSessionData(key, data); +} + +QVariant Client::retrieveSessionData(const QString &key, const QVariant &def) { + if(instance()->sessionData.contains(key)) return instance()->sessionData[key]; + else return def; } -void Client::updateLocalData(QString key, QVariant data) { - Global::updateData(key, data); +QStringList Client::sessionDataKeys() { + return instance()->sessionData.keys(); } void Client::recvProxySignal(ClientSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) { @@ -146,15 +238,6 @@ void Client::recvProxySignal(ClientSignal sig, QVariant arg1, QVariant arg2, QVa writeDataToDevice(&socket, QVariant(sigdata)); } -void Client::connectToCore(QString host, quint16 port) { - // TODO implement SSL - socket.connectToHost(host, port); -} - -void Client::disconnectFromCore() { - socket.close(); -} - void Client::serverError(QAbstractSocket::SocketError) { emit coreConnectionError(socket.errorString()); } @@ -174,7 +257,8 @@ void Client::serverHasData() { } void Client::networkConnected(QString net) { - connected[net] = true; + Q_ASSERT(!netsAwaitingInit.contains(net)); + netConnected[net] = true; BufferId id = statusBufferId(net); Buffer *b = buffer(id); b->setActive(true); @@ -189,7 +273,13 @@ void Client::networkDisconnected(QString net) { //b->displayMsg(Message(id, Message::Server, tr("Server disconnected."))); FIXME b->setActive(false); } - connected[net] = false; + netConnected[net] = false; + if(netsAwaitingInit.contains(net)) { + qDebug() << "Network" << net << "disconnected while not yet initialized!"; + netsAwaitingInit.removeAll(net); + emit coreConnectionProgress(netConnected.count(), netConnected.count() + netsAwaitingInit.count()); + if(!netsAwaitingInit.count()) emit connected(); + } } void Client::updateBufferId(BufferId id) { @@ -224,8 +314,13 @@ Buffer * Client::buffer(BufferId id) { return buffers[id]; } +QList Client::allBufferIds() { + return buffers.keys(); +} + void Client::recvNetworkState(QString net, QVariant state) { - connected[net] = true; + netsAwaitingInit.removeAll(net); + netConnected[net] = true; setOwnNick(net, state.toMap()["OwnNick"].toString()); buffer(statusBufferId(net))->setActive(true); VarMap t = state.toMap()["Topics"].toMap(); @@ -239,6 +334,8 @@ void Client::recvNetworkState(QString net, QVariant state) { foreach(QString nick, n.keys()) { addNick(net, nick, n[nick].toMap()); } + emit coreConnectionProgress(netConnected.count(), netConnected.count() + netsAwaitingInit.count()); + if(!netsAwaitingInit.count()) emit connected(); } void Client::recvMessage(const Message &msg) { @@ -289,7 +386,7 @@ void Client::userInput(BufferId id, QString msg) { void Client::setTopic(QString net, QString buf, QString topic) { BufferId id = bufferId(net, buf); - if(!connected[id.network()]) return; + if(!netConnected[id.network()]) return; Buffer *b = buffer(id); b->setTopic(topic); //if(!b->isActive()) { @@ -299,7 +396,7 @@ void Client::setTopic(QString net, QString buf, QString topic) { } void Client::addNick(QString net, QString nick, VarMap props) { - if(!connected[net]) return; + if(!netConnected[net]) return; nicks[net][nick] = props; VarMap chans = props["Channels"].toMap(); QStringList c = chans.keys(); @@ -309,7 +406,7 @@ void Client::addNick(QString net, QString nick, VarMap props) { } void Client::renameNick(QString net, QString oldnick, QString newnick) { - if(!connected[net]) return; + if(!netConnected[net]) return; QStringList chans = nicks[net][oldnick]["Channels"].toMap().keys(); foreach(QString c, chans) { buffer(bufferId(net, c))->renameNick(oldnick, newnick); @@ -318,7 +415,7 @@ void Client::renameNick(QString net, QString oldnick, QString newnick) { } void Client::updateNick(QString net, QString nick, VarMap props) { - if(!connected[net]) return; + if(!netConnected[net]) return; QStringList oldchans = nicks[net][nick]["Channels"].toMap().keys(); QStringList newchans = props["Channels"].toMap().keys(); foreach(QString c, newchans) { @@ -332,7 +429,7 @@ void Client::updateNick(QString net, QString nick, VarMap props) { } void Client::removeNick(QString net, QString nick) { - if(!connected[net]) return; + if(!netConnected[net]) return; VarMap chans = nicks[net][nick]["Channels"].toMap(); foreach(QString bufname, chans.keys()) { buffer(bufferId(net, bufname))->removeNick(nick); @@ -341,7 +438,7 @@ void Client::removeNick(QString net, QString nick) { } void Client::setOwnNick(QString net, QString nick) { - if(!connected[net]) return; + if(!netConnected[net]) return; ownNick[net] = nick; foreach(BufferId id, buffers.keys()) { if(id.network() == net) { @@ -350,4 +447,3 @@ void Client::setOwnNick(QString net, QString nick) { } } -