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(this, SIGNAL(displayMsg(QString, Message)), coreProxy, SLOT(csDisplayMsg(QString, Message)));
connect(this, SIGNAL(displayStatusMsg(QString, QString)), coreProxy, SLOT(csDisplayStatusMsg(QString, QString)));
// Read global settings from config file
}
+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;
+ }
+}
+
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(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(nickUpdated(QString, QString, VarMap)), coreProxy, SLOT(csNickUpdated(QString, QString, VarMap)));
connect(server, SIGNAL(ownNickSet(QString, QString)), coreProxy, SLOT(csOwnNickSet(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);
+}
+
// 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 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) {
// 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());
+ 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;
}
- 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());
+ 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();
}
- while(!in.atEnd()) {
- Message m;
- in >> m;
- backLog.append(m);
- }
- f.close();
}
backLogEnabled = true;
}
* 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::logMessage(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;
+ }
+ }
+ 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(!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());
+ 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;
}
- logStream.setDevice(¤tLogFile); logStream.setVersion(QDataStream::Qt_4_2);
- if(!currentLogFile.size()) logStream << BACKLOG_STRING << (quint8)BACKLOG_FORMAT;
+ logStreams[net]->setDevice(logFiles[net]); logStreams[net]->setVersion(QDataStream::Qt_4_2);
+ if(!logFiles[net]->size()) *logStreams[net] << BACKLOG_STRING << (quint8)BACKLOG_FORMAT;
}
- logStream << msg;
+ *logStreams[net] << msg;
}
Core *core = 0;