X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=core%2Fcore.cpp;h=f9de45ffdc53f1599253d785bc3404f4366d989b;hp=5bed7add09de872d1786c8d3a901f46f47dedd46;hb=2c9184c37fc54adb7670ea261a8e34c99a82a285;hpb=2a068c11e76c7b34afb64d443dbb1afd2e208aaa diff --git a/core/core.cpp b/core/core.cpp index 5bed7add..f9de45ff 100644 --- a/core/core.cpp +++ b/core/core.cpp @@ -32,10 +32,14 @@ Core::Core() { 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, Message)), coreProxy, SLOT(csDisplayMsg(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, bool)), coreProxy, SLOT(csBacklogData(BufferId, QList, 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"); @@ -43,7 +47,7 @@ Core::Core() { foreach(key, s.childKeys()) { global->updateData(key, s.value(key)); } - initBackLogOld(); + 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. @@ -56,14 +60,6 @@ Core::~Core() { //foreach(Server *s, servers) { // delete s; //} - foreach(QDataStream *s, logStreams) { - delete s; - } - foreach(QFile *f, logFiles) { - if(f->isOpen()) f->close(); - delete f; - } - logDb.close(); } void Core::globalDataUpdated(QString key) { @@ -83,11 +79,11 @@ void Core::connectToIrc(QStringList networks) { 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(serverState(QString, VarMap)), coreProxy, SLOT(csServerState(QString, VarMap))); - connect(server, SIGNAL(displayMsg(Message)), this, SLOT(recvMessageFromServer(Message))); + //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))); @@ -111,14 +107,34 @@ void Core::serverDisconnected(QString 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(Message::Type type, QString target, QString text, QString sender, quint8 flags) { + Server *s = qobject_cast(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(sender()); Q_ASSERT(s); - logMessageOld(s->getNetwork(), msg); + logMessage(s->getNetwork(), msg); emit displayMsg(s->getNetwork(), msg); } +*/ void Core::recvStatusMsgFromServer(QString msg) { Server *s = qobject_cast(sender()); @@ -126,154 +142,30 @@ void Core::recvStatusMsgFromServer(QString msg) { emit displayStatusMsg(s->getNetwork(), msg); } -void Core::initBackLog() { - QDir backLogDir = QDir(Global::quasselDir); - 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; - } - } - QString backLogFile = Global::quasselDir + "/quassel-backlog.sqlite"; - logDb = QSqlDatabase::addDatabase("QSQLITE", "backlog"); - logDb.setDatabaseName(backLogFile); - bool ok = logDb.open(); - if(!ok) { - qWarning(tr("Could not open backlog database: %1").arg(logDb.lastError().text()).toAscii()); - qWarning(tr("Disabling logging...").toAscii()); - } - // TODO store database version - QSqlQuery query = logDb.exec("CREATE TABLE IF NOT EXISTS backlog (" - "Time INTEGER, User TEXT, Network TEXT, Buffer TEXT, Message BLOB" - ");"); - if(query.lastError().isValid()) { - qWarning(tr("Could not create backlog table: %1").arg(query.lastError().text()).toAscii()); - qWarning(tr("Disabling logging...").toAscii()); - backLogEnabled = false; - return; - } - - backLogEnabled = true; +QList Core::getBuffers() { + return backlog.requestBuffers(); } -// file name scheme: quassel-backlog-2006-29-10.bin -void Core::initBackLogOld() { - 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 networks = backLogDir.entryList(QDir::Dirs|QDir::NoDotAndDotDot|QDir::Readable, QDir::Name); - foreach(QString net, networks) { - QDir dir(backLogDir.absolutePath() + "/" + net); - if(!dir.exists()) { - qWarning(QString("Could not change to directory \"%1\"!").arg(dir.absolutePath()).toAscii()); - continue; - } - QStringList logs = dir.entryList(QStringList("quassel-backlog-*.bin"), QDir::Files|QDir::Readable, QDir::Name); - foreach(QString name, logs) { - QFile f(dir.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(); - logFileDates[net] = QDate::fromString(f.fileName(), - QString("'%1/quassel-backlog-'yyyy-MM-dd'.bin'").arg(dir.absolutePath())); - if(!logFileDates[net].isValid()) { - qWarning(QString("\"%1\" has an invalid file name!").arg(f.fileName()).toAscii()); - } - while(!in.atEnd()) { - Message m; - in >> m; - backLog[net].append(m); - } - f.close(); - } - } - backLogEnabled = true; -} +void Core::sendBacklog(BufferId id, QVariant v1, QVariant v2) { + QList log; + QList msglist; + if(v1.type() == QVariant::DateTime) { + -void Core::logMessage(QString net, Message msg) { - if(!backLogEnabled) return; - QString buf; - if(msg.flags & Message::PrivMsg) { - // query - if(msg.flags & Message::Self) buf = msg.target; - else buf = nickFromMask(msg.sender); } else { - buf = msg.target; + msglist = backlog.requestMsgs(id, v1.toInt(), v2.toInt()); } - QSqlQuery query = logDb.exec(QString("INSERT INTO backlog Time, User, Network, Buffer, Message " - "VALUES %1, %2, %3, %4, %5;") - .arg(msg.timeStamp.toTime_t()).arg("Default").arg(net).arg(buf).arg(msg.text)); - if(query.lastError().isValid()) { - qWarning(tr("Error while logging to database: %1").arg(query.lastError().text()).toAscii()); - } - -} - -/** 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::logMessageOld(QString net, Message msg) { - backLog[net].append(msg); - if(!logFileDirs.contains(net)) { - QDir dir(backLogDir.absolutePath() + "/" + net); - if(!dir.exists()) { - qWarning(QString("Creating backlog directory \"%1\"...").arg(dir.absolutePath()).toAscii()); - if(!dir.mkpath(dir.absolutePath())) { - qWarning(QString("Could not create backlog directory!").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(); } - logFileDirs[net] = dir; - Q_ASSERT(!logFiles.contains(net) && !logStreams.contains(net)); - if(!logFiles.contains(net)) logFiles[net] = new QFile(); - if(!logStreams.contains(net)) logStreams[net] = new QDataStream(); } - if(!logFileDates[net].isValid() || logFileDates[net] < QDate::currentDate()) { - if(logFiles[net]->isOpen()) logFiles[net]->close(); - logFileDates[net] = QDate::currentDate(); - } - if(!logFiles[net]->isOpen()) { - logFiles[net]->setFileName(QString("%1/%2").arg(logFileDirs[net].absolutePath()) - .arg(logFileDates[net].toString("'quassel-backlog-'yyyy-MM-dd'.bin'"))); - if(!logFiles[net]->open(QIODevice::WriteOnly|QIODevice::Append|QIODevice::Unbuffered)) { - qWarning(QString("Could not open \"%1\" for writing: %2") - .arg(logFiles[net]->fileName()).arg(logFiles[net]->errorString()).toAscii()); - return; - } - logStreams[net]->setDevice(logFiles[net]); logStreams[net]->setVersion(QDataStream::Qt_4_2); - if(!logFiles[net]->size()) *logStreams[net] << BACKLOG_STRING << (quint8)BACKLOG_FORMAT; - } - *logStreams[net] << msg; + if(log.count() > 0) emit backlogData(id, log, true); } + Core *core = 0;