/***************************************************************************
- * Copyright (C) 2005-07 by The Quassel IRC Development 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 *
* 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 "coresession.h"
#include "server.h"
+
#include "signalproxy.h"
#include "storage.h"
+
+#include "networkinfo.h"
+#include "ircuser.h"
+#include "ircchannel.h"
+#include "identity.h"
+
#include "util.h"
+#include "sessionsettings.h"
-CoreSession::CoreSession(UserId uid, Storage *_storage, QObject *parent) : QObject(parent), user(uid), storage(_storage) {
- _signalProxy = new SignalProxy(SignalProxy::Server, 0, this);
+#include <QtScript>
- QSettings s;
- s.beginGroup(QString("SessionData/%1").arg(user));
+CoreSession::CoreSession(UserId uid, Storage *_storage, QObject *parent)
+ : QObject(parent),
+ user(uid),
+ _signalProxy(new SignalProxy(SignalProxy::Server, 0, this)),
+ storage(_storage),
+ scriptEngine(new QScriptEngine(this))
+{
+
+ SignalProxy *p = signalProxy();
+
+ SessionSettings s(user);
+ sessionData = s.sessionData(); qDebug() << sessionData;
+ /*
+ QSettings s; // FIXME don't use QSettings anymore
mutex.lock();
- foreach(QString key, s.allKeys()) {
+ s.beginGroup(QString("SessionData/%1").arg(user));
+ foreach(QString key, s.allKeys()) { qDebug() << key;
sessionData[key] = s.value(key);
}
+ s.endGroup();
+ mutex.unlock(); // FIXME remove
+ */
+ /* temporarily disabled
+ s.beginGroup(QString("Identities/%1").arg(user));
+ foreach(QString id, s.childKeys()) {
+ Identity *i = new Identity(s.value(id).value<Identity>(), this);
+ if(i->id() < 1) {
+ qDebug() << QString("Invalid identity!");
+ continue;
+ }
+ if(_identities.contains(i->id())) {
+ qDebug() << "Duplicate identity, ignoring!";
+ continue;
+ }
+ qDebug() << "loaded identity" << id;
+ _identities[i->id()] = i;
+ }
+ s.endGroup();
mutex.unlock();
+ if(!_identities.count()) {
+ Identity i(1);
+ i.setToDefaults();
+ //_identities[i->id()] = i;
+ createOrUpdateIdentity(i);
+ }
+ */
- SignalProxy *p = signalProxy();
-
- p->attachSlot(SIGNAL(requestNetworkStates()), this, SIGNAL(serverStateRequested()));
+ p->attachSlot(SIGNAL(requestNetworkStates()), this, SLOT(serverStateRequested()));
p->attachSlot(SIGNAL(requestConnect(QString)), this, SLOT(connectToNetwork(QString)));
- p->attachSlot(SIGNAL(sendInput(BufferId, QString)), this, SLOT(msgFromGui(BufferId, QString)));
- p->attachSlot(SIGNAL(importOldBacklog()), storage, SLOT(importOldBacklog()));
- p->attachSlot(SIGNAL(requestBacklog(BufferId, QVariant, QVariant)), this, SLOT(sendBacklog(BufferId, QVariant, QVariant)));
- p->attachSlot(SIGNAL(requestNetworkStates()), this, SLOT(sendServerStates()));
+ 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(this, SIGNAL(displayMsg(Message)));
p->attachSignal(this, SIGNAL(displayStatusMsg(QString, QString)));
- p->attachSignal(this, SIGNAL(backlogData(BufferId, QVariantList, bool)));
- p->attachSignal(this, SIGNAL(bufferIdUpdated(BufferId)));
- p->attachSignal(storage, SIGNAL(bufferIdUpdated(BufferId)));
+ p->attachSignal(this, SIGNAL(backlogData(BufferInfo, QVariantList, bool)));
+ p->attachSignal(this, SIGNAL(bufferInfoUpdated(BufferInfo)));
+ 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?
- 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(createOrUpdateIdentity(const Identity &)));
+ p->attachSlot(SIGNAL(updateIdentity(const Identity &)), this, SLOT(createOrUpdateIdentity(const Identity &)));
+ p->attachSlot(SIGNAL(removeIdentity(IdentityId)), this, SLOT(removeIdentity(IdentityId)));
+
+ initScriptEngine();
+
+ foreach(Identity *id, _identities.values()) {
+ p->synchronize(id);
+ }
}
CoreSession::~CoreSession() {
-
}
UserId CoreSession::userId() const {
return user;
}
+QVariant CoreSession::state() const {
+ QVariantMap res;
+ QList<QVariant> conn;
+ foreach(Server *server, servers.values()) {
+ if(server->isConnected()) {
+ QVariantMap m;
+ m["Network"] = server->networkName();
+ m["State"] = server->state();
+ conn << m;
+ }
+ }
+ res["ConnectedServers"] = conn;
+ return res;
+}
+
+void CoreSession::restoreState(const QVariant &previousState) {
+ // Session restore
+ QVariantMap state = previousState.toMap();
+ if(state.contains("ConnectedServers")) {
+ foreach(QVariant v, state["ConnectedServers"].toList()) {
+ QVariantMap m = v.toMap();
+ QString net = m["Network"].toString();
+ if(!net.isEmpty()) connectToNetwork(net, m["State"]);
+ }
+ }
+}
+
+
void CoreSession::storeSessionData(const QString &key, const QVariant &data) {
- QSettings s;
- s.beginGroup(QString("SessionData/%1").arg(user));
+ SessionSettings 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);
}
return data;
}
-void CoreSession::connectToNetwork(QString network) {
- QStringList networks; networks << network; // FIXME obsolete crap
- foreach(QString net, networks) {
- if(servers.contains(net)) {
-
- } else {
- Server *server = new Server(userId(), net);
- connect(this, SIGNAL(serverStateRequested()), server, SLOT(sendState()));
- connect(this, SIGNAL(connectToIrc(QString)), server, SLOT(connectToIrc(QString)));
- connect(this, SIGNAL(disconnectFromIrc(QString)), server, SLOT(disconnectFromIrc(QString)));
- connect(this, SIGNAL(msgFromGui(QString, QString, QString)), server, SLOT(userInput(QString, QString, QString)));
-
- connect(server, SIGNAL(connected(QString)), this, SLOT(serverConnected(QString)));
- connect(server, SIGNAL(disconnected(QString)), this, SLOT(serverDisconnected(QString)));
- 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)));
-
- SignalProxy *p = signalProxy();
- p->attachSignal(server, SIGNAL(serverState(QString, QVariantMap)), SIGNAL(networkState(QString, QVariantMap)));
- p->attachSignal(server, SIGNAL(modeSet(QString, QString, QString)));
- p->attachSignal(server, SIGNAL(nickAdded(QString, QString, QVariantMap)));
- p->attachSignal(server, SIGNAL(nickRenamed(QString, QString, QString)));
- p->attachSignal(server, SIGNAL(nickRemoved(QString, QString)));
- p->attachSignal(server, SIGNAL(nickUpdated(QString, QString, QVariantMap)));
- p->attachSignal(server, SIGNAL(ownNickSet(QString, QString)));
- p->attachSignal(server, SIGNAL(queryRequested(QString, QString)));
- // TODO add error handling
- p->attachSignal(server, SIGNAL(connected(QString)), SIGNAL(networkConnected(QString)));
- p->attachSignal(server, SIGNAL(disconnected(QString)), SIGNAL(networkDisconnected(QString)));
-
- server->start();
- servers[net] = server;
- }
- emit connectToIrc(net);
+// FIXME switch to NetworkIDs
+void CoreSession::connectToNetwork(QString network, const QVariant &previousState) {
+ uint networkid = getNetworkId(network);
+ if(networkid == 0) {
+ qWarning() << "unable to connect to Network" << network << "(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();
}
+ emit connectToIrc(network);
+}
+
+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)));
+
+ 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 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)));
+ // TODO add error handling
+}
+
+void CoreSession::serverStateRequested() {
}
void CoreSession::addClient(QIODevice *device) {
return _signalProxy;
}
-void CoreSession::serverConnected(QString net) {
- storage->getBufferId(userId(), net); // create status buffer
+void CoreSession::serverConnected(uint networkid) {
+ storage->getBufferInfo(userId(), servers[networkid]->networkName()); // create status buffer
}
-void CoreSession::serverDisconnected(QString net) {
- delete servers[net];
- servers.remove(net);
- signalProxy()->sendSignal(SIGNAL(networkDisconnected(QString)), net); // FIXME does this work?
+void CoreSession::serverDisconnected(uint networkid) {
+ Q_ASSERT(servers.contains(networkid));
+ servers.take(networkid)->deleteLater();
+ Q_ASSERT(!servers.contains(networkid));
}
-void CoreSession::msgFromGui(BufferId bufid, QString msg) {
- emit msgFromGui(bufid.network(), bufid.buffer(), msg);
+void CoreSession::msgFromGui(BufferInfo bufid, QString msg) {
+ emit msgFromGui(bufid.networkId(), bufid.buffer(), 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());
Q_ASSERT(s);
- BufferId buf;
+ BufferInfo buf;
if((flags & Message::PrivMsg) && !(flags & Message::Self)) {
- buf = storage->getBufferId(user, s->getNetwork(), nickFromMask(sender));
+ buf = storage->getBufferInfo(user, s->networkName(), nickFromMask(sender));
} else {
- buf = storage->getBufferId(user, s->getNetwork(), target);
+ buf = storage->getBufferInfo(user, s->networkName(), target);
}
Message msg(buf, type, text, sender, flags);
- msg.msgId = storage->logMessage(msg);
- Q_ASSERT(msg.msgId);
+ msg.setMsgId(storage->logMessage(msg));
+ Q_ASSERT(msg.msgId());
emit displayMsg(msg);
}
void CoreSession::recvStatusMsgFromServer(QString msg) {
Server *s = qobject_cast<Server*>(sender());
Q_ASSERT(s);
- emit displayStatusMsg(s->getNetwork(), msg);
+ emit displayStatusMsg(s->networkName(), msg);
}
-QList<BufferId> CoreSession::buffers() const {
+uint CoreSession::getNetworkId(const QString &net) const {
+ return storage->getNetworkId(user, net);
+}
+
+QList<BufferInfo> CoreSession::buffers() const {
return storage->requestBuffers(user);
}
QVariant CoreSession::sessionState() {
QVariantMap v;
- QList<QVariant> bufs;
- foreach(BufferId id, storage->requestBuffers(user)) { bufs.append(QVariant::fromValue(id)); }
+
+ QVariantList bufs;
+ foreach(BufferInfo id, storage->requestBuffers(user))
+ bufs.append(QVariant::fromValue(id));
v["Buffers"] = bufs;
+
mutex.lock();
v["SessionData"] = sessionData;
mutex.unlock();
- v["Networks"] = QVariant(servers.keys());
+
+ QVariantList networks;
+ foreach(NetworkId networkid, servers.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::sendServerStates() {
- emit serverStateRequested();
-}
-
-void CoreSession::sendBacklog(BufferId id, QVariant v1, QVariant v2) {
+void CoreSession::sendBacklog(BufferInfo id, QVariant v1, QVariant v2) {
QList<QVariant> log;
QList<Message> msglist;
if(v1.type() == QVariant::DateTime) {
}
if(log.count() > 0) emit backlogData(id, log, true);
}
+
+
+void CoreSession::initScriptEngine() {
+ signalProxy()->attachSlot(SIGNAL(scriptRequest(QString)), this, SLOT(scriptRequest(QString)));
+ signalProxy()->attachSignal(this, SIGNAL(scriptResult(QString)));
+
+ QScriptValue storage_ = scriptEngine->newQObject(storage);
+ scriptEngine->globalObject().setProperty("storage", storage_);
+}
+
+void CoreSession::scriptRequest(QString script) {
+ emit scriptResult(scriptEngine->evaluate(script).toString());
+}
+
+void CoreSession::createOrUpdateIdentity(const Identity &id) {
+ if(!_identities.contains(id.id())) {
+ // create new
+ _identities[id.id()] = new Identity(id, this);
+ signalProxy()->synchronize(_identities[id.id()]);
+ emit identityCreated(id.id());
+ } else {
+ // update
+ _identities[id.id()]->update(id);
+ }
+ Q_ASSERT(false); // FIX QSettings first!
+ QSettings s; // FIXME don't use QSettings
+ s.beginGroup(QString("Identities/%1").arg(user));
+ s.setValue(QString::number(id.id()), QVariant::fromValue<Identity>(*_identities[id.id()]));
+ s.endGroup();
+}
+
+void CoreSession::removeIdentity(IdentityId id) {
+ Identity *i = _identities.take(id);
+ if(i) {
+ emit identityRemoved(id);
+ i->deleteLater();
+ }
+}
+
projects / quassel.git / blobdiff