#include "signalproxy.h"
#include "buffersyncer.h"
+#include "corebacklogmanager.h"
+#include "corebufferviewmanager.h"
#include "storage.h"
#include "network.h"
#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 &)));
initScriptEngine();
// init BufferSyncer
- QHash<BufferId, QDateTime> 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<BufferId, MsgId> 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();
}
void CoreSession::restoreSessionState() {
- // FIXME db support
- //QList<NetworkId> nets = Core::connectedNetworks(user());
- QList<NetworkId> nets;
+ QList<NetworkId> nets = Core::connectedNetworks(user());
foreach(NetworkId id, nets) {
connectToNetwork(id);
}
}
}
+void CoreSession::removeClient(QIODevice *iodev) {
+ // no checks for validity check - privateslot...
+ QTcpSocket *socket = qobject_cast<QTcpSocket *>(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, BufferInfo::StatusBuffer); // create status buffer
- //Core::setNetworkConnected(user(), networkid, true);
+ 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);
+ 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);
+ 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);
+ Core::setChannelPersistent(user(), id, channel, false);
}
QHash<QString, QString> CoreSession::persistentChannels(NetworkId id) const {
- //return Core::persistentChannels(user(), id);
+ return Core::persistentChannels(user(), id);
return QHash<QString, QString>();
}
if(conn) {
conn->userInput(bufinfo, msg);
} else {
- qWarning() << "Trying to send to unconnected network!";
+ qWarning() << "Trying to send to unconnected network:" << msg;
}
}
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<QVariant> log;
- QList<Message> 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)));