/***************************************************************************
- * 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 *
#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> Client::instanceptr = 0;
// 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!
return bufferInfo(net, "");
}
-BufferTreeModel *Client::bufferModel() {
- return instance()->_bufferModel;
+NetworkModel *Client::networkModel() {
+ return instance()->_networkModel;
}
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),
+ _networkModel(0),
connectedToCore(false)
{
}
Client::~Client() {
+
}
void Client::init() {
blockSize = 0;
- _bufferModel = new BufferTreeModel(this);
+ _networkModel = new NetworkModel(this);
connect(this, SIGNAL(bufferSelected(Buffer *)),
- _bufferModel, SLOT(selectBuffer(Buffer *)));
+ _networkModel, SLOT(selectBuffer(Buffer *)));
connect(this, SIGNAL(bufferUpdated(Buffer *)),
- _bufferModel, SLOT(bufferUpdated(Buffer *)));
+ _networkModel, SLOT(bufferUpdated(Buffer *)));
connect(this, SIGNAL(bufferActivity(Buffer::ActivityLevel, Buffer *)),
- _bufferModel, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *)));
+ _networkModel, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *)));
SignalProxy *p = signalProxy();
p->attachSignal(this, SIGNAL(sendSessionData(const QString &, const QVariant &)),
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());
}
void Client::disconnectFromCore() {
socket->close();
- if(clientMode == LocalCore)
- coreSocketDisconnected();
+}
+
+void Client::setCoreConfiguration(const QVariantMap &settings) {
+ SignalProxy::writeDataToDevice(socket, settings);
}
void Client::coreSocketConnected() {
clientInit["GuiProtocol"] = GUI_PROTOCOL;
clientInit["User"] = coreConnectionInfo["User"].toString();
clientInit["Password"] = coreConnectionInfo["Password"].toString();
- writeDataToDevice(socket, clientInit);
+ SignalProxy::writeDataToDevice(socket, clientInit);
}
void Client::coreSocketDisconnected() {
blockSize = 0;
/* Clear internal data. Hopefully nothing relies on it at this point. */
- _bufferModel->clear();
+ _networkModel->clear();
- foreach(Buffer *buffer, _buffers.values()) {
+ QHash<uint, Buffer *>::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.isEmpty());
- foreach(NetworkInfo *networkinfo, _networkInfo.values()) {
- networkinfo->deleteLater();
+
+ QHash<uint, NetworkInfo*>::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.isEmpty());
coreConnectionInfo.clear();
sessionData.clear();
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
foreach(QVariant networkid, networkids) {
networkConnected(networkid.toUInt());
}
-
+
instance()->connectedToCore = true;
updateCoreConnectionProgress();
+
}
void Client::updateCoreConnectionProgress() {
if(! channel->initialized())
numChannelsWaiting++;
}
-
}
if(numNetsWaiting > 0) {
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) {
void Client::coreHasData() {
QVariant item;
- if(readDataFromDevice(socket, blockSize, item)) {
+ if(SignalProxy::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;
}
//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());
+ networkModel()->attachNetworkInfo(netinfo);
+
+ 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;
}
//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!";
}
}
+void Client::ircChannelAdded(QString chanName) {
+ NetworkInfo *netInfo = qobject_cast<NetworkInfo*>(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<Buffer *>(sender());
- _buffers.remove(_buffers.key(buffer));
+ uint bufferUid = buffer->uid();
+ if(_buffers.contains(bufferUid))
+ _buffers.remove(bufferUid);
+}
+
+void Client::networkInfoDestroyed() {
+ NetworkInfo *netinfo = static_cast<NetworkInfo *>(sender());
+ uint networkId = netinfo->networkId();
+ if(_networkInfo.contains(networkId))
+ _networkInfo.remove(networkId);
}
void Client::recvMessage(const Message &msg) {
projects / quassel.git / blobdiff