X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=020950f6de73ee110f10f1ba6ed4da3d65023848;hp=426bcdc70d301231752f165fdbd9816eb4d458ef;hb=0d49f7e83bd1055711e66aa880f3a0d62f7eefc9;hpb=788fd0058595c815dc42597e9956c02aea45261f diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp index 426bcdc7..020950f6 100644 --- a/src/core/coresession.cpp +++ b/src/core/coresession.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,208 +18,309 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include + +#include "core.h" #include "coresession.h" -#include "server.h" +#include "networkconnection.h" +#include "userinputhandler.h" #include "signalproxy.h" +#include "buffersyncer.h" +#include "corebacklogmanager.h" +#include "corebufferviewmanager.h" +#include "coreirclisthelper.h" #include "storage.h" -#include "networkinfo.h" +#include "corenetwork.h" #include "ircuser.h" #include "ircchannel.h" +#include "identity.h" #include "util.h" +#include "coreusersettings.h" +#include "logger.h" -#include - -CoreSession::CoreSession(UserId uid, Storage *_storage, QObject *parent) +CoreSession::CoreSession(UserId uid, bool restoreState, QObject *parent) : QObject(parent), - user(uid), + _user(uid), _signalProxy(new SignalProxy(SignalProxy::Server, 0, this)), - storage(_storage), + _aliasManager(this), + _bufferSyncer(new BufferSyncer(this)), + _backlogManager(new CoreBacklogManager(this)), + _bufferViewManager(new CoreBufferViewManager(_signalProxy, this)), + _ircListHelper(new CoreIrcListHelper(this)), + _coreInfo(this), scriptEngine(new QScriptEngine(this)) { - - QSettings s; - s.beginGroup(QString("SessionData/%1").arg(user)); - mutex.lock(); - foreach(QString key, s.allKeys()) { - sessionData[key] = s.value(key); - } - mutex.unlock(); SignalProxy *p = signalProxy(); + connect(p, SIGNAL(peerRemoved(QIODevice *)), this, SLOT(removeClient(QIODevice *))); - p->attachSlot(SIGNAL(requestNetworkStates()), this, SLOT(serverStateRequested())); - p->attachSlot(SIGNAL(requestConnect(QString)), this, SLOT(connectToNetwork(QString))); - p->attachSlot(SIGNAL(sendInput(BufferInfo, QString)), this, SLOT(msgFromGui(BufferInfo, QString))); - p->attachSlot(SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)), this, SLOT(sendBacklog(BufferInfo, QVariant, QVariant))); + //p->attachSlot(SIGNAL(disconnectFromNetwork(NetworkId)), this, SLOT(disconnectFromNetwork(NetworkId))); // FIXME + p->attachSlot(SIGNAL(sendInput(BufferInfo, QString)), this, SLOT(msgFromClient(BufferInfo, QString))); 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(storage, SIGNAL(bufferInfoUpdated(BufferInfo))); - p->attachSignal(this, SIGNAL(sessionDataChanged(const QString &, const QVariant &)), SIGNAL(coreSessionDataChanged(const QString &, const QVariant &))); - p->attachSlot(SIGNAL(clientSessionDataChanged(const QString &, const QVariant &)), this, SLOT(storeSessionData(const QString &, const QVariant &))); - /* Autoconnect. (When) do we actually do this? - --> session restore should be enough! - QStringList list; - QVariantMap networks = retrieveSessionData("Networks").toMap(); - foreach(QString net, networks.keys()) { - if(networks[net].toMap()["AutoConnect"].toBool()) { - list << net; - } - } qDebug() << list; - if(list.count()) connectToIrc(list); - */ + p->attachSignal(this, SIGNAL(identityCreated(const Identity &))); + p->attachSignal(this, SIGNAL(identityRemoved(IdentityId))); + p->attachSlot(SIGNAL(createIdentity(const Identity &)), this, SLOT(createIdentity(const Identity &))); + p->attachSlot(SIGNAL(removeIdentity(IdentityId)), this, SLOT(removeIdentity(IdentityId))); + + p->attachSignal(this, SIGNAL(networkCreated(NetworkId))); + p->attachSignal(this, SIGNAL(networkRemoved(NetworkId))); + p->attachSlot(SIGNAL(createNetwork(const NetworkInfo &)), this, SLOT(createNetwork(const NetworkInfo &))); + p->attachSlot(SIGNAL(removeNetwork(NetworkId)), this, SLOT(removeNetwork(NetworkId))); + + 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 alias manager + p->synchronize(&aliasManager()); + + // init BacklogManager + p->synchronize(_backlogManager); + + // init IrcListHelper + p->synchronize(ircListHelper()); + + // init CoreInfo + p->synchronize(&_coreInfo); + + // Restore session state + if(restoreState) restoreSessionState(); + + emit initialized(); } CoreSession::~CoreSession() { + saveSessionState(); + foreach(NetworkConnection *conn, _connections.values()) { + delete conn; + } + foreach(CoreNetwork *net, _networks.values()) { + delete net; + } +} + +UserId CoreSession::user() const { + return _user; } -UserId CoreSession::userId() const { - return user; +CoreNetwork *CoreSession::network(NetworkId id) const { + if(_networks.contains(id)) return _networks[id]; + return 0; } -QVariant CoreSession::state() const { - QVariantMap res; - QList conn; - foreach(Server *server, servers.values()) { - if(server->isConnected()) { - QVariantMap m; - m["Network"] = server->networkName(); - m["State"] = server->state(); - conn << m; +NetworkConnection *CoreSession::networkConnection(NetworkId id) const { + if(_connections.contains(id)) return _connections[id]; + return 0; +} + +Identity *CoreSession::identity(IdentityId id) const { + if(_identities.contains(id)) return _identities[id]; + return 0; +} + +void CoreSession::loadSettings() { + CoreUserSettings s(user()); + + foreach(IdentityId id, s.identityIds()) { + Identity *i = new Identity(s.identity(id), this); + if(!i->isValid()) { + quWarning() << "Invalid identity! Removing..."; + s.removeIdentity(id); + delete i; + continue; } - } - res["ConnectedServers"] = conn; - return res; -} - -void CoreSession::restoreState(const QVariant &previousState) { - // Session restore - QVariantMap state = previousState.toMap(); - if(state.contains("ConnectedServers")) { - foreach(QVariant v, state["ConnectedServers"].toList()) { - QVariantMap m = v.toMap(); - QString net = m["Network"].toString(); - if(!net.isEmpty()) connectToNetwork(net, m["State"]); + if(_identities.contains(i->id())) { + quWarning() << "Duplicate identity, ignoring!"; + delete i; + continue; } + connect(i, SIGNAL(updated(const QVariantMap &)), this, SLOT(identityUpdated(const QVariantMap &))); + _identities[i->id()] = i; + signalProxy()->synchronize(i); + } + if(!_identities.count()) { + Identity i(1); + i.setToDefaults(); + i.setIdentityName(tr("Default Identity")); + createIdentity(i); + } + + foreach(NetworkInfo info, Core::networks(user())) { + createNetwork(info); } } +void CoreSession::saveSessionState() const { -void CoreSession::storeSessionData(const QString &key, const QVariant &data) { - QSettings s; - s.beginGroup(QString("SessionData/%1").arg(user)); - mutex.lock(); - sessionData[key] = data; - s.setValue(key, data); - mutex.unlock(); - s.endGroup(); - emit sessionDataChanged(key, data); - emit sessionDataChanged(key); } -QVariant CoreSession::retrieveSessionData(const QString &key, const QVariant &def) { - QVariant data; - mutex.lock(); - if(!sessionData.contains(key)) data = def; - else data = sessionData[key]; - mutex.unlock(); - return data; +void CoreSession::restoreSessionState() { + QList nets = Core::connectedNetworks(user()); + foreach(NetworkId id, nets) { + connectToNetwork(id); + } } -// FIXME switch to NetworkIDs -void CoreSession::connectToNetwork(QString network, const QVariant &previousState) { - uint networkid = getNetworkId(network); - if(networkid == 0) { - qWarning() << "unable to connect to Network" << network << "(User:" << userId() << "): unable to determine NetworkId"; +void CoreSession::updateBufferInfo(UserId uid, const BufferInfo &bufinfo) { + if(uid == user()) emit bufferInfoUpdated(bufinfo); +} + +void CoreSession::connectToNetwork(NetworkId id) { + CoreNetwork *net = network(id); + if(!net) { + quWarning() << "Connect to unknown network requested! net:" << id << "user:" << user(); return; } - if(!servers.contains(networkid)) { - Server *server = new Server(userId(), networkid, network, previousState); - servers[networkid] = server; - attachServer(server); - server->start(); + + NetworkConnection *conn = networkConnection(id); + if(!conn) { + conn = new NetworkConnection(net, this); + _connections[id] = conn; + attachNetworkConnection(conn); } - emit connectToIrc(network); + conn->connectToIrc(); +} + +void CoreSession::attachNetworkConnection(NetworkConnection *conn) { + connect(conn, SIGNAL(connected(NetworkId)), this, SLOT(networkConnected(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, BufferInfo::Type, QString, QString, QString, Message::Flags)), + this, SLOT(recvMessageFromServer(Message::Type, BufferInfo::Type, QString, QString, QString, Message::Flags))); + 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::attachServer(Server *server) { - connect(this, SIGNAL(connectToIrc(QString)), server, SLOT(connectToIrc(QString))); - connect(this, SIGNAL(disconnectFromIrc(QString)), server, SLOT(disconnectFromIrc(QString))); - connect(this, SIGNAL(msgFromGui(uint, QString, QString)), server, SLOT(userInput(uint, QString, QString))); - - connect(server, SIGNAL(connected(uint)), this, SLOT(serverConnected(uint))); - connect(server, SIGNAL(disconnected(uint)), this, SLOT(serverDisconnected(uint))); - connect(server, SIGNAL(displayMsg(Message::Type, QString, QString, QString, quint8)), this, SLOT(recvMessageFromServer(Message::Type, QString, QString, QString, quint8))); - connect(server, SIGNAL(displayStatusMsg(QString)), this, SLOT(recvStatusMsgFromServer(QString))); +void CoreSession::disconnectFromNetwork(NetworkId id) { + if(!_connections.contains(id)) + return; - // connect serversignals to proxy - signalProxy()->attachSignal(server, SIGNAL(serverState(QString, QVariantMap)), SIGNAL(networkState(QString, QVariantMap))); - signalProxy()->attachSignal(server, SIGNAL(connected(uint)), SIGNAL(networkConnected(uint))); - signalProxy()->attachSignal(server, SIGNAL(disconnected(uint)), SIGNAL(networkDisconnected(uint))); - // TODO add error handling + //_connections[id]->disconnectFromIrc(); + _connections[id]->userInputHandler()->handleQuit(BufferInfo(), QString()); } -void CoreSession::serverStateRequested() { +void CoreSession::networkStateRequested() { } void CoreSession::addClient(QIODevice *device) { - signalProxy()->addPeer(device); + if(!device) { + quError() << "Invoking CoreSession::addClient with a QObject that is not a QIODevice!"; + } else { + // if the socket is an orphan, the signalProxy adopts it. + // -> we don't need to care about it anymore + device->setParent(0); + signalProxy()->addPeer(device); + QVariantMap reply; + reply["MsgType"] = "SessionInit"; + reply["SessionState"] = sessionState(); + SignalProxy::writeDataToDevice(device, reply); + } +} + +void CoreSession::addClient(SignalProxy *proxy) { + signalProxy()->addPeer(proxy); + emit sessionState(sessionState()); +} + +void CoreSession::removeClient(QIODevice *iodev) { + QTcpSocket *socket = qobject_cast(iodev); + if(socket) + quInfo() << qPrintable(tr("Client")) << qPrintable(socket->peerAddress().toString()) << qPrintable(tr("disconnected (UserId: %1).").arg(user().toInt())); } SignalProxy *CoreSession::signalProxy() const { return _signalProxy; } -void CoreSession::serverConnected(uint networkid) { - storage->getBufferInfo(userId(), servers[networkid]->networkName()); // create status buffer +// 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); } -void CoreSession::serverDisconnected(uint networkid) { - Q_ASSERT(servers.contains(networkid)); - servers.take(networkid)->deleteLater(); - Q_ASSERT(!servers.contains(networkid)); +// called now only on /quit and requested disconnects, not on normal disconnects! +void CoreSession::networkDisconnected(NetworkId networkid) { + // if the network has already been removed, we don't have a networkconnection left either, so we don't do anything + // make sure to not depend on the network still existing when calling this function! + if(_connections.contains(networkid)) { + Core::setNetworkConnected(user(), networkid, false); + _connections.take(networkid)->deleteLater(); + } } -void CoreSession::msgFromGui(BufferInfo bufid, QString msg) { - emit msgFromGui(bufid.networkId(), bufid.buffer(), msg); +void CoreSession::channelJoined(NetworkId id, const QString &channel, const QString &key) { + Core::setChannelPersistent(user(), id, channel, true); + Core::setPersistentChannelKey(user(), id, channel, key); } -// 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) { - Server *s = qobject_cast(this->sender()); - Q_ASSERT(s); - BufferInfo buf; - if((flags & Message::PrivMsg) && !(flags & Message::Self)) { - buf = storage->getBufferInfo(user, s->networkName(), nickFromMask(sender)); +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, msg); } else { - buf = storage->getBufferInfo(user, s->networkName(), target); + quWarning() << "Trying to send to unconnected network:" << msg; } - Message msg(buf, type, text, sender, flags); - msg.setMsgId(storage->logMessage(msg)); - Q_ASSERT(msg.msgId()); +} + +// 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, BufferInfo::Type bufferType, + QString target, QString text, QString sender, Message::Flags flags) { + NetworkConnection *netCon = qobject_cast(this->sender()); + Q_ASSERT(netCon); + + 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); emit displayMsg(msg); } void CoreSession::recvStatusMsgFromServer(QString msg) { - Server *s = qobject_cast(sender()); + NetworkConnection *s = qobject_cast(sender()); Q_ASSERT(s); emit displayStatusMsg(s->networkName(), msg); } - -uint CoreSession::getNetworkId(const QString &net) const { - return storage->getNetworkId(user, net); -} - QList CoreSession::buffers() const { - return storage->requestBuffers(user); + return Core::requestBuffers(user()); } @@ -227,54 +328,178 @@ QVariant CoreSession::sessionState() { QVariantMap v; QVariantList bufs; - foreach(BufferInfo id, storage->requestBuffers(user)) - bufs.append(QVariant::fromValue(id)); - v["Buffers"] = bufs; - - mutex.lock(); - v["SessionData"] = sessionData; - mutex.unlock(); + foreach(BufferInfo id, buffers()) bufs << qVariantFromValue(id); + v["BufferInfos"] = bufs; + QVariantList networkids; + foreach(NetworkId id, _networks.keys()) networkids << qVariantFromValue(id); + v["NetworkIds"] = networkids; + + quint32 ircusercount = 0; + quint32 ircchannelcount = 0; + foreach(Network *net, _networks.values()) { + ircusercount += net->ircUserCount(); + ircchannelcount += net->ircChannelCount(); + } + v["IrcUserCount"] = ircusercount; + v["IrcChannelCount"] = ircchannelcount; - QVariantList networks; - foreach(uint networkid, servers.keys()) - networks.append(QVariant(networkid)); - v["Networks"] = QVariant(networks); + QList idlist; + foreach(Identity *i, _identities.values()) idlist << qVariantFromValue(*i); + v["Identities"] = idlist; - // v["Payload"] = QByteArray(100000000, 'a'); // for testing purposes + //v["Payload"] = QByteArray(100000000, 'a'); // for testing purposes return v; } -void CoreSession::sendBacklog(BufferInfo id, QVariant v1, QVariant v2) { - QList log; - QList msglist; - if(v1.type() == QVariant::DateTime) { +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))); + + // FIXME + //QScriptValue storage_ = scriptEngine->newQObject(storage); + //scriptEngine->globalObject().setProperty("storage", storage_); +} + +void CoreSession::scriptRequest(QString script) { + emit scriptResult(scriptEngine->evaluate(script).toString()); +} + +/*** Identity Handling ***/ + +void CoreSession::createIdentity(const Identity &id) { + // find free ID + int i; + for(i = 1; i <= _identities.count(); i++) { + if(!_identities.keys().contains(i)) break; + } + //qDebug() << "found free id" << i; + Identity *newId = new Identity(id, this); + newId->setId(i); + _identities[i] = newId; + signalProxy()->synchronize(newId); + CoreUserSettings s(user()); + s.storeIdentity(*newId); + connect(newId, SIGNAL(updated(const QVariantMap &)), this, SLOT(identityUpdated(const QVariantMap &))); + emit identityCreated(*newId); +} + +void CoreSession::removeIdentity(IdentityId id) { + Identity *i = _identities.take(id); + if(i) { + emit identityRemoved(id); + CoreUserSettings s(user()); + s.removeIdentity(id); + i->deleteLater(); + } +} +void CoreSession::identityUpdated(const QVariantMap &data) { + IdentityId id = data.value("identityId", 0).value(); + if(!id.isValid() || !_identities.contains(id)) { + quWarning() << "Update request for unknown identity received!"; + return; + } + CoreUserSettings s(user()); + s.storeIdentity(*_identities.value(id)); +} +/*** Network Handling ***/ + +void CoreSession::createNetwork(const NetworkInfo &info_) { + NetworkInfo info = info_; + int id; + + if(!info.networkId.isValid()) + Core::createNetwork(user(), info); + + if(!info.networkId.isValid()) { + quWarning() << qPrintable(tr("CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!").arg(info.networkName)); + return; + } + + id = info.networkId.toInt(); + if(!_networks.contains(id)) { + CoreNetwork *net = new CoreNetwork(id, this); + connect(net, SIGNAL(connectRequested(NetworkId)), this, SLOT(connectToNetwork(NetworkId))); + connect(net, SIGNAL(disconnectRequested(NetworkId)), this, SLOT(disconnectFromNetwork(NetworkId))); + net->setNetworkInfo(info); + net->setProxy(signalProxy()); + _networks[id] = net; + signalProxy()->synchronize(net); + emit networkCreated(id); } else { - msglist = storage->requestMsgs(id, v1.toInt(), v2.toInt()); + quWarning() << qPrintable(tr("CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!")); + _networks[info.networkId]->requestSetNetworkInfo(info); } +} - // 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(QVariant::fromValue(msglist[i])); - if(log.count() >= 5) { - emit backlogData(id, log, i >= msglist.count() - 1); - log.clear(); +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); } - if(log.count() > 0) emit backlogData(id, log, true); } +void CoreSession::destroyNetwork(NetworkId id) { + if(_connections.contains(id)) { + // this can happen if the network was reconnecting while being removed + _connections.take(id)->deleteLater(); + } + QList removedBuffers = Core::requestBufferIdsForNetwork(user(), id); + Network *net = _networks.take(id); + if(net && Core::removeNetwork(user(), id)) { + foreach(BufferId bufferId, removedBuffers) { + _bufferSyncer->removeBuffer(bufferId); + } + emit networkRemoved(id); + net->deleteLater(); + } +} -void CoreSession::initScriptEngine() { - signalProxy()->attachSlot(SIGNAL(scriptRequest(QString)), this, SLOT(scriptRequest(QString))); - signalProxy()->attachSignal(this, SIGNAL(scriptResult(QString))); - - QScriptValue storage_ = scriptEngine->newQObject(storage); - scriptEngine->globalObject().setProperty("storage", storage_); +void CoreSession::removeBufferRequested(BufferId bufferId) { + BufferInfo bufferInfo = Core::getBufferInfo(user(), bufferId); + if(!bufferInfo.isValid()) { + quWarning() << "CoreSession::removeBufferRequested(): invalid BufferId:" << bufferId << "for User:" << user(); + return; + } + + if(bufferInfo.type() == BufferInfo::StatusBuffer) { + quWarning() << "CoreSession::removeBufferRequested(): Status Buffers cannot be removed!"; + return; + } + + if(bufferInfo.type() == BufferInfo::ChannelBuffer) { + CoreNetwork *net = network(bufferInfo.networkId()); + if(!net) { + quWarning() << "CoreSession::removeBufferRequested(): Received BufferInfo with unknown networkId!"; + return; + } + IrcChannel *chan = net->ircChannel(bufferInfo.bufferName()); + if(chan) { + quWarning() << "CoreSession::removeBufferRequested(): Unable to remove Buffer for joined Channel:" << bufferInfo.bufferName(); + return; + } + } + if(Core::removeBuffer(user(), bufferId)) + emit bufferRemoved(bufferId); } -void CoreSession::scriptRequest(QString script) { - emit scriptResult(scriptEngine->evaluate(script).toString()); +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); + } } -