X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=cffb3757f5eac4e2ab80c7650fe53bc5c4e403a7;hb=1607bfc3101e08fe0aeeaa3b50af6ddc9a4f9e3c;hp=e807289475734a0b37d0ac1872139b59880b4ac9;hpb=9ac6ae4ee26819874d8843ba09f38a24088d663d;p=quassel.git

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index e8072894..cffb3757 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-07 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-08 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -27,27 +27,50 @@
 #include "networkinfo.h"
 #include "ircuser.h"
 #include "ircchannel.h"
+#include "identity.h"
 
 #include "util.h"
+#include "coreusersettings.h"
 
+#include <QtScript>
 
 CoreSession::CoreSession(UserId uid, Storage *_storage, QObject *parent)
   : QObject(parent),
     user(uid),
     _signalProxy(new SignalProxy(SignalProxy::Server, 0, this)),
-    storage(_storage)
+    storage(_storage),
+    scriptEngine(new QScriptEngine(this))
 {
-  
-  QSettings s;
-  s.beginGroup(QString("SessionData/%1").arg(user));
-  mutex.lock();
-  foreach(QString key, s.allKeys()) {
-    sessionData[key] = s.value(key);
-  }
-  mutex.unlock();
 
   SignalProxy *p = signalProxy();
 
+  CoreUserSettings s(user);
+  sessionData = s.sessionData();
+/*
+  CoreSettings cs;
+  foreach(QString id, cs.localChildKeys(QString("Identities/%1").arg(user))) {
+    Identity *i = new Identity(cs.localValue(QString("Identities/%1/%2").arg(user).arg(id)).value<Identity>(), this);
+    if(i->id() < 1) {
+      qDebug() << QString("Invalid identity!");
+      continue;
+    }
+    if(_identities.contains(i->id())) {
+      qDebug() << "Duplicate identity, ignoring!";
+      continue;
+    }
+    qDebug() << "loaded identity" << id;
+    _identities[i->id()] = i;
+  }
+  s.endGroup();
+  mutex.unlock();
+  if(!_identities.count()) {
+    Identity i(1);
+    i.setToDefaults();
+    //_identities[i->id()] = i;
+    createOrUpdateIdentity(i);
+  }
+  */
+
   p->attachSlot(SIGNAL(requestNetworkStates()), this, SLOT(serverStateRequested()));
   p->attachSlot(SIGNAL(requestConnect(QString)), this, SLOT(connectToNetwork(QString)));
   p->attachSlot(SIGNAL(sendInput(BufferInfo, QString)), this, SLOT(msgFromGui(BufferInfo, QString)));
@@ -59,18 +82,18 @@ CoreSession::CoreSession(UserId uid, Storage *_storage, QObject *parent)
   p->attachSignal(storage, SIGNAL(bufferInfoUpdated(BufferInfo)));
   p->attachSignal(this, SIGNAL(sessionDataChanged(const QString &, const QVariant &)), SIGNAL(coreSessionDataChanged(const QString &, const QVariant &)));
   p->attachSlot(SIGNAL(clientSessionDataChanged(const QString &, const QVariant &)), this, SLOT(storeSessionData(const QString &, const QVariant &)));
-  /* Autoconnect. (When) do we actually do this?
-     --> session restore should be enough!
-  QStringList list;
-  QVariantMap networks = retrieveSessionData("Networks").toMap();
-  foreach(QString net, networks.keys()) {
-    if(networks[net].toMap()["AutoConnect"].toBool()) {
-      list << net;
-    }
-  } qDebug() << list;
-  if(list.count()) connectToIrc(list);
-  */
 
+  p->attachSignal(this, SIGNAL(identityCreated(const Identity &)));
+  p->attachSignal(this, SIGNAL(identityRemoved(IdentityId)));
+  p->attachSlot(SIGNAL(createIdentity(const Identity &)), this, SLOT(createOrUpdateIdentity(const Identity &)));
+  p->attachSlot(SIGNAL(updateIdentity(const Identity &)), this, SLOT(createOrUpdateIdentity(const Identity &)));
+  p->attachSlot(SIGNAL(removeIdentity(IdentityId)), this, SLOT(removeIdentity(IdentityId)));
+
+  initScriptEngine();
+
+  foreach(Identity *id, _identities.values()) {
+    p->synchronize(id);
+  }
 }
 
 CoreSession::~CoreSession() {
@@ -109,13 +132,11 @@ void CoreSession::restoreState(const QVariant &previousState) {
 
 
 void CoreSession::storeSessionData(const QString &key, const QVariant &data) {
-  QSettings s;
-  s.beginGroup(QString("SessionData/%1").arg(user));
+  CoreUserSettings s(user);
   mutex.lock();
+  s.setSessionValue(key, data);
   sessionData[key] = data;
-  s.setValue(key, data);
   mutex.unlock();
-  s.endGroup();
   emit sessionDataChanged(key, data);
   emit sessionDataChanged(key);
 }
@@ -233,10 +254,14 @@ QVariant CoreSession::sessionState() {
   mutex.unlock();
 
   QVariantList networks;
-  foreach(uint networkid, servers.keys())
+  foreach(NetworkId networkid, servers.keys())
     networks.append(QVariant(networkid));
   v["Networks"] = QVariant(networks);
 
+  QList<QVariant> idlist;
+  foreach(Identity *i, _identities.values()) idlist << QVariant::fromValue<Identity>(*i);
+  v["Identities"] = idlist;
+
   // v["Payload"] = QByteArray(100000000, 'a');  // for testing purposes
   return v;
 }
@@ -261,3 +286,42 @@ void CoreSession::sendBacklog(BufferInfo id, QVariant v1, QVariant v2) {
   }
   if(log.count() > 0) emit backlogData(id, log, true);
 }
+
+
+void CoreSession::initScriptEngine() {
+  signalProxy()->attachSlot(SIGNAL(scriptRequest(QString)), this, SLOT(scriptRequest(QString)));
+  signalProxy()->attachSignal(this, SIGNAL(scriptResult(QString)));
+  
+  QScriptValue storage_ = scriptEngine->newQObject(storage);
+  scriptEngine->globalObject().setProperty("storage", storage_);
+}
+
+void CoreSession::scriptRequest(QString script) {
+  emit scriptResult(scriptEngine->evaluate(script).toString());
+}
+
+void CoreSession::createOrUpdateIdentity(const Identity &id) {
+  if(!_identities.contains(id.id())) {
+    // create new
+    _identities[id.id()] = new Identity(id, this);
+    signalProxy()->synchronize(_identities[id.id()]);
+    emit identityCreated(id.id());
+  } else {
+    // update
+    _identities[id.id()]->update(id);
+  }
+/*
+  CoreSettings s;
+  s.beginGroup(QString("Identities/%1").arg(user));
+  s.setValue(QString::number(id.id()), QVariant::fromValue<Identity>(*_identities[id.id()]));
+  s.endGroup();*/
+}
+
+void CoreSession::removeIdentity(IdentityId id) {
+  Identity *i = _identities.take(id);
+  if(i) {
+    emit identityRemoved(id);
+    i->deleteLater();
+  }
+}
+