/***************************************************************************
- * Copyright (C) 2005-07 by the Quassel IRC Team *
+ * Copyright (C) 2005-08 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
***************************************************************************/
#include "coresession.h"
-#include "server.h"
+#include "networkconnection.h"
#include "signalproxy.h"
#include "storage.h"
-#include "networkinfo.h"
+#include "network.h"
#include "ircuser.h"
#include "ircchannel.h"
+#include "identity.h"
#include "util.h"
+#include "coreusersettings.h"
#include <QtScript>
storage(_storage),
scriptEngine(new QScriptEngine(this))
{
-
- QSettings s;
- s.beginGroup(QString("SessionData/%1").arg(user));
- mutex.lock();
- foreach(QString key, s.allKeys()) {
- sessionData[key] = s.value(key);
- }
- mutex.unlock();
SignalProxy *p = signalProxy();
- p->attachSlot(SIGNAL(requestNetworkStates()), this, SLOT(serverStateRequested()));
+ 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(sendInput(BufferInfo, QString)), this, SLOT(msgFromGui(BufferInfo, QString)));
p->attachSlot(SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)), this, SLOT(sendBacklog(BufferInfo, QVariant, QVariant)));
p->attachSignal(storage, 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 &)));
- /* Autoconnect. (When) do we actually do this?
- --> session restore should be enough!
- QStringList list;
- QVariantMap networks = retrieveSessionData("Networks").toMap();
- foreach(QString net, networks.keys()) {
- if(networks[net].toMap()["AutoConnect"].toBool()) {
- list << net;
- }
- } qDebug() << list;
- if(list.count()) connectToIrc(list);
- */
+
+ 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);
+ }
}
CoreSession::~CoreSession() {
QVariant CoreSession::state() const {
QVariantMap res;
QList<QVariant> conn;
- foreach(Server *server, servers.values()) {
- if(server->isConnected()) {
+ foreach(NetworkConnection *net, connections.values()) {
+ if(net->isConnected()) {
QVariantMap m;
- m["Network"] = server->networkName();
- m["State"] = server->state();
+ m["Network"] = net->networkName();
+ m["State"] = net->state();
conn << m;
}
}
void CoreSession::storeSessionData(const QString &key, const QVariant &data) {
- QSettings s;
- s.beginGroup(QString("SessionData/%1").arg(user));
+ CoreUserSettings s(user);
mutex.lock();
+ s.setSessionValue(key, data);
sessionData[key] = data;
- s.setValue(key, data);
mutex.unlock();
- s.endGroup();
emit sessionDataChanged(key, data);
emit sessionDataChanged(key);
}
}
// FIXME switch to NetworkIDs
-void CoreSession::connectToNetwork(QString network, const QVariant &previousState) {
- uint networkid = getNetworkId(network);
+void CoreSession::connectToNetwork(QString networkname, const QVariant &previousState) {
+ uint networkid = getNetworkId(networkname);
if(networkid == 0) {
- qWarning() << "unable to connect to Network" << network << "(User:" << userId() << "): unable to determine NetworkId";
+ qWarning() << "unable to connect to Network" << networkname << "(User:" << userId() << "): unable to determine NetworkId";
return;
}
- if(!servers.contains(networkid)) {
- Server *server = new Server(userId(), networkid, network, previousState);
- servers[networkid] = server;
- attachServer(server);
- server->start();
+ if(!connections.contains(networkid)) {
+ NetworkConnection *connection = new NetworkConnection(userId(), networkid, networkname, previousState);
+ connections[networkid] = connection;
+ attachNetworkConnection(connection);
+ connection->start();
}
- emit connectToIrc(network);
+ emit connectToIrc(networkname);
}
-void CoreSession::attachServer(Server *server) {
- connect(this, SIGNAL(connectToIrc(QString)), server, SLOT(connectToIrc(QString)));
- connect(this, SIGNAL(disconnectFromIrc(QString)), server, SLOT(disconnectFromIrc(QString)));
- connect(this, SIGNAL(msgFromGui(uint, QString, QString)), server, SLOT(userInput(uint, QString, QString)));
+void CoreSession::attachNetworkConnection(NetworkConnection *network) {
+ 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(server, SIGNAL(connected(uint)), this, SLOT(serverConnected(uint)));
- connect(server, SIGNAL(disconnected(uint)), this, SLOT(serverDisconnected(uint)));
- connect(server, SIGNAL(displayMsg(Message::Type, QString, QString, QString, quint8)), this, SLOT(recvMessageFromServer(Message::Type, QString, QString, QString, quint8)));
- connect(server, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString)));
+ connect(network, SIGNAL(connected(uint)), this, SLOT(networkConnected(uint)));
+ connect(network, SIGNAL(disconnected(uint)), this, SLOT(networkDisconnected(uint)));
+ connect(network, SIGNAL(displayMsg(Message::Type, QString, QString, QString, quint8)), this, SLOT(recvMessageFromServer(Message::Type, QString, QString, QString, quint8)));
+ connect(network, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString)));
// connect serversignals to proxy
- signalProxy()->attachSignal(server, SIGNAL(serverState(QString, QVariantMap)), SIGNAL(networkState(QString, QVariantMap)));
- signalProxy()->attachSignal(server, SIGNAL(connected(uint)), SIGNAL(networkConnected(uint)));
- signalProxy()->attachSignal(server, SIGNAL(disconnected(uint)), SIGNAL(networkDisconnected(uint)));
+ signalProxy()->attachSignal(network, SIGNAL(networkState(QString, QVariantMap)), SIGNAL(networkState(QString, QVariantMap)));
+ signalProxy()->attachSignal(network, SIGNAL(connected(uint)), SIGNAL(networkConnected(uint)));
+ signalProxy()->attachSignal(network, SIGNAL(disconnected(uint)), SIGNAL(networkDisconnected(uint)));
// TODO add error handling
}
-void CoreSession::serverStateRequested() {
+void CoreSession::networkStateRequested() {
}
void CoreSession::addClient(QIODevice *device) {
return _signalProxy;
}
-void CoreSession::serverConnected(uint networkid) {
- storage->getBufferInfo(userId(), servers[networkid]->networkName()); // create status buffer
+void CoreSession::networkConnected(uint networkid) {
+ storage->getBufferInfo(userId(), connections[networkid]->networkName()); // create status buffer
}
-void CoreSession::serverDisconnected(uint networkid) {
- Q_ASSERT(servers.contains(networkid));
- servers.take(networkid)->deleteLater();
- Q_ASSERT(!servers.contains(networkid));
+void CoreSession::networkDisconnected(uint networkid) {
+ Q_ASSERT(connections.contains(networkid));
+ connections.take(networkid)->deleteLater();
+ Q_ASSERT(!connections.contains(networkid));
}
void CoreSession::msgFromGui(BufferInfo bufid, 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) {
- Server *s = qobject_cast<Server*>(this->sender());
+ NetworkConnection *s = qobject_cast<NetworkConnection*>(this->sender());
Q_ASSERT(s);
BufferInfo buf;
if((flags & Message::PrivMsg) && !(flags & Message::Self)) {
}
void CoreSession::recvStatusMsgFromServer(QString msg) {
- Server *s = qobject_cast<Server*>(sender());
+ NetworkConnection *s = qobject_cast<NetworkConnection*>(sender());
Q_ASSERT(s);
emit displayStatusMsg(s->networkName(), msg);
}
mutex.unlock();
QVariantList networks;
- foreach(uint networkid, servers.keys())
+ foreach(NetworkId networkid, connections.keys())
networks.append(QVariant(networkid));
v["Networks"] = QVariant(networks);
+ QList<QVariant> idlist;
+ foreach(Identity *i, _identities.values()) idlist << QVariant::fromValue<Identity>(*i);
+ v["Identities"] = idlist;
+
// v["Payload"] = QByteArray(100000000, 'a'); // for testing purposes
return v;
}
void CoreSession::scriptRequest(QString script) {
emit scriptResult(scriptEngine->evaluate(script).toString());
}
-
+#include <QDebug>
+void CoreSession::createIdentity(const Identity &id) {
+ // find free ID
+ int i;
+ for(i = 1; i <= _identities.count(); i++) {
+ if(!_identities.keys().contains(i)) break;
+ }
+ //qDebug() << "found free id" << i;
+ Identity *newId = new Identity(id, this);
+ newId->setId(i);
+ _identities[i] = newId;
+ signalProxy()->synchronize(newId);
+ CoreUserSettings s(user);
+ s.storeIdentity(*newId);
+ emit identityCreated(*newId);
+}
+
+void CoreSession::updateIdentity(const Identity &id) {
+ if(!_identities.contains(id.id())) {
+ qWarning() << "Update request for unknown identity received!";
+ return;
+ }
+ _identities[id.id()]->update(id);
+
+ CoreUserSettings s(user);
+ s.storeIdentity(id);
+}
+
+void CoreSession::removeIdentity(IdentityId id) {
+ Identity *i = _identities.take(id);
+ if(i) {
+ emit identityRemoved(id);
+ CoreUserSettings s(user);
+ s.removeIdentity(id);
+ i->deleteLater();
+ }
+}
+
projects / quassel.git / blobdiff