* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
+#include <QtScript>
+
#include "core.h"
#include "coresession.h"
#include "networkconnection.h"
#include "signalproxy.h"
+#include "buffersyncer.h"
#include "storage.h"
#include "network.h"
#include "util.h"
#include "coreusersettings.h"
-#include <QtScript>
-
CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObject(parent),
_user(uid),
_signalProxy(new SignalProxy(SignalProxy::Server, 0, this)),
+ _bufferSyncer(new BufferSyncer(this)),
scriptEngine(new QScriptEngine(this))
{
SignalProxy *p = signalProxy();
- p->attachSlot(SIGNAL(requestConnect(QString)), this, SLOT(connectToNetwork(QString)));
- p->attachSlot(SIGNAL(disconnectFromNetwork(NetworkId)), this, SLOT(disconnectFromNetwork(NetworkId))); // FIXME
+ //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)));
loadSettings();
initScriptEngine();
+ // init BufferSyncer
+ QHash<BufferId, QDateTime> lastSeenHash = Core::bufferLastSeenDates(user());
+ foreach(BufferId id, lastSeenHash.keys()) _bufferSyncer->requestSetLastSeen(id, lastSeenHash[id]);
+ connect(_bufferSyncer, SIGNAL(lastSeenSet(BufferId, const QDateTime &)), this, SLOT(storeBufferLastSeen(BufferId, const QDateTime &)));
+ connect(_bufferSyncer, SIGNAL(removeBufferRequested(BufferId)), this, SLOT(removeBufferRequested(BufferId)));
+ connect(this, SIGNAL(bufferRemoved(BufferId)), _bufferSyncer, SLOT(removeBuffer(BufferId)));
+ connect(this, SIGNAL(bufferRenamed(BufferId, QString)), _bufferSyncer, SLOT(renameBuffer(BufferId, QString)));
+ p->synchronize(_bufferSyncer);
+
// Restore session state
if(restoreState) restoreSessionState();
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.unlimitedReconnectRetries = false;
+ info.useAutoIdentify = false;
+ info.autoIdentifyService = "NickServ";
+ info.rejoinChannels = true;
+
Core::updateNetwork(user(), info);
s.removeNetworkInfo(id);
}
void CoreSession::saveSessionState() const {
QVariantMap res;
QVariantList conn;
- foreach(NetworkConnection *net, _connections.values()) {
+ foreach(NetworkConnection *nc, _connections.values()) {
+ QHash<QString, QString> persistentChans = nc->network()->persistentChannels();
+ QStringList list;
+ foreach(QString chan, persistentChans.keys()) list << QString("%1/%2").arg(chan).arg(persistentChans.value(chan));
QVariantMap m;
- m["NetworkId"] = QVariant::fromValue<NetworkId>(net->networkId());
- m["State"] = net->state();
+ m["NetworkId"] = QVariant::fromValue<NetworkId>(nc->networkId());
+ m["PersistentChannels"] = list;
conn << m;
}
res["CoreBuild"] = Global::quasselBuild;
QVariantList conn = s.sessionState().toMap()["ConnectedNetworks"].toList();
foreach(QVariant v, conn) {
NetworkId id = v.toMap()["NetworkId"].value<NetworkId>();
- if(_networks.keys().contains(id)) connectToNetwork(id, v.toMap()["State"]);
+ // TODO remove migration code some time
+ QStringList list = v.toMap()["PersistentChannels"].toStringList();
+ if(!list.count()) {
+ // migrate older state
+ QStringList old = v.toMap()["State"].toStringList();
+ foreach(QString chan, old) list << QString("%1/").arg(chan);
+ }
+ foreach(QString chan, list) {
+ QStringList l = chan.split("/");
+ network(id)->addPersistentChannel(l[0], l[1]);
+ }
+ qDebug() << "User" << user() << "connecting to" << network(id)->networkName();
+ connectToNetwork(id);
}
}
}
// FIXME remove
+/*
void CoreSession::connectToNetwork(QString netname, const QVariant &previousState) {
Network *net = 0;
foreach(Network *n, _networks.values()) {
}
connectToNetwork(net->networkId(), previousState);
}
+*/
-void CoreSession::connectToNetwork(NetworkId id, const QVariant &previousState) {
+void CoreSession::connectToNetwork(NetworkId id) {
Network *net = network(id);
if(!net) {
qWarning() << "Connect to unknown network requested! net:" << id << "user:" << user();
NetworkConnection *conn = networkConnection(id);
if(!conn) {
- conn = new NetworkConnection(net, this, previousState);
+ conn = new NetworkConnection(net, this);
_connections[id] = conn;
attachNetworkConnection(conn);
}
void CoreSession::attachNetworkConnection(NetworkConnection *conn) {
connect(conn, SIGNAL(connected(NetworkId)), this, SLOT(networkConnected(NetworkId)));
- connect(conn, SIGNAL(disconnected(NetworkId)), this, SLOT(networkDisconnected(NetworkId)));
+ connect(conn, SIGNAL(quitRequested(NetworkId)), this, SLOT(networkDisconnected(NetworkId)));
// 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)));
this, SLOT(recvMessageFromServer(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)));
connect(conn, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString)));
+ connect(conn, SIGNAL(nickChanged(const NetworkId &, const QString &, const QString &)),
+ this, SLOT(renameBuffer(const NetworkId &, const QString &, const QString &)));
}
void CoreSession::disconnectFromNetwork(NetworkId id) {
Core::bufferInfo(user(), networkid, BufferInfo::StatusBuffer); // create status buffer
}
+// called now only on /quit and requested disconnects, not on normal disconnects!
void CoreSession::networkDisconnected(NetworkId networkid) {
- // FIXME
- // connection should only go away on explicit /part, and handle reconnections etcpp internally otherwise
-
- Q_ASSERT(_connections.contains(networkid));
- _connections.take(networkid)->deleteLater();
+ if(_connections.contains(networkid)) _connections.take(networkid)->deleteLater();
}
// FIXME switch to BufferId
return v;
}
+void CoreSession::storeBufferLastSeen(BufferId buffer, const QDateTime &lastSeen) {
+ Core::setBufferLastSeen(user(), buffer, lastSeen);
+}
+
void CoreSession::sendBacklog(BufferInfo id, QVariant v1, QVariant v2) {
QList<QVariant> log;
QList<Message> msglist;
net->deleteLater();
}
}
+
+void CoreSession::removeBufferRequested(BufferId bufferId) {
+ BufferInfo bufferInfo = Core::getBufferInfo(user(), bufferId);
+ if(!bufferInfo.isValid()) {
+ qWarning() << "CoreSession::removeBufferRequested(): invalid BufferId:" << bufferId << "for User:" << user();
+ return;
+ }
+
+ if(bufferInfo.type() == BufferInfo::StatusBuffer) {
+ qWarning() << "CoreSession::removeBufferRequested(): Status Buffers cannot be removed!";
+ return;
+ }
+
+ if(bufferInfo.type() == BufferInfo::ChannelBuffer) {
+ Network *net = network(bufferInfo.networkId());
+ Q_ASSERT(net);
+ IrcChannel *chan = net->ircChannel(bufferInfo.bufferName());
+ if(chan) {
+ qWarning() << "CoreSession::removeBufferRequested(): Unable to remove Buffer for joined Channel:" << bufferInfo.bufferName();
+ return;
+ }
+ }
+ if(Core::removeBuffer(user(), bufferId))
+ emit bufferRemoved(bufferId);
+}
+
+void CoreSession::renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName) {
+ BufferId bufferId = Core::renameBuffer(user(), networkId, newName, oldName);
+ if(bufferId.isValid()) {
+ emit bufferRenamed(bufferId, newName);
+ }
+}
projects / quassel.git / blobdiff