X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=54457c74b1d0d7dcdf4b9b598ce4e0d25946ef87;hp=910bca14bf161cd0838764fa4800f2ad37061fe3;hb=152e7c35efbf97e40d91c60cdb9c3ba734f09fb2;hpb=6f2f1723f5bb3d26908f6dd297890f6fba43793b

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 910bca14..54457c74 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -43,33 +43,8 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObje
 
   SignalProxy *p = signalProxy();
 
-  CoreUserSettings s(user());
-  sessionData = s.sessionData();
-
-  foreach(IdentityId id, s.identityIds()) {
-    Identity *i = new Identity(s.identity(id), this);
-    if(!i->isValid()) {
-      qWarning() << QString("Invalid identity! Removing...");
-      s.removeIdentity(id);
-      delete i;
-      continue;
-    }
-    if(_identities.contains(i->id())) {
-      qWarning() << "Duplicate identity, ignoring!";
-      delete i;
-      continue;
-    }
-    _identities[i->id()] = i;
-  }
-  if(!_identities.count()) {
-    Identity i(1);
-    i.setToDefaults();
-    i.setIdentityName(tr("Default Identity"));
-    createIdentity(i);
-  }
-
-  //p->attachSlot(SIGNAL(requestNetworkStates()), this, SLOT(networkStateRequested()));
   p->attachSlot(SIGNAL(requestConnect(QString)), this, SLOT(connectToNetwork(QString)));
+  p->attachSlot(SIGNAL(disconnectFromNetwork(NetworkId)), this, SLOT(disconnectFromNetwork(NetworkId))); // FIXME
   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)));
@@ -77,41 +52,20 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObje
   p->attachSignal(this, SIGNAL(backlogData(BufferInfo, QVariantList, bool)));
   p->attachSignal(this, 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 &)));
-
   p->attachSignal(this, SIGNAL(identityCreated(const Identity &)));
   p->attachSignal(this, SIGNAL(identityRemoved(IdentityId)));
   p->attachSlot(SIGNAL(createIdentity(const Identity &)), this, SLOT(createIdentity(const Identity &)));
   p->attachSlot(SIGNAL(updateIdentity(const Identity &)), this, SLOT(updateIdentity(const Identity &)));
   p->attachSlot(SIGNAL(removeIdentity(IdentityId)), this, SLOT(removeIdentity(IdentityId)));
 
-  initScriptEngine();
-
-  foreach(Identity *id, _identities.values()) {
-    p->synchronize(id);
-  }
+  p->attachSignal(this, SIGNAL(networkCreated(NetworkId)));
+  p->attachSignal(this, SIGNAL(networkRemoved(NetworkId)));
+  p->attachSlot(SIGNAL(createNetwork(const NetworkInfo &)), this, SLOT(createNetwork(const NetworkInfo &)));
+  p->attachSlot(SIGNAL(updateNetwork(const NetworkInfo &)), this, SLOT(updateNetwork(const NetworkInfo &)));
+  p->attachSlot(SIGNAL(removeNetwork(NetworkId)), this, SLOT(removeNetwork(NetworkId)));
 
-  // 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<QVariantMap> slist;
-    foreach(QVariant v, network["Servers"].toList()) slist << v.toMap();
-    net->setServerList(slist);
-    net->setProxy(p);
-    _networks[netid] = net;
-    p->synchronize(net);
-  }
+  loadSettings();
+  initScriptEngine();
 
   // Restore session state
   if(restoreState) restoreSessionState();
