X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=fee759471bb20cab07a17b364389c845d5409ccd;hp=c06ca6d0067aa69b5c8c4cbbdfbe9de24b5aa6fd;hb=cd0868fff76dd067470881134fd736e1a1d97e71;hpb=76929fefa96b80fe4f3be89c334c820b13ad7e3b

diff --git a/src/core/core.cpp b/src/core/core.cpp
index c06ca6d0..fee75947 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -65,7 +65,7 @@ void Core::init() {
   CoreSettings cs;
 
   if(!(configured = initStorage(cs.storageSettings().toMap()))) {
-    qWarning("Core is currently not configured!");
+    qWarning("Core is currently not configured! Please connect with a Quassel Client for basic setup.");
 
     // try to migrate old settings
     QVariantMap old = cs.oldDbSettings().toMap();
@@ -84,7 +84,7 @@ void Core::init() {
 }
 
 Core::~Core() {
-  foreach(QTcpSocket *socket, blocksizes.keys()) {
+  foreach(QTcpSocket *socket, blocksizes.keys()) { qDebug() << "disconnecting" << socket << blocksizes.keys();
     socket->disconnectFromHost();  // disconnect local (i.e. non-authed) clients
   }
   qDeleteAll(sessions);
@@ -105,7 +105,7 @@ void Core::saveState() {
 
 void Core::restoreState() {
   if(!instance()->configured) {
-    qWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!"));
+    // qWarning() << qPrintable(tr("Cannot restore a state for an unconfigured core!"));
     return;
   }
   if(instance()->sessions.count()) {
@@ -141,7 +141,7 @@ QString Core::setupCore(const QVariant &setupData_) {
     return tr("Could not setup storage!");
   }
   CoreSettings s;
-  //s.setStorageSettings(msg);
+  s.setStorageSettings(setupData);
   qDebug() << qPrintable(tr("Creating admin user..."));
   mutex.lock();
   storage->addUser(user, password);
@@ -235,11 +235,41 @@ NetworkId Core::networkId(UserId user, const QString &network) {
   return instance()->storage->getNetworkId(user, network);
 }
 
+QList<NetworkId> Core::connectedNetworks(UserId user) {
+  QMutexLocker locker(&mutex);
+  return instance()->storage->connectedNetworks(user);
+}
+
+void Core::setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected) {
+  QMutexLocker locker(&mutex);
+  return instance()->storage->setNetworkConnected(user, networkId, isConnected);
+}
+
+QHash<QString, QString> Core::persistentChannels(UserId user, const NetworkId &networkId) {
+  QMutexLocker locker(&mutex);
+  return instance()->storage->persistentChannels(user, networkId);
+}
+
+void Core::setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined) {
+  QMutexLocker locker(&mutex);
+  return instance()->storage->setChannelPersistent(user, networkId, channel, isJoined);
+}
+
+void Core::setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key) {
+  QMutexLocker locker(&mutex);
+  return instance()->storage->setPersistentChannelKey(user, networkId, channel, key);
+}
+
 BufferInfo Core::bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer) {
   QMutexLocker locker(&mutex);
   return instance()->storage->getBufferInfo(user, networkId, type, buffer);
 }
 
+BufferInfo Core::getBufferInfo(UserId user, const BufferId &bufferId) {
+  QMutexLocker locker(&mutex);
+  return instance()->storage->getBufferInfo(user, bufferId);
+}
+
 MsgId Core::storeMessage(const Message &message) {
   QMutexLocker locker(&mutex);
   return instance()->storage->logMessage(message);
@@ -265,6 +295,16 @@ QList<BufferInfo> Core::requestBuffers(UserId user, QDateTime since) {
   return instance()->storage->requestBuffers(user, since);
 }
 
+bool Core::removeBuffer(const UserId &user, const BufferId &bufferId) {
+  QMutexLocker locker(&mutex);
+  return instance()->storage->removeBuffer(user, bufferId);
+}
+
+BufferId Core::renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName) {
+  QMutexLocker locker(&mutex);
+  return instance()->storage->renameBuffer(user, networkId, newName, oldName);
+}
+
 void Core::setBufferLastSeen(UserId user, const BufferId &bufferId, const QDateTime &seenDate) {
   QMutexLocker locker(&mutex);
   return instance()->storage->setBufferLastSeen(user, bufferId, seenDate);
@@ -315,6 +355,7 @@ void Core::clientHasData() {
   while(SignalProxy::readDataFromDevice(socket, blocksizes[socket], item)) {
     QVariantMap msg = item.toMap();
     processClientMessage(socket, msg);
+    if(!blocksizes.contains(socket)) break;  // this socket is no longer ours to handle!
   }
 }
 
@@ -336,7 +377,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) {
     int updays = uptime / 86400; uptime %= 86400;
     int uphours = uptime / 3600; uptime %= 3600;
     int upmins = uptime / 60;
-    reply["CoreInfo"] = tr("<b>Quassel Core Version %1 (Build >= %2)</b><br>"
+    reply["CoreInfo"] = tr("<b>Quassel Core Version %1 (Build &ge; %2)</b><br>"
                             "Up %3d%4h%5m (since %6)").arg(Global::quasselVersion).arg(Global::quasselBuild)
                             .arg(updays).arg(uphours,2,10,QChar('0')).arg(upmins,2,10,QChar('0')).arg(startTime.toString(Qt::TextDate));