X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=0f007d35fa3a4278a6fbc0d20339b47c98c31bb9;hp=9bd36fbe3e563d601ddfb7bd84ab356076f2c91d;hb=4b41d8800c38aa3bc4e88a76289b45bc888ba088;hpb=97d674034551438238c568e8b42efb08e1ba7354 diff --git a/src/core/core.cpp b/src/core/core.cpp index 9bd36fbe..0f007d35 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-07 by The Quassel IRC Development 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 * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * (at your option) version 3. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -21,12 +21,14 @@ #include "core.h" #include "coresession.h" #include "coresettings.h" +#include "signalproxy.h" #include "sqlitestorage.h" -#include "util.h" #include #include +#include + Core *Core::instanceptr = 0; Core *Core::instance() { @@ -41,55 +43,138 @@ void Core::destroy() { instanceptr = 0; } -Core::Core() { - storage = NULL; +Core::Core() + : storage(0) +{ } void Core::init() { - CoreSettings s; - configured = false; + // TODO: Remove this again at some point + // Check if old core settings need to be migrated in order to make the switch to the + // new location less painful. + CoreSettings cs; + QVariant foo = cs.databaseSettings(); + + if(!foo.isValid()) { + // ok, no settings stored yet. check for old ones. +#ifdef Q_WS_MAC + QSettings os("quassel-irc.org", "Quassel IRC", this); +#else + QSettings os("Quassel IRC Development Team", "Quassel IRC"); +#endif + QVariant bar = os.value("Core/DatabaseSettings"); + if(bar.isValid()) { + // old settings available -- migrate! + qWarning() << "\n\nOld settings detected. Will migrate core settings to the new location...\nNOTE: GUI style settings won't be migrated!\n"; +#ifdef Q_WS_MAC + QSettings ncs("quassel-irc.org", "Quassel Core"); +#else + QSettings ncs("Quassel Project", "Quassel Core"); +#endif + ncs.setValue("Core/CoreState", os.value("Core/CoreState")); + ncs.setValue("Core/DatabaseSettings", os.value("Core/DatabaseSettings")); + os.beginGroup("SessionData"); + foreach(QString group, os.childGroups()) { + ncs.setValue(QString("CoreUser/%1/SessionData/Identities").arg(group), os.value(QString("%1/Identities").arg(group))); + ncs.setValue(QString("CoreUser/%1/SessionData/Networks").arg(group), os.value(QString("%1/Networks").arg(group))); + } + os.endGroup(); +#ifdef Q_WS_MAC + QSettings ngs("quassel-irc.org", "Quassel Client"); +#else + QSettings ngs("Quassel Project", "Quassel Client"); +#endif + os.beginGroup("Accounts"); + foreach(QString key, os.childKeys()) { + ngs.setValue(QString("Accounts/%1").arg(key), os.value(key)); + } + foreach(QString group, os.childGroups()) { + ngs.setValue(QString("Accounts/%1/AccountData").arg(group), os.value(QString("%1/AccountData").arg(group))); + } + os.endGroup(); + os.beginGroup("Geometry"); + foreach(QString key, os.childKeys()) { + ngs.setValue(QString("UI/%1").arg(key), os.value(key)); + } + os.endGroup(); - QVariantMap dbSettings = s.databaseSettings().toMap(); - QString hname = dbSettings["Type"].toString().toLower(); - hname[0] = hname[0].toUpper(); - hname = "initStorage" + hname; - if (!QMetaObject::invokeMethod(this, hname.toAscii(), Q_RETURN_ARG(bool, configured), Q_ARG(QVariantMap, dbSettings), Q_ARG(bool, false))) { - qWarning("No database backend configured."); + ncs.sync(); + ngs.sync(); + qWarning() << "Migration successfully finished. You may now delete $HOME/.config/Quassel IRC Development Team/ (on Linux).\n\n"; + } } - - if (!configured) { + // END + + configured = false; + + if(!(configured = initStorage(cs.databaseSettings().toMap()))) { qWarning("Core is currently not configured!"); } - + connect(&server, SIGNAL(newConnection()), this, SLOT(incomingConnection())); - startListening(s.port()); + startListening(cs.port()); guiUser = 0; + } -bool Core::initStorageSqlite(QVariantMap dbSettings, bool setup) { - if (!SqliteStorage::isAvailable()) { - qFatal("Sqlite is currently required! Please make sure your Qt library has sqlite support enabled."); - } - if (storage) { +bool Core::initStorage(QVariantMap dbSettings, bool setup) { + QString engine = dbSettings["Type"].toString().toLower(); + + if(storage) { qDebug() << "Deleting old storage object."; - delete storage; - storage = NULL; + storage->deleteLater(); + storage = 0; } - - storage = new SqliteStorage(); - if (setup && !storage->setup(dbSettings)) { - return false; + + // FIXME register new storageProviders here + if(engine == "sqlite" && SqliteStorage::isAvailable()) { + storage = new SqliteStorage(this); + } else { + qWarning() << "Selected StorageBackend is not available:" << dbSettings["Type"].toString(); + return configured = false; } - - return storage->init(dbSettings); + + if(setup && !storage->setup(dbSettings)) { + return configured = false; + } + + return configured = storage->init(dbSettings); +} + +bool Core::initStorage(QVariantMap dbSettings) { + return initStorage(dbSettings, false); } Core::~Core() { qDeleteAll(sessions); - if (storage) { - delete storage; - storage = NULL; +} + +void Core::restoreState() { + Q_ASSERT(!instance()->sessions.count()); + CoreSettings s; + QList users = s.coreState().toList(); + if(users.count() > 0) { + qDebug() << "Restoring previous core state..."; + foreach(QVariant v, users) { + QVariantMap m = v.toMap(); + if(m.contains("UserId")) { + CoreSession *sess = createSession(m["UserId"].toUInt()); + sess->restoreState(m["State"]); + } + } + } +} + +void Core::saveState() { + CoreSettings s; + QList users; + foreach(CoreSession *sess, instance()->sessions.values()) { + QVariantMap m; + m["UserId"] = sess->userId(); + m["State"] = sess->state(); + users << m; } + s.setCoreState(users); } CoreSession *Core::session(UserId uid) { @@ -147,7 +232,7 @@ void Core::clientHasData() { Q_ASSERT(socket && blockSizes.contains(socket)); quint32 bsize = blockSizes.value(socket); QVariant item; - if(readDataFromDevice(socket, bsize, item)) { + if(SignalProxy::readDataFromDevice(socket, bsize, item)) { // we need to auth the client try { QVariantMap msg = item.toMap(); @@ -209,7 +294,7 @@ void Core::processClientInit(QTcpSocket *socket, const QVariantMap &msg) { disconnect(socket, 0, this, 0); sessions[uid]->addClient(socket); qDebug() << "Client initialized successfully."; - writeDataToDevice(socket, reply); + SignalProxy::writeDataToDevice(socket, reply); } void Core::processCoreSetup(QTcpSocket *socket, QVariantMap &msg) { @@ -220,19 +305,14 @@ void Core::processCoreSetup(QTcpSocket *socket, QVariantMap &msg) { msg.remove("User"); msg.remove("Password"); qDebug() << "Initializing storage provider" << msg["Type"].toString(); - QString hname = msg["Type"].toString().toLower(); - hname[0] = hname[0].toUpper(); - hname = "initStorage" + hname; - if (!QMetaObject::invokeMethod(this, hname.toAscii(), Q_RETURN_ARG(bool, configured), Q_ARG(QVariantMap, msg), Q_ARG(bool, true))) { - qWarning("No database backend configured."); - } - if (!configured) { + + if(!initStorage(msg, true)) { // notify client to start wizard again qWarning("Core is currently not configured!"); QVariantMap reply; reply["StartWizard"] = true; reply["StorageProviders"] = availableStorageProviders(); - writeDataToDevice(socket, reply); + SignalProxy::writeDataToDevice(socket, reply); } else { // write coresettings CoreSettings s; @@ -248,7 +328,7 @@ void Core::processCoreSetup(QTcpSocket *socket, QVariantMap &msg) { QVariantMap reply; reply["StartWizard"] = true; reply["StorageProviders"] = availableStorageProviders(); - writeDataToDevice(socket, reply); + SignalProxy::writeDataToDevice(socket, reply); } } @@ -270,7 +350,7 @@ QStringList Core::availableStorageProviders() { storageProviders.append(SqliteStorage::displayName()); } // TODO: temporary - storageProviders.append("MySQL"); + // storageProviders.append("MySQL"); return storageProviders; }