@@ -121,6 +75,12 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObje
 
 CoreSession::~CoreSession() {
   saveSessionState();
+  foreach(NetworkConnection *conn, _connections.values()) {
+    delete conn;
+  }
+  foreach(Network *net, _networks.values()) {
+    delete net;
+  }
 }
 
 UserId CoreSession::user() const {
@@ -142,6 +102,58 @@ Identity *CoreSession::identity(IdentityId id) const {
   return 0;
 }
 
+void CoreSession::loadSettings() {
+  CoreUserSettings s(user());
+
+  foreach(IdentityId id, s.identityIds()) {
+    Identity *i = new Identity(s.identity(id), this);
+    if(!i->isValid()) {
+      qWarning() << QString("Invalid identity! Removing...");
+      s.removeIdentity(id);
+      delete i;
+      continue;
+    }
+    if(_identities.contains(i->id())) {
+      qWarning() << "Duplicate identity, ignoring!";
+      delete i;
+      continue;
+    }
+    _identities[i->id()] = i;
+    signalProxy()->synchronize(i);
+  }
+  if(!_identities.count()) {
+    Identity i(1);
+    i.setToDefaults();
+    i.setIdentityName(tr("Default Identity"));
+    createIdentity(i);
+  }
+
+
+  // migration to pure DB storage
+  QList<NetworkId> netIds = s.networkIds();
+  if(!netIds.isEmpty()) {
+    qDebug() << "Migrating Networksettings to DB Storage for User:" << user();
+    foreach(NetworkId id, netIds) {
+      NetworkInfo info = s.networkInfo(id);
+
+      // default new options
+      info.useRandomServer = false;
+      info.useAutoReconnect = true;
+      info.autoReconnectInterval = 60;
+      info.autoReconnectRetries = 20;
+      info.useAutoIdentify = false;
+      info.rejoinChannels = true;
+
+      Core::updateNetwork(user(), info);
+      s.removeNetworkInfo(id);
+    }
+  }
+
+  foreach(NetworkInfo info, Core::networks(user())) {
+    createNetwork(info);
+  }
+}
+
 void CoreSession::saveSessionState() const {
   QVariantMap res;
   QVariantList conn;
@@ -171,22 +183,6 @@ void CoreSession::restoreSessionState() {
   }
 }
 
-
-void CoreSession::storeSessionData(const QString &key, const QVariant &data) {
-  CoreUserSettings s(user());
-  s.setSessionValue(key, data);
-  sessionData[key] = data;
-  emit sessionDataChanged(key, data);
-  emit sessionDataChanged(key);
-}
-
-QVariant CoreSession::retrieveSessionData(const QString &key, const QVariant &def) {
-  QVariant data;
-  if(!sessionData.contains(key)) data = def;
-  else data = sessionData[key];
-  return data;
-}
-
 void CoreSession::updateBufferInfo(UserId uid, const BufferInfo &bufinfo) {
   if(uid == user()) emit bufferInfoUpdated(bufinfo);
 }
@@ -218,24 +214,27 @@ void CoreSession::connectToNetwork(NetworkId id, const QVariant &previousState)
     conn = new NetworkConnection(net, this, previousState);
     _connections[id] = conn;
     attachNetworkConnection(conn);
-    conn->connectToIrc();
   }
+  conn->connectToIrc();
 }
 
 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)));
+  // I guess we don't need these anymore, client-side can just connect the network's signals directly
+  //signalProxy()->attachSignal(conn, SIGNAL(connected(NetworkId)), SIGNAL(networkConnected(NetworkId)));
+  //signalProxy()->attachSignal(conn, SIGNAL(disconnected(NetworkId)), SIGNAL(networkDisconnected(NetworkId)));
+
+  connect(conn, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)),
+	  this, SLOT(recvMessageFromServer(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)));
   connect(conn, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString)));
 
