X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=core%2Fcore.cpp;h=f9de45ffdc53f1599253d785bc3404f4366d989b;hp=9ccbd211755560b2c34c6ce0571666a11e2e5af0;hb=2c9184c37fc54adb7670ea261a8e34c99a82a285;hpb=23221be79f5a6c064061f425a156b27fd9802a09

diff --git a/core/core.cpp b/core/core.cpp
index 9ccbd211..f9de45ff 100644
--- a/core/core.cpp
+++ b/core/core.cpp
@@ -21,18 +21,25 @@
 #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");
@@ -40,6 +47,7 @@ Core::Core() {
   foreach(key, s.childKeys()) {
     global->updateData(key, s.value(key));
   }
+  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. 
@@ -48,6 +56,12 @@ Core::Core() {
 
 }
 
+Core::~Core() {
+  //foreach(Server *s, servers) {
+  //  delete s;
+  //}
+}
+
 void Core::globalDataUpdated(QString key) {
   QVariant data = global->getData(key);
   QSettings s;
@@ -60,20 +74,25 @@ void Core::connectToIrc(QStringList networks) {
 
     } 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;
@@ -82,18 +101,70 @@ void Core::connectToIrc(QStringList networks) {
   }
 }
 
+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) {
-  Q_ASSERT(sender());
-  QString net = qobject_cast<Server*>(sender())->getNetwork();
-  emit displayMsg(net, buf, 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(s->getNetwork(), msg);
+  emit displayMsg(s->getNetwork(), msg);
 }
+*/
 
 void Core::recvStatusMsgFromServer(QString msg) {
-  Q_ASSERT(sender());
-  QString net = qobject_cast<Server*>(sender())->getNetwork();
-  emit displayStatusMsg(net, msg);
+  Server *s = qobject_cast<Server*>(sender());
+  Q_ASSERT(s);
+  emit displayStatusMsg(s->getNetwork(), msg);
+}
+
+QList<BufferId> Core::getBuffers() {
+  return backlog.requestBuffers();
+}
+
+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());
+  }
+
+  // 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();
+    }
+  }
+  if(log.count() > 0) emit backlogData(id, log, true);
 }