X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=4003783f202f5a09e727187d9f27ddcfa1bbe170;hp=165753a75149417fa3a2684c2f9d25bea68fc0cd;hb=444e91f948b435e652205c4d0f1148906e9e86dc;hpb=70638bdb6a34f51409d4618128fbfd5b56af0e52 diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index 165753a7..4003783f 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -26,6 +26,8 @@ #include "signalproxy.h" #include "buffersyncer.h" +#include "corebacklogmanager.h" +#include "corebufferviewmanager.h" #include "storage.h" #include "network.h" @@ -36,21 +38,23 @@ #include "util.h" #include "coreusersettings.h" -CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObject(parent), +CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) + : QObject(parent), _user(uid), _signalProxy(new SignalProxy(SignalProxy::Server, 0, this)), _bufferSyncer(new BufferSyncer(this)), + _backlogManager(new CoreBacklogManager(this)), + _bufferViewManager(new CoreBufferViewManager(_signalProxy, this)), scriptEngine(new QScriptEngine(this)) { SignalProxy *p = signalProxy(); - + connect(p, SIGNAL(peerRemoved(QIODevice *)), this, SLOT(removeClient(QIODevice *))); + //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))); p->attachSignal(this, SIGNAL(displayStatusMsg(QString, QString))); - p->attachSignal(this, SIGNAL(backlogData(BufferInfo, QVariantList, bool))); p->attachSignal(this, SIGNAL(bufferInfoUpdated(BufferInfo))); p->attachSignal(this, SIGNAL(identityCreated(const Identity &))); @@ -69,14 +73,20 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObje 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 &))); + QHash lastSeenHash = Core::bufferLastSeenMsgIds(user()); + foreach(BufferId id, lastSeenHash.keys()) + _bufferSyncer->requestSetLastSeenMsg(id, lastSeenHash[id]); + + connect(_bufferSyncer, SIGNAL(lastSeenMsgSet(BufferId, MsgId)), this, SLOT(storeBufferLastSeenMsg(BufferId, MsgId))); 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); + + // init BacklogManager; + p->synchronize(_backlogManager); + // Restore session state if(restoreState) restoreSessionState(); @@ -138,74 +148,18 @@ void CoreSession::loadSettings() { createIdentity(i); } - - // migration to pure DB storage - QList 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.unlimitedReconnectRetries = false; - info.useAutoIdentify = false; - info.autoIdentifyService = "NickServ"; - 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; - 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(nc->networkId()); - m["PersistentChannels"] = list; - conn << m; - } - res["CoreBuild"] = Global::quasselBuild; - res["ConnectedNetworks"] = conn; - CoreUserSettings s(user()); - s.setSessionState(res); + } void CoreSession::restoreSessionState() { - CoreUserSettings s(user()); - uint build = s.sessionState().toMap()["CoreBuild"].toUInt(); - if(build < 362) { - qWarning() << qPrintable(tr("Session state does not exist or is too old!")); - return; - } - QVariantList conn = s.sessionState().toMap()["ConnectedNetworks"].toList(); - foreach(QVariant v, conn) { - NetworkId id = v.toMap()["NetworkId"].value(); - // 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(); + QList nets = Core::connectedNetworks(user()); + foreach(NetworkId id, nets) { connectToNetwork(id); } } @@ -214,23 +168,6 @@ void CoreSession::updateBufferInfo(UserId uid, const BufferInfo &bufinfo) { if(uid == user()) emit bufferInfoUpdated(bufinfo); } -// FIXME remove -/* -void CoreSession::connectToNetwork(QString netname, const QVariant &previousState) { - Network *net = 0; - foreach(Network *n, _networks.values()) { - if(n->networkName() == netname) { - net = n; break; - } - } - if(!net) { - qWarning() << "Connect to unknown network requested, ignoring!"; - return; - } - connectToNetwork(net->networkId(), previousState); -} -*/ - void CoreSession::connectToNetwork(NetworkId id) { Network *net = network(id); if(!net) { @@ -261,6 +198,10 @@ void CoreSession::attachNetworkConnection(NetworkConnection *conn) { connect(conn, SIGNAL(nickChanged(const NetworkId &, const QString &, const QString &)), this, SLOT(renameBuffer(const NetworkId &, const QString &, const QString &))); + connect(conn, SIGNAL(channelJoined(NetworkId, const QString &, const QString &)), + this, SLOT(channelJoined(NetworkId, const QString &, const QString &))); + connect(conn, SIGNAL(channelParted(NetworkId, const QString &)), + this, SLOT(channelParted(NetworkId, const QString &))); } void CoreSession::disconnectFromNetwork(NetworkId id) { @@ -284,6 +225,17 @@ void CoreSession::addClient(QObject *dev) { // this is QObject* so we can use it } } +void CoreSession::removeClient(QIODevice *iodev) { + // no checks for validity check - privateslot... + QTcpSocket *socket = qobject_cast(iodev); + if(socket) + qDebug() << qPrintable(tr("Client %1 disconnected (UserId: %2).").arg(socket->peerAddress().toString()).arg(user().toInt())); + else + qDebug() << "Local client disconnedted."; + disconnect(socket, 0, this, 0); + socket->deleteLater(); +} + SignalProxy *CoreSession::signalProxy() const { return _signalProxy; } @@ -291,13 +243,29 @@ SignalProxy *CoreSession::signalProxy() const { // FIXME we need a sane way for creating buffers! void CoreSession::networkConnected(NetworkId networkid) { Core::bufferInfo(user(), networkid, BufferInfo::StatusBuffer); // create status buffer + Core::setNetworkConnected(user(), networkid, true); } // called now only on /quit and requested disconnects, not on normal disconnects! void CoreSession::networkDisconnected(NetworkId networkid) { + Core::setNetworkConnected(user(), networkid, false); if(_connections.contains(networkid)) _connections.take(networkid)->deleteLater(); } +void CoreSession::channelJoined(NetworkId id, const QString &channel, const QString &key) { + Core::setChannelPersistent(user(), id, channel, true); + Core::setPersistentChannelKey(user(), id, channel, key); +} + +void CoreSession::channelParted(NetworkId id, const QString &channel) { + Core::setChannelPersistent(user(), id, channel, false); +} + +QHash CoreSession::persistentChannels(NetworkId id) const { + return Core::persistentChannels(user(), id); + return QHash(); +} + // FIXME switch to BufferId void CoreSession::msgFromClient(BufferInfo bufinfo, QString msg) { NetworkConnection *conn = networkConnection(bufinfo.networkId()); @@ -359,32 +327,10 @@ QVariant CoreSession::sessionState() { return v; } -void CoreSession::storeBufferLastSeen(BufferId buffer, const QDateTime &lastSeen) { - Core::setBufferLastSeen(user(), buffer, lastSeen); +void CoreSession::storeBufferLastSeenMsg(BufferId buffer, const MsgId &msgId) { + Core::setBufferLastSeenMsg(user(), buffer, msgId); } -void CoreSession::sendBacklog(BufferInfo id, QVariant v1, QVariant v2) { - QList log; - QList msglist; - if(v1.type() == QVariant::DateTime) { - - - } else { - msglist = Core::requestMsgs(id, v1.toInt(), v2.toInt()); - } - - // Send messages out in smaller packages - we don't want to make the signal data too large! - for(int i = 0; i < msglist.count(); i++) { - log.append(qVariantFromValue(msglist[i])); - if(log.count() >= 5) { - emit backlogData(id, log, i >= msglist.count() - 1); - log.clear(); - } - } - 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)));