X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=4003783f202f5a09e727187d9f27ddcfa1bbe170;hp=8e667380e3633d5bf65962ecde9b359e47adc3fb;hb=444e91f948b435e652205c4d0f1148906e9e86dc;hpb=9d12f8189a0dfd8ac76e41aea86ac56bdf907fde diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index 8e667380..4003783f 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -18,11 +18,16 @@ * 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 "corebacklogmanager.h" +#include "corebufferviewmanager.h" #include "storage.h" #include "network.h" @@ -33,23 +38,23 @@ #include "util.h" #include "coreusersettings.h" -#include - -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(); - - p->attachSlot(SIGNAL(requestConnect(QString)), this, SLOT(connectToNetwork(QString))); - p->attachSlot(SIGNAL(disconnectFromNetwork(NetworkId)), this, SLOT(disconnectFromNetwork(NetworkId))); // FIXME + 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 &))); @@ -67,6 +72,21 @@ CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObje loadSettings(); initScriptEngine(); + // init BufferSyncer + 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(); @@ -128,66 +148,19 @@ void CoreSession::loadSettings() { createIdentity(i); } - // FIXME switch to a pure DB storage - foreach(NetworkId id, s.networkIds()) { - NetworkInfo info = s.networkInfo(id); + foreach(NetworkInfo info, Core::networks(user())) { createNetwork(info); } - - // FIXME Migrate old settings if available... - if(!_networks.count()) { - QVariantMap networks = s.sessionValue("Networks").toMap(); - if(networks.keys().count()) { - qWarning() << "Migrating your old network settings to the new format!"; - foreach(QString netname, networks.keys()) { - QVariantMap network = networks[netname].toMap(); - NetworkId netid = Core::networkId(user(), netname); - NetworkInfo info; - info.networkId = netid; - info.networkName = netname; - info.identity = 1; - info.codecForEncoding = "ISO-8859-15"; - info.codecForDecoding = "ISO-8859-15"; - QVariantList slist; - foreach(QVariant v, network["Servers"].toList()) { - QVariantMap server; - server["Host"] = v.toMap()["Address"]; - server["Port"] = v.toMap()["Port"]; - slist << server; - } - info.serverList = slist; - createNetwork(info); - } - } - } } void CoreSession::saveSessionState() const { - QVariantMap res; - QVariantList conn; - foreach(NetworkConnection *net, _connections.values()) { - QVariantMap m; - m["NetworkId"] = QVariant::fromValue(net->networkId()); - m["State"] = net->state(); - 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(); - if(_networks.keys().contains(id)) connectToNetwork(id, v.toMap()["State"]); + QList nets = Core::connectedNetworks(user()); + foreach(NetworkId id, nets) { + connectToNetwork(id); } } @@ -195,22 +168,7 @@ 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, const QVariant &previousState) { +void CoreSession::connectToNetwork(NetworkId id) { Network *net = network(id); if(!net) { qWarning() << "Connect to unknown network requested! net:" << id << "user:" << user(); @@ -219,7 +177,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); } @@ -228,15 +186,22 @@ 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))); //signalProxy()->attachSignal(conn, SIGNAL(disconnected(NetworkId)), SIGNAL(networkDisconnected(NetworkId))); - connect(conn, SIGNAL(displayMsg(Message::Type, QString, QString, QString, quint8)), this, SLOT(recvMessageFromServer(Message::Type, QString, QString, QString, quint8))); + connect(conn, SIGNAL(displayMsg(Message::Type, BufferInfo::Type, QString, QString, QString, quint8)), + 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 &))); + 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) { @@ -260,28 +225,52 @@ 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; } // FIXME we need a sane way for creating buffers! void CoreSession::networkConnected(NetworkId networkid) { - Core::bufferInfo(user(), networkid); // create status buffer + 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) { - // FIXME - // connection should only go away on explicit /part, and handle reconnections etcpp internally otherwise + 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); +} - Q_ASSERT(_connections.contains(networkid)); - _connections.take(networkid)->deleteLater(); +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()); if(conn) { - conn->userInput(bufinfo.bufferName(), msg); + conn->userInput(bufinfo, msg); } else { qWarning() << "Trying to send to unconnected network!"; } @@ -289,11 +278,11 @@ void CoreSession::msgFromClient(BufferInfo bufinfo, 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) { +void CoreSession::recvMessageFromServer(Message::Type type, BufferInfo::Type bufferType, QString target, QString text, QString sender, quint8 flags) { NetworkConnection *netCon = qobject_cast(this->sender()); Q_ASSERT(netCon); - BufferInfo bufferInfo = Core::bufferInfo(user(), netCon->networkId(), target); + BufferInfo bufferInfo = Core::bufferInfo(user(), netCon->networkId(), bufferType, target); Message msg(bufferInfo, type, text, sender, flags); msg.setMsgId(Core::storeMessage(msg)); Q_ASSERT(msg.msgId() != 0); @@ -338,28 +327,10 @@ QVariant CoreSession::sessionState() { return v; } -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::storeBufferLastSeenMsg(BufferId buffer, const MsgId &msgId) { + Core::setBufferLastSeenMsg(user(), buffer, msgId); } - void CoreSession::initScriptEngine() { signalProxy()->attachSlot(SIGNAL(scriptRequest(QString)), this, SLOT(scriptRequest(QString))); signalProxy()->attachSignal(this, SIGNAL(scriptResult(QString))); @@ -419,7 +390,7 @@ void CoreSession::createNetwork(const NetworkInfo &info_) { int id; if(!info.networkId.isValid()) - Core::createNetworkId(user(), info); + Core::createNetwork(user(), info); Q_ASSERT(info.networkId.isValid()); @@ -433,8 +404,6 @@ void CoreSession::createNetwork(const NetworkInfo &info_) { net->setProxy(signalProxy()); _networks[id] = net; signalProxy()->synchronize(net); - CoreUserSettings s(user()); - s.storeNetworkInfo(info); emit networkCreated(id); } @@ -444,16 +413,62 @@ void CoreSession::updateNetwork(const NetworkInfo &info) { return; } _networks[info.networkId]->setNetworkInfo(info); - CoreUserSettings s(user()); - s.storeNetworkInfo(info); + Core::updateNetwork(user(), info); } void CoreSession::removeNetwork(NetworkId id) { + // Make sure the network is disconnected! + NetworkConnection *conn = _connections.value(id, 0); + if(conn) { + if(conn->connectionState() != Network::Disconnected) { + connect(conn, SIGNAL(disconnected(NetworkId)), this, SLOT(destroyNetwork(NetworkId))); + conn->disconnectFromIrc(); + } else { + _connections.take(id)->deleteLater(); // TODO make this saner + destroyNetwork(id); + } + } else { + destroyNetwork(id); + } +} + +void CoreSession::destroyNetwork(NetworkId id) { + Q_ASSERT(!_connections.contains(id)); Network *net = _networks.take(id); - if(net) { + if(net && Core::removeNetwork(user(), id)) { emit networkRemoved(id); - CoreUserSettings s(user()); - s.removeNetworkInfo(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); + } +}