X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.cpp;h=7f4dd78f5ce0701793466fc2e2ce860ee7dd8ab5;hp=fb9045241c88077054d274a31a92b848e76f0454;hb=50680e8d8548a9b856faa7c5d3d5d4ae4a6be2bd;hpb=5319f3fbe69a63d1599107e0fc77ae325e4a9b6d diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp index fb904524..7f4dd78f 100644 --- a/src/core/sqlitestorage.cpp +++ b/src/core/sqlitestorage.cpp @@ -24,6 +24,9 @@ #include "network.h" +#include "util.h" +#include "logger.h" + SqliteStorage::SqliteStorage(QObject *parent) : AbstractSqlStorage(parent) { @@ -131,6 +134,49 @@ void SqliteStorage::delUser(UserId user) { emit userRemoved(user); } +void SqliteStorage::setUserSetting(UserId userId, const QString &settingName, const QVariant &data) { + QByteArray rawData; + QDataStream out(&rawData, QIODevice::WriteOnly); + out.setVersion(QDataStream::Qt_4_2); + out << data; + + QSqlQuery query(logDb()); + query.prepare(queryString("insert_user_setting")); + query.bindValue(":userid", userId.toInt()); + query.bindValue(":settingname", settingName); + query.bindValue(":settingvalue", rawData); + query.exec(); + + if(query.lastError().isValid()) { + QSqlQuery updateQuery(logDb()); + updateQuery.prepare(queryString("update_user_setting")); + updateQuery.bindValue(":userid", userId.toInt()); + updateQuery.bindValue(":settingname", settingName); + updateQuery.bindValue(":settingvalue", rawData); + updateQuery.exec(); + } + +} + +QVariant SqliteStorage::getUserSetting(UserId userId, const QString &settingName, const QVariant &defaultData) { + QSqlQuery query(logDb()); + query.prepare(queryString("select_user_setting")); + query.bindValue(":userid", userId.toInt()); + query.bindValue(":settingname", settingName); + query.exec(); + + if(query.first()) { + QVariant data; + QByteArray rawData = query.value(0).toByteArray(); + QDataStream in(&rawData, QIODevice::ReadOnly); + in.setVersion(QDataStream::Qt_4_2); + in >> data; + return data; + } else { + return defaultData; + } +} + NetworkId SqliteStorage::createNetwork(UserId user, const NetworkInfo &info) { NetworkId networkId; QSqlQuery query(logDb()); @@ -143,7 +189,9 @@ NetworkId SqliteStorage::createNetwork(UserId user, const NetworkInfo &info) { if(!networkId.isValid()) { watchQuery(&query); } else { - updateNetwork(user, info); + NetworkInfo newNetworkInfo = info; + newNetworkInfo.networkId = networkId; + updateNetwork(user, newNetworkInfo); } return networkId; } @@ -209,7 +257,7 @@ bool SqliteStorage::removeNetwork(UserId user, const NetworkId &networkId) { if(withTransaction) { sync(); if(!logDb().transaction()) { - qWarning() << "SqliteStorage::removeNetwork(): cannot start transaction. continuing with out rollback support!"; + quWarning() << "SqliteStorage::removeNetwork(): cannot start transaction. continuing with out rollback support!"; withTransaction = false; } } @@ -443,16 +491,19 @@ BufferInfo SqliteStorage::getBufferInfo(UserId user, const NetworkId &networkId, query->exec(); if(!query->first()) { watchQuery(query); - qWarning() << "unable to create BufferInfo for:" << user << networkId << buffer; + quWarning() << "unable to create BufferInfo for:" << user << networkId << buffer; return BufferInfo(); } } BufferInfo bufferInfo = BufferInfo(query->value(0).toInt(), networkId, (BufferInfo::Type)query->value(1).toInt(), 0, buffer); if(query->next()) { - qWarning() << "SqliteStorage::getBufferInfo(): received more then one Buffer!"; - qWarning() << " Query:" << query->lastQuery(); - qWarning() << " bound Values:" << query->boundValues(); + quError() << "SqliteStorage::getBufferInfo(): received more then one Buffer!"; + quError() << " Query:" << query->lastQuery(); + quError() << " bound Values:"; + QList list = query->boundValues().values(); + for (int i = 0; i < list.size(); ++i) + quError() << i << ":" << list.at(i).toString().toAscii().data(); Q_ASSERT(false); } @@ -477,16 +528,11 @@ BufferInfo SqliteStorage::getBufferInfo(UserId user, const BufferId &bufferId) { return bufferInfo; } -QList SqliteStorage::requestBuffers(UserId user, QDateTime since) { - uint time = 0; - if(since.isValid()) - time = since.toTime_t(); - +QList SqliteStorage::requestBuffers(UserId user) { QList bufferlist; QSqlQuery query(logDb()); query.prepare(queryString("select_buffers")); query.bindValue(":userid", user.toInt()); - query.bindValue(":time", time); query.exec(); watchQuery(&query); @@ -496,6 +542,21 @@ QList SqliteStorage::requestBuffers(UserId user, QDateTime since) { return bufferlist; } +QList SqliteStorage::requestBufferIdsForNetwork(UserId user, NetworkId networkId) { + QList bufferList; + QSqlQuery query(logDb()); + query.prepare(queryString("select_buffers_for_network")); + query.bindValue(":networkid", networkId.toInt()); + query.bindValue(":userid", user.toInt()); + + query.exec(); + watchQuery(&query); + while(query.next()) { + bufferList << BufferId(query.value(0).toInt()); + } + return bufferList; +} + bool SqliteStorage::removeBuffer(const UserId &user, const BufferId &bufferId) { if(!isValidBuffer(user, bufferId)) return false; @@ -587,9 +648,9 @@ MsgId SqliteStorage::logMessage(Message msg) { logMessageQuery->bindValue(":time", msg.timestamp().toTime_t()); logMessageQuery->bindValue(":bufferid", msg.bufferInfo().bufferId().toInt()); logMessageQuery->bindValue(":type", msg.type()); - logMessageQuery->bindValue(":flags", msg.flags()); + logMessageQuery->bindValue(":flags", (int)msg.flags()); logMessageQuery->bindValue(":sender", msg.sender()); - logMessageQuery->bindValue(":message", msg.text()); + logMessageQuery->bindValue(":message", msg.contents()); logMessageQuery->exec(); if(logMessageQuery->lastError().isValid()) { @@ -646,7 +707,7 @@ QList SqliteStorage::requestMsgs(UserId user, BufferId bufferId, int la (Message::Type)msgQuery->value(2).toUInt(), msgQuery->value(5).toString(), msgQuery->value(4).toString(), - msgQuery->value(3).toUInt()); + (Message::Flags)msgQuery->value(3).toUInt()); msg.setMsgId(msgQuery->value(0).toInt()); messagelist << msg; } @@ -684,7 +745,7 @@ QList SqliteStorage::requestMsgs(UserId user, BufferId bufferId, QDateT (Message::Type)msgQuery->value(2).toUInt(), msgQuery->value(5).toString(), msgQuery->value(4).toString(), - msgQuery->value(3).toUInt()); + (Message::Flags)msgQuery->value(3).toUInt()); msg.setMsgId(msgQuery->value(0).toInt()); messagelist << msg; } @@ -714,7 +775,7 @@ QList SqliteStorage::requestMsgRange(UserId user, BufferId bufferId, in (Message::Type)rangeQuery->value(2).toUInt(), rangeQuery->value(5).toString(), rangeQuery->value(4).toString(), - rangeQuery->value(3).toUInt()); + (Message::Flags)rangeQuery->value(3).toUInt()); msg.setMsgId(rangeQuery->value(0).toInt()); messagelist << msg; } @@ -723,18 +784,7 @@ QList SqliteStorage::requestMsgRange(UserId user, BufferId bufferId, in } QString SqliteStorage::backlogFile() { - // kinda ugly, but I currently see no other way to do that -#ifdef Q_OS_WIN32 - QString quasselDir = QDir::homePath() + qgetenv("APPDATA") + "\\quassel\\"; -#else - QString quasselDir = QDir::homePath() + "/.quassel/"; -#endif - - QDir qDir(quasselDir); - if(!qDir.exists(quasselDir)) - qDir.mkpath(quasselDir); - - return quasselDir + "quassel-storage.sqlite"; + return quasselDir().absolutePath() + "/quassel-storage.sqlite"; } @@ -763,7 +813,7 @@ bool SqliteStorage::init(const QVariantMap &settings) { getPasswordsQuery.exec(); if(!watchQuery(&getPasswordsQuery)) { - qWarning() << "unable to migrate to new password format!"; + quError() << "unable to migrate to new password format!"; return false; } @@ -781,6 +831,6 @@ bool SqliteStorage::init(const QVariantMap &settings) { watchQuery(&setPasswordsQuery); } - qDebug() << "successfully migrated passwords!"; + quDebug() << "successfully migrated passwords!"; return true; }