X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=296c870dad16e3fbc90323287478775afc0cac44;hp=4161ebcb1fbf400684421fe835ca94f501c99995;hb=d6b056e936ec441258d291b7a8af7b83f9f53016;hpb=521ed7df6d39cd809bd4fdf75974b2aaab59e583 diff --git a/src/client/client.cpp b/src/client/client.cpp index 4161ebcb..296c870d 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-07 by The Quassel Team * + * Copyright (C) 2005-07 by the Quassel IRC Team * * 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 * @@ -20,17 +20,15 @@ #include "client.h" -#include "networkinfo.h" -#include "ircuser.h" -#include "ircchannel.h" - -#include "message.h" - #include "bufferinfo.h" #include "buffertreemodel.h" +#include "global.h" +#include "ircchannel.h" +#include "ircuser.h" +#include "message.h" +#include "networkinfo.h" #include "quasselui.h" #include "signalproxy.h" -#include "synchronizer.h" #include "util.h" QPointer Client::instanceptr = 0; @@ -85,33 +83,31 @@ Buffer *Client::buffer(uint bufferUid) { Buffer *Client::buffer(BufferInfo id) { Buffer *buff = buffer(id.uid()); - + if(!buff) { Client *client = Client::instance(); - Buffer *buff = new Buffer(id, client); + buff = new Buffer(id, client); connect(buff, SIGNAL(userInput(BufferInfo, QString)), client, SLOT(userInput(BufferInfo, QString))); connect(buff, SIGNAL(bufferUpdated(Buffer *)), client, SIGNAL(bufferUpdated(Buffer *))); - connect(buff, SIGNAL(bufferDestroyed(Buffer *)), - client, SIGNAL(bufferDestroyed(Buffer *))); - connect(buff, SIGNAL(bufferDestroyed(Buffer *)), - client, SLOT(removeBuffer(Buffer *))); - + connect(buff, SIGNAL(destroyed()), + client, SLOT(bufferDestroyed())); client->_buffers[id.uid()] = buff; emit client->bufferUpdated(buff); } - + Q_ASSERT(buff); return buff; } // FIXME switch to netids! // WHEN IS THIS NEEDED ANYHOW!? +// ...only for finding the Buffer for a channel, I guess... BufferInfo Client::bufferInfo(QString net, QString buf) { foreach(Buffer *buffer_, buffers()) { BufferInfo bufferInfo = buffer_->bufferInfo(); - if(bufferInfo.network() == net && bufferInfo.buffer() == buf) + if(!bufferInfo.network().compare(net, Qt::CaseInsensitive) && !bufferInfo.buffer().compare(buf, Qt::CaseInsensitive)) return bufferInfo; } Q_ASSERT(false); // should never happen! @@ -136,7 +132,7 @@ SignalProxy *Client::signalProxy() { Client::Client(QObject *parent) : QObject(parent), socket(0), - _signalProxy(new SignalProxy(SignalProxy::Client, 0, this)), + _signalProxy(new SignalProxy(SignalProxy::Client, this)), mainUi(0), _bufferModel(0), connectedToCore(false) @@ -144,6 +140,7 @@ Client::Client(QObject *parent) } Client::~Client() { + } void Client::init() { @@ -196,10 +193,21 @@ bool Client::isConnected() { return instance()->connectedToCore; } +void Client::fakeInput(uint bufferUid, QString message) { + Buffer *buff = buffer(bufferUid); + if(!buff) + qWarning() << "No Buffer with uid" << bufferUid << "can't send Input" << message; + else + emit instance()->sendInput(buff->bufferInfo(), message); +} + +void Client::fakeInput(BufferInfo bufferInfo, QString message) { + fakeInput(bufferInfo, message); +} + void Client::connectToCore(const QVariantMap &conn) { // TODO implement SSL coreConnectionInfo = conn; - if(isConnected()) { emit coreConnectionError(tr("Already connected to Core!")); return; @@ -224,9 +232,7 @@ void Client::connectToCore(const QVariantMap &conn) { socket = sock; connect(sock, SIGNAL(readyRead()), this, SLOT(coreHasData())); connect(sock, SIGNAL(connected()), this, SLOT(coreSocketConnected())); - connect(sock, SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected())); - connect(signalProxy(), SIGNAL(peerDisconnected()), this, SLOT(coreSocketDisconnected())); - //connect(sock, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(coreSocketStateChanged(QAbstractSocket::SocketState))); + connect(signalProxy(), SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected())); connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(coreSocketError(QAbstractSocket::SocketError))); sock->connectToHost(conn["Host"].toString(), conn["Port"].toUInt()); } @@ -234,8 +240,10 @@ void Client::connectToCore(const QVariantMap &conn) { void Client::disconnectFromCore() { socket->close(); - if(clientMode == LocalCore) - coreSocketDisconnected(); +} + +void Client::setCoreConfiguration(const QVariantMap &settings) { + writeDataToDevice(socket, settings); } void Client::coreSocketConnected() { @@ -257,15 +265,24 @@ void Client::coreSocketDisconnected() { /* Clear internal data. Hopefully nothing relies on it at this point. */ _bufferModel->clear(); - foreach(Buffer *buffer, _buffers.values()) { - delete buffer; + QHash::iterator bufferIter = _buffers.begin(); + while(bufferIter != _buffers.end()) { + Buffer *buffer = bufferIter.value(); + disconnect(buffer, SIGNAL(destroyed()), this, 0); + bufferIter = _buffers.erase(bufferIter); + buffer->deleteLater(); } - Q_ASSERT(_buffers.empty()); + Q_ASSERT(_buffers.isEmpty()); + - foreach(NetworkInfo *networkinfo, _networkInfo.values()) { - delete networkinfo; + QHash::iterator netIter = _networkInfo.begin(); + while(netIter != _networkInfo.end()) { + NetworkInfo *net = netIter.value(); + disconnect(net, SIGNAL(destroyed()), this, 0); + netIter = _networkInfo.erase(netIter); + net->deleteLater(); } - Q_ASSERT(_networkInfo.empty()); + Q_ASSERT(_networkInfo.isEmpty()); coreConnectionInfo.clear(); sessionData.clear(); @@ -273,10 +290,6 @@ void Client::coreSocketDisconnected() { layoutTimer->stop(); } -void Client::coreSocketStateChanged(QAbstractSocket::SocketState state) { - if(state == QAbstractSocket::UnconnectedState) coreSocketDisconnected(); -} - void Client::recvCoreState(const QVariant &state) { disconnect(this, SIGNAL(recvPartialItem(uint, uint)), this, SIGNAL(coreConnectionProgress(uint, uint))); disconnect(socket, 0, this, 0); // rest of communication happens through SignalProxy @@ -311,9 +324,10 @@ void Client::syncToCore(const QVariant &coreState) { foreach(QVariant networkid, networkids) { networkConnected(networkid.toUInt()); } - + instance()->connectedToCore = true; updateCoreConnectionProgress(); + } void Client::updateCoreConnectionProgress() { @@ -346,7 +360,6 @@ void Client::updateCoreConnectionProgress() { if(! channel->initialized()) numChannelsWaiting++; } - } if(numNetsWaiting > 0) { @@ -369,6 +382,11 @@ void Client::updateCoreConnectionProgress() { emit coreConnectionProgress(1,1); emit connected(); + foreach(NetworkInfo *net, networkInfos()) { + disconnect(net, 0, this, SLOT(updateCoreConnectionProgress())); + } + + // signalProxy()->dumpProxyStats(); } void Client::recvSessionData(const QString &key, const QVariant &data) { @@ -402,7 +420,14 @@ void Client::coreHasData() { QVariant item; if(readDataFromDevice(socket, blockSize, item)) { emit recvPartialItem(1,1); - recvCoreState(item); + QVariantMap msg = item.toMap(); + if (!msg["StartWizard"].toBool()) { + recvCoreState(msg["Reply"]); + } else { + qWarning("Core not configured!"); + qDebug() << "Available storage providers: " << msg["StorageProviders"].toStringList(); + emit showConfigWizard(msg); + } blockSize = 0; return; } @@ -417,10 +442,16 @@ void Client::networkConnected(uint netid) { //Buffer *b = buffer(id); //b->setActive(true); - NetworkInfo *netinfo = new NetworkInfo(netid, signalProxy(), this); - connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress())); - connect(netinfo, SIGNAL(ircUserInitDone()), this, SLOT(updateCoreConnectionProgress())); - connect(netinfo, SIGNAL(ircChannelInitDone()), this, SLOT(updateCoreConnectionProgress())); + NetworkInfo *netinfo = new NetworkInfo(netid, this); + netinfo->setProxy(signalProxy()); + + if(!isConnected()) { + connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress())); + connect(netinfo, SIGNAL(ircUserInitDone()), this, SLOT(updateCoreConnectionProgress())); + connect(netinfo, SIGNAL(ircChannelInitDone()), this, SLOT(updateCoreConnectionProgress())); + } + connect(netinfo, SIGNAL(ircChannelAdded(QString)), this, SLOT(ircChannelAdded(QString))); + connect(netinfo, SIGNAL(destroyed()), this, SLOT(networkInfoDestroyed())); _networkInfo[netid] = netinfo; } @@ -432,7 +463,7 @@ void Client::networkDisconnected(uint networkid) { //buffer->displayMsg(Message(bufferid, Message::Server, tr("Server disconnected."))); FIXME buffer->setActive(false); } - + Q_ASSERT(networkInfo(networkid)); if(!networkInfo(networkid)->initialized()) { qDebug() << "Network" << networkid << "disconnected while not yet initialized!"; @@ -440,13 +471,31 @@ void Client::networkDisconnected(uint networkid) { } } +void Client::ircChannelAdded(QString chanName) { + NetworkInfo *netInfo = qobject_cast(sender()); + Q_ASSERT(netInfo); + Buffer *buf = buffer(bufferInfo(netInfo->networkName(), chanName)); + Q_ASSERT(buf); + buf->setIrcChannel(netInfo->ircChannel(chanName)); + +} + void Client::updateBufferInfo(BufferInfo id) { buffer(id)->updateBufferInfo(id); } +void Client::bufferDestroyed() { + Buffer *buffer = static_cast(sender()); + uint bufferUid = buffer->uid(); + if(_buffers.contains(bufferUid)) + _buffers.remove(bufferUid); +} -void Client::removeBuffer(Buffer *b) { - _buffers.remove(b->bufferInfo().uid()); +void Client::networkInfoDestroyed() { + NetworkInfo *netinfo = static_cast(sender()); + uint networkId = netinfo->networkId(); + if(_networkInfo.contains(networkId)) + _networkInfo.remove(networkId); } void Client::recvMessage(const Message &msg) {