#include "core.h"
#include "server.h"
#include "global.h"
+#include "util.h"
#include "coreproxy.h"
+#include <QtSql>
#include <QSettings>
Core::Core() {
if(core) qFatal("Trying to instantiate more than one Core object!");
+ connect(coreProxy, SIGNAL(requestServerStates()), this, SIGNAL(serverStateRequested()));
connect(coreProxy, SIGNAL(gsRequestConnect(QStringList)), this, SLOT(connectToIrc(QStringList)));
- connect(coreProxy, SIGNAL(gsUserInput(QString, QString, QString)), this, SIGNAL(msgFromGUI(QString, QString, QString)));
- connect(this, SIGNAL(displayMsg(QString, QString, Message)), coreProxy, SLOT(csDisplayMsg(QString, QString, Message)));
+ connect(coreProxy, SIGNAL(gsUserInput(BufferId, QString)), this, SLOT(msgFromGUI(BufferId, QString)));
+ connect(coreProxy, SIGNAL(gsImportBacklog()), &backlog, SLOT(importOldBacklog()));
+ connect(coreProxy, SIGNAL(gsRequestBacklog(BufferId, QVariant, QVariant)), this, SLOT(sendBacklog(BufferId, QVariant, QVariant)));
+ connect(this, SIGNAL(displayMsg(Message)), coreProxy, SLOT(csDisplayMsg(Message)));
connect(this, SIGNAL(displayStatusMsg(QString, QString)), coreProxy, SLOT(csDisplayStatusMsg(QString, QString)));
-
+ connect(this, SIGNAL(backlogData(BufferId, QList<QVariant>, bool)), coreProxy, SLOT(csBacklogData(BufferId, QList<QVariant>, bool)));
+ connect(&backlog, SIGNAL(bufferIdUpdated(BufferId)), coreProxy, SLOT(csUpdateBufferId(BufferId)));
+ connect(this, SIGNAL(bufferIdUpdated(BufferId)), coreProxy, SLOT(csUpdateBufferId(BufferId)));
// Read global settings from config file
QSettings s;
s.beginGroup("Global");
foreach(key, s.childKeys()) {
global->updateData(key, s.value(key));
}
- initBackLog();
+ backlog.init("Default"); // FIXME
global->updateData("CoreReady", true);
// Now that we are in sync, we can connect signals to automatically store further updates.
// I don't think we care if global data changed locally or if it was updated by a client.
}
+Core::~Core() {
+ //foreach(Server *s, servers) {
+ // delete s;
+ //}
+}
+
void Core::globalDataUpdated(QString key) {
QVariant data = global->getData(key);
QSettings s;
} else {
Server *server = new Server(net);
+ connect(this, SIGNAL(serverStateRequested()), server, SLOT(sendState()));
connect(this, SIGNAL(connectToIrc(QString)), server, SLOT(connectToIrc(QString)));
connect(this, SIGNAL(disconnectFromIrc(QString)), server, SLOT(disconnectFromIrc(QString)));
connect(this, SIGNAL(msgFromGUI(QString, QString, QString)), server, SLOT(userInput(QString, QString, QString)));
- connect(server, SIGNAL(displayMsg(QString, Message)), this, SLOT(recvMessageFromServer(QString, Message)));
+ connect(server, SIGNAL(serverState(QString, VarMap)), coreProxy, SLOT(csServerState(QString, VarMap)));
+ //connect(server, SIGNAL(displayMsg(Message)), this, SLOT(recvMessageFromServer(Message)));
+ 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)));
connect(server, SIGNAL(modeSet(QString, QString, QString)), coreProxy, SLOT(csModeSet(QString, QString, QString)));
connect(server, SIGNAL(topicSet(QString, QString, QString)), coreProxy, SLOT(csTopicSet(QString, QString, QString)));
- connect(server, SIGNAL(setNicks(QString, QString, QStringList)), coreProxy, SLOT(csSetNicks(QString, QString, QStringList)));
connect(server, SIGNAL(nickAdded(QString, QString, VarMap)), coreProxy, SLOT(csNickAdded(QString, QString, VarMap)));
connect(server, SIGNAL(nickRenamed(QString, QString, QString)), coreProxy, SLOT(csNickRenamed(QString, QString, QString)));
connect(server, SIGNAL(nickRemoved(QString, QString)), coreProxy, SLOT(csNickRemoved(QString, QString)));
connect(server, SIGNAL(nickUpdated(QString, QString, VarMap)), coreProxy, SLOT(csNickUpdated(QString, QString, VarMap)));
connect(server, SIGNAL(ownNickSet(QString, QString)), coreProxy, SLOT(csOwnNickSet(QString, QString)));
+ connect(server, SIGNAL(queryRequested(QString, QString)), coreProxy, SLOT(csQueryRequested(QString, QString)));
// add error handling
+ connect(server, SIGNAL(connected(QString)), coreProxy, SLOT(csServerConnected(QString)));
+ connect(server, SIGNAL(disconnected(QString)), this, SLOT(serverDisconnected(QString)));
server->start();
servers[net] = server;
}
}
+void Core::serverDisconnected(QString net) {
+ delete servers[net];
+ servers.remove(net);
+ coreProxy->csServerDisconnected(net);
+}
+
+void Core::msgFromGUI(BufferId bufid, QString msg) {
+ emit msgFromGUI(bufid.network(), bufid.buffer(), 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 Core::recvMessageFromServer(QString buf, Message msg) {
+
+void Core::recvMessageFromServer(Message::Type type, QString target, QString text, QString sender, quint8 flags) {
+ Server *s = qobject_cast<Server*>(this->sender());
+ Q_ASSERT(s);
+ BufferId buf;
+ if((flags & Message::PrivMsg) && !(flags & Message::Self)) {
+ buf = backlog.getBufferId(s->getNetwork(), nickFromMask(sender));
+ } else {
+ buf = backlog.getBufferId(s->getNetwork(), target);
+ }
+ Message msg(buf, type, text, sender, flags);
+ msg.msgId = backlog.logMessage(msg);
+ emit displayMsg(msg);
+}
+/*
+void Core::recvMessageFromServer(Message msg) {
Server *s = qobject_cast<Server*>(sender());
Q_ASSERT(s);
- logMessage(msg);
- emit displayMsg(s->getNetwork(), buf, msg);
+ logMessage(s->getNetwork(), msg);
+ emit displayMsg(s->getNetwork(), msg);
}
+*/
void Core::recvStatusMsgFromServer(QString msg) {
Server *s = qobject_cast<Server*>(sender());
emit displayStatusMsg(s->getNetwork(), msg);
}
-// file name scheme: quassel-backlog-2006-29-10.bin
-void Core::initBackLog() {
- backLogDir = QDir(Global::quasselDir + "/backlog");
- if(!backLogDir.exists()) {
- qWarning(QString("Creating backlog directory \"%1\"...").arg(backLogDir.absolutePath()).toAscii());
- if(!backLogDir.mkpath(backLogDir.absolutePath())) {
- qWarning(QString("Could not create backlog directory! Disabling logging...").toAscii());
- backLogEnabled = false;
- return;
- }
- }
- backLogDir.refresh();
- //if(!backLogDir.isReadable()) {
- // qWarning(QString("Cannot read directory \"%1\". Disabling logging...").arg(backLogDir.absolutePath()).toAscii());
- // backLogEnabled = false;
- // return;
- //}
- QStringList logs = backLogDir.entryList(QStringList("quassel-backlog-*.bin"), QDir::Files|QDir::Readable, QDir::Name);
- foreach(QString name, logs) {
- QFile f(backLogDir.absolutePath() + "/" + name);
- if(!f.open(QIODevice::ReadOnly)) {
- qWarning(QString("Could not open \"%1\" for reading!").arg(f.fileName()).toAscii());
- continue;
- }
- QDataStream in(&f);
- in.setVersion(QDataStream::Qt_4_2);
- QByteArray verstring; quint8 vernum; in >> verstring >> vernum;
- if(verstring != BACKLOG_STRING) {
- qWarning(QString("\"%1\" is not a Quassel backlog file!").arg(f.fileName()).toAscii());
- f.close(); continue;
- }
- if(vernum != BACKLOG_FORMAT) {
- qWarning(QString("\"%1\": Version mismatch!").arg(f.fileName()).toAscii());
- f.close(); continue;
- }
- qDebug() << "Reading backlog from" << f.fileName();
- currentLogFileDate = QDate::fromString(f.fileName(), QString("'%1/quassel-backlog-'yyyy-MM-dd'.bin'").arg(backLogDir.absolutePath()));
- if(!currentLogFileDate.isValid()) {
- qWarning(QString("\"%1\" has an invalid file name!").arg(f.fileName()).toAscii());
- }
- while(!in.atEnd()) {
- Message m;
- in >> m;
- backLog.append(m);
- }
- f.close();
- }
- backLogEnabled = true;
+QList<BufferId> Core::getBuffers() {
+ return backlog.requestBuffers();
}
-/** Log a core message (emitted via a displayMsg() signal) to the backlog file.
- * If a file for the current day does not exist, one will be created. Otherwise, messages will be appended.
- * The file header is the string defined by BACKLOG_STRING, followed by a quint8 specifying the format
- * version (BACKLOG_FORMAT). The rest is simply serialized Message objects.
- */
-void Core::logMessage(Message msg) {
- backLog.append(msg);
- if(!currentLogFileDate.isValid() || currentLogFileDate < QDate::currentDate()) {
- if(currentLogFile.isOpen()) currentLogFile.close();
- currentLogFileDate = QDate::currentDate();
+void Core::sendBacklog(BufferId id, QVariant v1, QVariant v2) {
+ QList<QVariant> log;
+ QList<Message> msglist;
+ if(v1.type() == QVariant::DateTime) {
+
+
+ } else {
+ msglist = backlog.requestMsgs(id, v1.toInt(), v2.toInt());
}
- if(!currentLogFile.isOpen()) {
- currentLogFile.setFileName(backLogDir.absolutePath() + "/" + currentLogFileDate.toString("'quassel-backlog-'yyyy-MM-dd'.bin'"));
- if(!currentLogFile.open(QIODevice::WriteOnly|QIODevice::Append)) {
- qWarning(QString("Could not open \"%1\" for writing: %2").arg(currentLogFile.fileName()).arg(currentLogFile.errorString()).toAscii());
- return;
+
+ // 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();
}
- logStream.setDevice(¤tLogFile); logStream.setVersion(QDataStream::Qt_4_2);
- if(!currentLogFile.size()) logStream << BACKLOG_STRING << (quint8)BACKLOG_FORMAT;
}
- logStream << msg;
+ if(log.count() > 0) emit backlogData(id, log, true);
}
+
Core *core = 0;
projects / quassel.git / blobdiff