X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=ec01b283f2086768b8c32dbd9979c3afd8bd5f55;hp=f2d1ddd89abf43435d900035ce1e97ab24c9a75f;hb=924e2c01204da172a071d34485936b379372e497;hpb=748f25bbae0e0ca8df58ec69df8d19c84ae77252

diff --git a/src/client/client.cpp b/src/client/client.cpp
index f2d1ddd8..ec01b283 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -30,7 +30,6 @@
 #include "buffertreemodel.h"
 #include "quasselui.h"
 #include "signalproxy.h"
-#include "synchronizer.h"
 #include "util.h"
 
 QPointer<Client> Client::instanceptr = 0;
@@ -133,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)
@@ -232,9 +231,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());
   }
@@ -242,8 +239,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() {
@@ -265,24 +264,31 @@ void Client::coreSocketDisconnected() {
   /* Clear internal data. Hopefully nothing relies on it at this point. */
   _bufferModel->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();
   layoutQueue.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
@@ -317,9 +323,10 @@ void Client::syncToCore(const QVariant &coreState) {
   foreach(QVariant networkid, networkids) {
     networkConnected(networkid.toUInt());
   }
-  
+
   instance()->connectedToCore = true;
   updateCoreConnectionProgress();
+
 }
 
 void Client::updateCoreConnectionProgress() {
@@ -352,7 +359,6 @@ void Client::updateCoreConnectionProgress() {
       if(! channel->initialized())
 	numChannelsWaiting++;
     }
-
   }
 
   if(numNetsWaiting > 0) {
@@ -375,6 +381,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) {
@@ -408,7 +419,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;
   }
@@ -423,10 +441,15 @@ 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(destroyed()), this, SLOT(networkInfoDestroyed()));
   _networkInfo[netid] = netinfo;
 }
 
@@ -452,7 +475,16 @@ void Client::updateBufferInfo(BufferInfo 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) {