X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=e3c58450b78fcce6dcb01d0ca3930be0dbbd0b84;hp=bce4cf70fa27e1997185ed3f1040e0cfbb478848;hb=da3aa4136fe01e142238f0f42fe1273481037b9d;hpb=2dd7667489021341267d316472d375e8c89c79c0 diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index bce4cf70..e3c58450 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -18,11 +18,14 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include + #include "core.h" #include "coresession.h" #include "networkconnection.h" #include "signalproxy.h" +#include "buffersyncer.h" #include "storage.h" #include "network.h" @@ -33,18 +36,16 @@ #include "util.h" #include "coreusersettings.h" -#include - 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))); @@ -67,6 +68,15 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObje loadSettings(); initScriptEngine(); + // init BufferSyncer + QHash 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(); @@ -141,6 +151,7 @@ void CoreSession::loadSettings() { info.useAutoReconnect = true; info.autoReconnectInterval = 60; info.autoReconnectRetries = 20; + info.unlimitedReconnectRetries = false; info.useAutoIdentify = false; info.autoIdentifyService = "NickServ"; info.rejoinChannels = true; @@ -158,10 +169,13 @@ void CoreSession::loadSettings() { void CoreSession::saveSessionState() const { QVariantMap res; QVariantList conn; - foreach(NetworkConnection *net, _connections.values()) { + foreach(NetworkConnection *nc, _connections.values()) { + QHash 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(net->networkId()); - m["State"] = net->state(); + m["NetworkId"] = QVariant::fromValue(nc->networkId()); + m["PersistentChannels"] = list; conn << m; } res["CoreBuild"] = Global::quasselBuild; @@ -180,7 +194,19 @@ void CoreSession::restoreSessionState() { QVariantList conn = s.sessionState().toMap()["ConnectedNetworks"].toList(); foreach(QVariant v, conn) { NetworkId id = v.toMap()["NetworkId"].value(); - 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); } } @@ -189,6 +215,7 @@ void CoreSession::updateBufferInfo(UserId uid, const BufferInfo &bufinfo) { } // FIXME remove +/* void CoreSession::connectToNetwork(QString netname, const QVariant &previousState) { Network *net = 0; foreach(Network *n, _networks.values()) { @@ -202,8 +229,9 @@ void CoreSession::connectToNetwork(QString netname, const QVariant &previousStat } 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(); @@ -212,7 +240,7 @@ void CoreSession::connectToNetwork(NetworkId id, const QVariant &previousState) NetworkConnection *conn = networkConnection(id); if(!conn) { - conn = new NetworkConnection(net, this, previousState); + conn = new NetworkConnection(net, this); _connections[id] = conn; attachNetworkConnection(conn); } @@ -221,7 +249,7 @@ void CoreSession::connectToNetwork(NetworkId id, const QVariant &previousState) 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))); @@ -231,6 +259,8 @@ void CoreSession::attachNetworkConnection(NetworkConnection *conn) { 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) { @@ -263,12 +293,9 @@ void CoreSession::networkConnected(NetworkId networkid) { 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 @@ -332,6 +359,10 @@ QVariant CoreSession::sessionState() { 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 log; QList msglist; @@ -463,3 +494,35 @@ void CoreSession::destroyNetwork(NetworkId id) { 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); + } +}