X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=e3c58450b78fcce6dcb01d0ca3930be0dbbd0b84;hp=e974c21677a7df18a015a39590925898ba928d62;hb=da3aa4136fe01e142238f0f42fe1273481037b9d;hpb=3b29973a4fecd4658ced22aadc70555b86b8a0df diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index e974c216..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(); @@ -128,47 +138,44 @@ void CoreSession::loadSettings() { createIdentity(i); } - // FIXME switch to a pure DB storage - foreach(NetworkId id, s.networkIds()) { - NetworkInfo info = s.networkInfo(id); - 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); - } + // 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 *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; @@ -187,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); } } @@ -196,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()) { @@ -209,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(); @@ -219,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); } @@ -228,15 +249,18 @@ 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 &))); } void CoreSession::disconnectFromNetwork(NetworkId id) { @@ -266,22 +290,19 @@ SignalProxy *CoreSession::signalProxy() const { // 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 } +// 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 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,17 +310,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); - - QString bufferName; - if((flags & Message::PrivMsg) && !(flags & Message::Self)) - bufferName = nickFromMask(sender); - else - bufferName = target; - - BufferInfo bufferInfo = Core::bufferInfo(user(), netCon->networkId(), bufferName); + + 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); @@ -344,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; @@ -425,7 +444,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()); @@ -439,8 +458,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); } @@ -450,16 +467,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); + } +}