-  // TODO add error handling
+}
+
+void CoreSession::disconnectFromNetwork(NetworkId id) {
+  if(!_connections.contains(id)) return;
+  _connections[id]->disconnectFromIrc();
 }
 
 void CoreSession::networkStateRequested() {
@@ -258,26 +257,24 @@ SignalProxy *CoreSession::signalProxy() const {
   return _signalProxy;
 }
 
+// FIXME we need a sane way for creating buffers!
 void CoreSession::networkConnected(NetworkId networkid) {
-  network(networkid)->setConnected(true);
-  Core::bufferInfo(user(), networkConnection(networkid)->networkName()); // create status buffer
+  Core::bufferInfo(user(), networkid, BufferInfo::StatusBuffer); // create status buffer
 }
 
 void CoreSession::networkDisconnected(NetworkId networkid) {
   // FIXME
   // connection should only go away on explicit /part, and handle reconnections etcpp internally otherwise
-  network(networkid)->setConnected(false);
 
   Q_ASSERT(_connections.contains(networkid));
   _connections.take(networkid)->deleteLater();
-  Q_ASSERT(!_connections.contains(networkid));
 }
 
 // FIXME switch to BufferId
 void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg) {
   NetworkConnection *conn = networkConnection(bufinfo.networkId());
   if(conn) {
-    conn->userInput(bufinfo.buffer(), msg);
+    conn->userInput(bufinfo, msg);
   } else {
     qWarning() << "Trying to send to unconnected network!";
   }
@@ -285,16 +282,12 @@ void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg) {
 
 // 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) {
-  NetworkConnection *s = qobject_cast<NetworkConnection*>(this->sender());
-  Q_ASSERT(s);
-  BufferInfo buf;
-  if((flags & Message::PrivMsg) && !(flags & Message::Self)) {
-    buf = Core::bufferInfo(user(), s->networkName(), nickFromMask(sender));
-  } else {
-    buf = Core::bufferInfo(user(), s->networkName(), target);
-  }
-  Message msg(buf, type, text, sender, flags);
+void CoreSession::recvMessageFromServer(Message::Type type, BufferInfo::Type bufferType, QString target, QString text, QString sender, quint8 flags) {
+  NetworkConnection *netCon = qobject_cast<NetworkConnection*>(this->sender());
+  Q_ASSERT(netCon);
+  
+  BufferInfo bufferInfo = Core::bufferInfo(user(), netCon->networkId(), bufferType, target);
+  Message msg(bufferInfo, type, text, sender, flags);
   msg.setMsgId(Core::storeMessage(msg));
   Q_ASSERT(msg.msgId() != 0);
   emit displayMsg(msg);
@@ -334,9 +327,7 @@ QVariant CoreSession::sessionState() {
   foreach(Identity *i, _identities.values()) idlist << qVariantFromValue(*i);
   v["Identities"] = idlist;
 
-  v["SessionData"] = sessionData;
-
-    //v["Payload"] = QByteArray(100000000, 'a');  // for testing purposes
+  //v["Payload"] = QByteArray(100000000, 'a');  // for testing purposes
   return v;
 }
 
@@ -374,7 +365,9 @@ void CoreSession::initScriptEngine() {
 void CoreSession::scriptRequest(QString script) {
   emit scriptResult(scriptEngine->evaluate(script).toString());
 }
-#include <QDebug>
+
+/*** Identity Handling ***/
+
 void CoreSession::createIdentity(const Identity &id) {
   // find free ID
   int i;
@@ -412,3 +405,60 @@ void CoreSession::removeIdentity(IdentityId id) {
   }
 }
 
+/*** Network Handling ***/
+
+void CoreSession::createNetwork(const NetworkInfo &info_) {
+  NetworkInfo info = info_;
+  int id;
+
+  if(!info.networkId.isValid())
+    Core::createNetwork(user(), info);
+
+  Q_ASSERT(info.networkId.isValid());
+
+  id = info.networkId.toInt();
+  Q_ASSERT(!_networks.contains(id));
+  
+  Network *net = new Network(id, this);
+  connect(net, SIGNAL(connectRequested(NetworkId)), this, SLOT(connectToNetwork(NetworkId)));
+  connect(net, SIGNAL(disconnectRequested(NetworkId)), this, SLOT(disconnectFromNetwork(NetworkId)));
+  net->setNetworkInfo(info);
+  net->setProxy(signalProxy());
+  _networks[id] = net;
+  signalProxy()->synchronize(net);
+  emit networkCreated(id);
+}
+
+void CoreSession::updateNetwork(const NetworkInfo &info) {
+  if(!_networks.contains(info.networkId)) {
+    qWarning() << "Update request for unknown network received!";
+    return;
+  }
+  _networks[info.networkId]->setNetworkInfo(info);
+  Core::updateNetwork(user(), info);
+}
+
+void CoreSession::removeNetwork(NetworkId id) {
+  // Make sure the network is disconnected!
+  NetworkConnection *conn = _connections.value(id, 0);
+  if(conn) {
+    if(conn->connectionState() != Network::Disconnected) {
+      connect(conn, SIGNAL(disconnected(NetworkId)), this, SLOT(destroyNetwork(NetworkId)));
+      conn->disconnectFromIrc();
+    } else {
+      _connections.take(id)->deleteLater();  // TODO make this saner
+      destroyNetwork(id);
+    }
+  } else {
+    destroyNetwork(id);
+  }
+}
+
+void CoreSession::destroyNetwork(NetworkId id) {
+  Q_ASSERT(!_connections.contains(id));
+  Network *net = _networks.take(id);
+  if(net && Core::removeNetwork(user(), id)) {
+    emit networkRemoved(id);
+    net->deleteLater();
+  }
+}