#include "sqlitestorage.h"
-#include <QCryptographicHash>
#include <QtSql>
#include "network.h"
+#include "util.h"
+#include "logger.h"
+
SqliteStorage::SqliteStorage(QObject *parent)
: AbstractSqlStorage(parent)
{
}
UserId SqliteStorage::addUser(const QString &user, const QString &password) {
- QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
- cryptopass = cryptopass.toHex();
-
QSqlQuery query(logDb());
query.prepare(queryString("insert_quasseluser"));
query.bindValue(":username", user);
- query.bindValue(":password", cryptopass);
+ query.bindValue(":password", cryptedPassword(password));
query.exec();
if(query.lastError().isValid() && query.lastError().number() == 19) { // user already exists - sadly 19 seems to be the general constraint violation error...
return 0;
}
void SqliteStorage::updateUser(UserId user, const QString &password) {
- QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
- cryptopass = cryptopass.toHex();
-
QSqlQuery query(logDb());
query.prepare(queryString("update_userpassword"));
query.bindValue(":userid", user.toInt());
- query.bindValue(":password", cryptopass);
+ query.bindValue(":password", cryptedPassword(password));
query.exec();
}
}
UserId SqliteStorage::validateUser(const QString &user, const QString &password) {
- QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
- cryptopass = cryptopass.toHex();
-
QSqlQuery query(logDb());
query.prepare(queryString("select_authuser"));
query.bindValue(":username", user);
- query.bindValue(":password", cryptopass);
+ query.bindValue(":password", cryptedPassword(password));
+ query.exec();
+
+ if(query.first()) {
+ return query.value(0).toInt();
+ } else {
+ return 0;
+ }
+}
+
+UserId SqliteStorage::internalUser() {
+ QSqlQuery query(logDb());
+ query.prepare(queryString("select_internaluser"));
query.exec();
if(query.first()) {
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());
networkId = getNetworkId(user, info.networkName);
if(!networkId.isValid()) {
- watchQuery(&query);
+ watchQuery(query);
} else {
- updateNetwork(user, info);
+ NetworkInfo newNetworkInfo = info;
+ newNetworkInfo.networkId = networkId;
+ updateNetwork(user, newNetworkInfo);
}
return networkId;
}
updateQuery.bindValue(":rejoinchannels", info.rejoinChannels ? 1 : 0);
updateQuery.bindValue(":networkid", info.networkId.toInt());
updateQuery.exec();
- if(!watchQuery(&updateQuery))
+ if(!watchQuery(updateQuery))
return false;
QSqlQuery dropServersQuery(logDb());
dropServersQuery.prepare("DELETE FROM ircserver WHERE networkid = :networkid");
dropServersQuery.bindValue(":networkid", info.networkId.toInt());
dropServersQuery.exec();
- if(!watchQuery(&dropServersQuery))
+ if(!watchQuery(dropServersQuery))
return false;
QSqlQuery insertServersQuery(logDb());
insertServersQuery.bindValue(":networkid", info.networkId.toInt());
insertServersQuery.exec();
- if(!watchQuery(&insertServersQuery))
+ if(!watchQuery(insertServersQuery))
return false;
}
deleteBacklogQuery.prepare(queryString("delete_backlog_for_network"));
deleteBacklogQuery.bindValue(":networkid", networkId.toInt());
deleteBacklogQuery.exec();
- if(!watchQuery(&deleteBacklogQuery)) {
+ if(!watchQuery(deleteBacklogQuery)) {
if(withTransaction)
logDb().rollback();
return false;
deleteBuffersQuery.prepare(queryString("delete_buffers_for_network"));
deleteBuffersQuery.bindValue(":networkid", networkId.toInt());
deleteBuffersQuery.exec();
- if(!watchQuery(&deleteBuffersQuery)) {
+ if(!watchQuery(deleteBuffersQuery)) {
if(withTransaction)
logDb().rollback();
return false;
deleteServersQuery.prepare(queryString("delete_ircservers_for_network"));
deleteServersQuery.bindValue(":networkid", networkId.toInt());
deleteServersQuery.exec();
- if(!watchQuery(&deleteServersQuery)) {
+ if(!watchQuery(deleteServersQuery)) {
if(withTransaction)
logDb().rollback();
return false;
deleteNetworkQuery.prepare(queryString("delete_network"));
deleteNetworkQuery.bindValue(":networkid", networkId.toInt());
deleteNetworkQuery.exec();
- if(!watchQuery(&deleteNetworkQuery)) {
+ if(!watchQuery(deleteNetworkQuery)) {
if(withTransaction)
logDb().rollback();
return false;
serversQuery.prepare(queryString("select_servers_for_network"));
networksQuery.exec();
- if(!watchQuery(&networksQuery))
+ if(!watchQuery(networksQuery))
return nets;
while(networksQuery.next()) {
serversQuery.bindValue(":networkid", net.networkId.toInt());
serversQuery.exec();
- if(!watchQuery(&serversQuery))
+ if(!watchQuery(serversQuery))
return nets;
QVariantList servers;
query.bindValue(":networkid", networkId.toInt());
query.exec();
- watchQuery(&query); // there should not occur any errors
+ watchQuery(query); // there should not occur any errors
if(!query.first())
return false;
query.bindValue(":bufferid", bufferId.toInt());
query.exec();
- watchQuery(&query);
+ watchQuery(query);
if(!query.first())
return false;
return NetworkId();
}
+QList<NetworkId> SqliteStorage::connectedNetworks(UserId user) {
+ QList<NetworkId> connectedNets;
+ QSqlQuery query(logDb());
+ query.prepare(queryString("select_connected_networks"));
+ query.bindValue(":userid", user.toInt());
+ query.exec();
+ watchQuery(query);
+
+ while(query.next()) {
+ connectedNets << query.value(0).toInt();
+ }
+
+ return connectedNets;
+}
+
+void SqliteStorage::setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected) {
+ QSqlQuery query(logDb());
+ query.prepare(queryString("update_network_connected"));
+ query.bindValue(":userid", user.toInt());
+ query.bindValue(":networkid", networkId.toInt());
+ query.bindValue(":connected", isConnected ? 1 : 0);
+ query.exec();
+ watchQuery(query);
+}
+
+QHash<QString, QString> SqliteStorage::persistentChannels(UserId user, const NetworkId &networkId) {
+ QHash<QString, QString> persistentChans;
+ QSqlQuery query(logDb());
+ query.prepare(queryString("select_persistent_channels"));
+ query.bindValue(":userid", user.toInt());
+ query.bindValue(":networkid", networkId.toInt());
+ query.exec();
+ watchQuery(query);
+
+ while(query.next()) {
+ persistentChans[query.value(0).toString()] = query.value(1).toString();
+ }
+
+ return persistentChans;
+}
+
+void SqliteStorage::setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined) {
+ QSqlQuery query(logDb());
+ query.prepare(queryString("update_buffer_persistent_channel"));
+ query.bindValue(":userid", user.toInt());
+ query.bindValue(":networkId", networkId.toInt());
+ query.bindValue(":buffercname", channel.toLower());
+ query.bindValue(":joined", isJoined ? 1 : 0);
+ query.exec();
+ watchQuery(query);
+}
+
+void SqliteStorage::setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key) {
+ QSqlQuery query(logDb());
+ query.prepare(queryString("update_buffer_set_channel_key"));
+ query.bindValue(":userid", user.toInt());
+ query.bindValue(":networkId", networkId.toInt());
+ query.bindValue(":buffercname", channel.toLower());
+ query.bindValue(":key", key);
+ query.exec();
+ watchQuery(query);
+}
+
+
void SqliteStorage::createBuffer(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer) {
- QSqlQuery *query = cachedQuery("insert_buffer");
- query->bindValue(":userid", user.toInt());
- query->bindValue(":networkid", networkId.toInt());
- query->bindValue(":buffertype", (int)type);
- query->bindValue(":buffername", buffer);
- query->bindValue(":buffercname", buffer.toLower());
- query->exec();
+ // QSqlQuery &query = cachedQuery("insert_buffer");
+ QSqlQuery query(logDb());
+ query.prepare(queryString("insert_buffer"));
+ query.bindValue(":userid", user.toInt());
+ query.bindValue(":networkid", networkId.toInt());
+ query.bindValue(":buffertype", (int)type);
+ query.bindValue(":buffername", buffer);
+ query.bindValue(":buffercname", buffer.toLower());
+ query.exec();
watchQuery(query);
}
BufferInfo SqliteStorage::getBufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer) {
- QSqlQuery *query = cachedQuery("select_bufferByName");
- query->bindValue(":networkid", networkId.toInt());
- query->bindValue(":userid", user.toInt());
- query->bindValue(":buffercname", buffer.toLower());
- query->exec();
+ // QSqlQuery &query = cachedQuery("select_bufferByName");
+ QSqlQuery query(logDb());
+ query.prepare(queryString("select_bufferByName"));
+ query.bindValue(":networkid", networkId.toInt());
+ query.bindValue(":userid", user.toInt());
+ query.bindValue(":buffercname", buffer.toLower());
+ query.exec();
- if(!query->first()) {
+ if(!query.first()) {
createBuffer(user, networkId, type, buffer);
- query->exec();
- if(!query->first()) {
+ query.exec();
+ if(!query.first()) {
watchQuery(query);
qWarning() << "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();
+ BufferInfo bufferInfo = BufferInfo(query.value(0).toInt(), networkId, (BufferInfo::Type)query.value(1).toInt(), 0, buffer);
+ if(query.next()) {
+ qCritical() << "SqliteStorage::getBufferInfo(): received more then one Buffer!";
+ qCritical() << " Query:" << query.lastQuery();
+ qCritical() << " bound Values:";
+ QList<QVariant> list = query.boundValues().values();
+ for (int i = 0; i < list.size(); ++i)
+ qCritical() << i << ":" << list.at(i).toString().toAscii().data();
Q_ASSERT(false);
}
query.bindValue(":userid", user.toInt());
query.bindValue(":bufferid", bufferId.toInt());
query.exec();
- if(!watchQuery(&query))
+ if(!watchQuery(query))
return BufferInfo();
if(!query.first())
return bufferInfo;
}
-QList<BufferInfo> SqliteStorage::requestBuffers(UserId user, QDateTime since) {
- uint time = 0;
- if(since.isValid())
- time = since.toTime_t();
-
+QList<BufferInfo> SqliteStorage::requestBuffers(UserId user) {
QList<BufferInfo> bufferlist;
QSqlQuery query(logDb());
query.prepare(queryString("select_buffers"));
query.bindValue(":userid", user.toInt());
- query.bindValue(":time", time);
query.exec();
- watchQuery(&query);
+ watchQuery(query);
while(query.next()) {
bufferlist << BufferInfo(query.value(0).toInt(), query.value(1).toInt(), (BufferInfo::Type)query.value(2).toInt(), query.value(3).toInt(), query.value(4).toString());
}
return bufferlist;
}
+QList<BufferId> SqliteStorage::requestBufferIdsForNetwork(UserId user, NetworkId networkId) {
+ QList<BufferId> 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;
delBacklogQuery.prepare(queryString("delete_backlog_for_buffer"));
delBacklogQuery.bindValue(":bufferid", bufferId.toInt());
delBacklogQuery.exec();
- if(!watchQuery(&delBacklogQuery))
+ if(!watchQuery(delBacklogQuery))
return false;
QSqlQuery delBufferQuery(logDb());
delBufferQuery.prepare(queryString("delete_buffer_for_bufferid"));
delBufferQuery.bindValue(":bufferid", bufferId.toInt());
delBufferQuery.exec();
- if(!watchQuery(&delBufferQuery))
+ if(!watchQuery(delBufferQuery))
return false;
return true;
existsQuery.bindValue(":userid", user.toInt());
existsQuery.bindValue(":buffercname", oldName.toLower());
existsQuery.exec();
- if(!watchQuery(&existsQuery))
+ if(!watchQuery(existsQuery))
return false;
if(!existsQuery.first())
existsQuery.bindValue(":userid", user.toInt());
existsQuery.bindValue(":buffercname", newName.toLower());
existsQuery.exec();
- if(!watchQuery(&existsQuery))
+ if(!watchQuery(existsQuery))
return false;
if(existsQuery.first())
renameBufferQuery.bindValue(":buffercname", newName.toLower());
renameBufferQuery.bindValue(":bufferid", bufferid);
renameBufferQuery.exec();
- if(watchQuery(&existsQuery))
+ if(watchQuery(existsQuery))
return BufferId(bufferid);
else
return BufferId();
}
-void SqliteStorage::setBufferLastSeen(UserId user, const BufferId &bufferId, const QDateTime &seenDate) {
- QSqlQuery *query = cachedQuery("update_buffer_lastseen");
- query->bindValue(":userid", user.toInt());
- query->bindValue(":bufferid", bufferId.toInt());
- query->bindValue(":lastseen", seenDate.toTime_t());
- query->exec();
+void SqliteStorage::setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) {
+ // QSqlQuery &query = cachedQuery("update_buffer_lastseen");
+ QSqlQuery query(logDb());
+ query.prepare(queryString("update_buffer_lastseen"));
+
+ query.bindValue(":userid", user.toInt());
+ query.bindValue(":bufferid", bufferId.toInt());
+ query.bindValue(":lastseenmsgid", msgId.toInt());
+ query.exec();
watchQuery(query);
}
-QHash<BufferId, QDateTime> SqliteStorage::bufferLastSeenDates(UserId user) {
- QHash<BufferId, QDateTime> lastSeenHash;
+QHash<BufferId, MsgId> SqliteStorage::bufferLastSeenMsgIds(UserId user) {
+ QHash<BufferId, MsgId> lastSeenHash;
QSqlQuery query(logDb());
- query.prepare(queryString("select_buffer_lastseen_dates"));
+ query.prepare(queryString("select_buffer_lastseen_messages"));
query.bindValue(":userid", user.toInt());
query.exec();
- if(!watchQuery(&query))
+ if(!watchQuery(query))
return lastSeenHash;
while(query.next()) {
- lastSeenHash[query.value(0).toInt()] = QDateTime::fromTime_t(query.value(1).toUInt());
+ lastSeenHash[query.value(0).toInt()] = query.value(1).toInt();
}
return lastSeenHash;
}
MsgId SqliteStorage::logMessage(Message msg) {
- QSqlQuery *logMessageQuery = cachedQuery("insert_message");
- 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(":sender", msg.sender());
- logMessageQuery->bindValue(":message", msg.text());
- logMessageQuery->exec();
+ // QSqlQuery &logMessageQuery = cachedQuery("insert_message");
+ QSqlQuery logMessageQuery(logDb());
+ logMessageQuery.prepare(queryString("insert_message"));
+
+ logMessageQuery.bindValue(":time", msg.timestamp().toTime_t());
+ logMessageQuery.bindValue(":bufferid", msg.bufferInfo().bufferId().toInt());
+ logMessageQuery.bindValue(":type", msg.type());
+ logMessageQuery.bindValue(":flags", (int)msg.flags());
+ logMessageQuery.bindValue(":sender", msg.sender());
+ logMessageQuery.bindValue(":message", msg.contents());
+ logMessageQuery.exec();
- if(logMessageQuery->lastError().isValid()) {
+ if(logMessageQuery.lastError().isValid()) {
// constraint violation - must be NOT NULL constraint - probably the sender is missing...
- if(logMessageQuery->lastError().number() == 19) {
- QSqlQuery *addSenderQuery = cachedQuery("insert_sender");
- addSenderQuery->bindValue(":sender", msg.sender());
- addSenderQuery->exec();
+ if(logMessageQuery.lastError().number() == 19) {
+ // QSqlQuery &addSenderQuery = cachedQuery("insert_sender");
+ QSqlQuery addSenderQuery(logDb());
+ addSenderQuery.prepare(queryString("insert_sender"));
+ addSenderQuery.bindValue(":sender", msg.sender());
+ addSenderQuery.exec();
watchQuery(addSenderQuery);
- logMessageQuery->exec();
+ logMessageQuery.exec();
if(!watchQuery(logMessageQuery))
return 0;
} else {
}
}
- MsgId msgId = logMessageQuery->lastInsertId().toInt();
+ MsgId msgId = logMessageQuery.lastInsertId().toInt();
Q_ASSERT(msgId.isValid());
return msgId;
}
-QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, int lastmsgs, int offset) {
+QList<Message> SqliteStorage::requestMsgs(UserId user, BufferId bufferId, int lastmsgs, int offset) {
QList<Message> messagelist;
- // we have to determine the real offset first
- QSqlQuery *offsetQuery = cachedQuery("select_messagesOffset");
- offsetQuery->bindValue(":bufferid", buffer.bufferId().toInt());
- offsetQuery->bindValue(":messageid", offset);
- offsetQuery->exec();
- offsetQuery->first();
- offset = offsetQuery->value(0).toInt();
+
+ BufferInfo bufferInfo = getBufferInfo(user, bufferId);
+ if(!bufferInfo.isValid())
+ return messagelist;
+
+ if(offset == -1) {
+ offset = 0;
+ } else {
+ // we have to determine the real offset first
+ // QSqlQuery &offsetQuery = cachedQuery("select_messagesOffset");
+ QSqlQuery offsetQuery(logDb());
+ offsetQuery.prepare(queryString("select_messagesOffset"));
+
+ offsetQuery.bindValue(":bufferid", bufferId.toInt());
+ offsetQuery.bindValue(":messageid", offset);
+ offsetQuery.exec();
+ offsetQuery.first();
+ offset = offsetQuery.value(0).toInt();
+ }
// now let's select the messages
- QSqlQuery *msgQuery = cachedQuery("select_messages");
- msgQuery->bindValue(":bufferid", buffer.bufferId().toInt());
- msgQuery->bindValue(":limit", lastmsgs);
- msgQuery->bindValue(":offset", offset);
- msgQuery->exec();
+ // QSqlQuery &msgQuery = cachedQuery("select_messages");
+ QSqlQuery msgQuery(logDb());
+ msgQuery.prepare(queryString("select_messages"));
+
+ msgQuery.bindValue(":bufferid", bufferId.toInt());
+ msgQuery.bindValue(":limit", lastmsgs);
+ msgQuery.bindValue(":offset", offset);
+ msgQuery.exec();
watchQuery(msgQuery);
- while(msgQuery->next()) {
- Message msg(QDateTime::fromTime_t(msgQuery->value(1).toInt()),
- buffer,
- (Message::Type)msgQuery->value(2).toUInt(),
- msgQuery->value(5).toString(),
- msgQuery->value(4).toString(),
- msgQuery->value(3).toUInt());
- msg.setMsgId(msgQuery->value(0).toInt());
+ while(msgQuery.next()) {
+ Message msg(QDateTime::fromTime_t(msgQuery.value(1).toInt()),
+ bufferInfo,
+ (Message::Type)msgQuery.value(2).toUInt(),
+ msgQuery.value(5).toString(),
+ msgQuery.value(4).toString(),
+ (Message::Flags)msgQuery.value(3).toUInt());
+ msg.setMsgId(msgQuery.value(0).toInt());
messagelist << msg;
}
return messagelist;
}
-QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, QDateTime since, int offset) {
+QList<Message> SqliteStorage::requestMsgs(UserId user, BufferId bufferId, QDateTime since, int offset) {
QList<Message> messagelist;
+
+ BufferInfo bufferInfo = getBufferInfo(user, bufferId);
+ if(!bufferInfo.isValid())
+ return messagelist;
+
// we have to determine the real offset first
- QSqlQuery *offsetQuery = cachedQuery("select_messagesSinceOffset");
- offsetQuery->bindValue(":bufferid", buffer.bufferId().toInt());
- offsetQuery->bindValue(":since", since.toTime_t());
- offsetQuery->exec();
- offsetQuery->first();
- offset = offsetQuery->value(0).toInt();
+ // QSqlQuery &offsetQuery = cachedQuery("select_messagesSinceOffset");
+ QSqlQuery offsetQuery(logDb());
+ offsetQuery.prepare(queryString("select_messagesSinceOffset"));
+
+ offsetQuery.bindValue(":bufferid", bufferId.toInt());
+ offsetQuery.bindValue(":since", since.toTime_t());
+ offsetQuery.exec();
+ offsetQuery.first();
+ offset = offsetQuery.value(0).toInt();
// now let's select the messages
- QSqlQuery *msgQuery = cachedQuery("select_messagesSince");
- msgQuery->bindValue(":bufferid", buffer.bufferId().toInt());
- msgQuery->bindValue(":since", since.toTime_t());
- msgQuery->bindValue(":offset", offset);
- msgQuery->exec();
+ // QSqlQuery &msgQuery = cachedQuery("select_messagesSince");
+ QSqlQuery msgQuery(logDb());
+ msgQuery.prepare(queryString("select_messagesSince"));
+ msgQuery.bindValue(":bufferid", bufferId.toInt());
+ msgQuery.bindValue(":since", since.toTime_t());
+ msgQuery.bindValue(":offset", offset);
+ msgQuery.exec();
watchQuery(msgQuery);
- while(msgQuery->next()) {
- Message msg(QDateTime::fromTime_t(msgQuery->value(1).toInt()),
- buffer,
- (Message::Type)msgQuery->value(2).toUInt(),
- msgQuery->value(5).toString(),
- msgQuery->value(4).toString(),
- msgQuery->value(3).toUInt());
- msg.setMsgId(msgQuery->value(0).toInt());
+ while(msgQuery.next()) {
+ Message msg(QDateTime::fromTime_t(msgQuery.value(1).toInt()),
+ bufferInfo,
+ (Message::Type)msgQuery.value(2).toUInt(),
+ msgQuery.value(5).toString(),
+ msgQuery.value(4).toString(),
+ (Message::Flags)msgQuery.value(3).toUInt());
+ msg.setMsgId(msgQuery.value(0).toInt());
messagelist << msg;
}
}
-QList<Message> SqliteStorage::requestMsgRange(BufferInfo buffer, int first, int last) {
+QList<Message> SqliteStorage::requestMsgRange(UserId user, BufferId bufferId, int first, int last) {
QList<Message> messagelist;
- QSqlQuery *rangeQuery = cachedQuery("select_messageRange");
- rangeQuery->bindValue(":bufferid", buffer.bufferId().toInt());
- rangeQuery->bindValue(":firstmsg", first);
- rangeQuery->bindValue(":lastmsg", last);
- rangeQuery->exec();
+
+ BufferInfo bufferInfo = getBufferInfo(user, bufferId);
+ if(!bufferInfo.isValid())
+ return messagelist;
+
+ // QSqlQuery &rangeQuery = cachedQuery("select_messageRange");
+ QSqlQuery rangeQuery(logDb());
+ rangeQuery.prepare(queryString("select_messageRange"));
+ rangeQuery.bindValue(":bufferid", bufferId.toInt());
+ rangeQuery.bindValue(":firstmsg", first);
+ rangeQuery.bindValue(":lastmsg", last);
+ rangeQuery.exec();
watchQuery(rangeQuery);
- while(rangeQuery->next()) {
- Message msg(QDateTime::fromTime_t(rangeQuery->value(1).toInt()),
- buffer,
- (Message::Type)rangeQuery->value(2).toUInt(),
- rangeQuery->value(5).toString(),
- rangeQuery->value(4).toString(),
- rangeQuery->value(3).toUInt());
- msg.setMsgId(rangeQuery->value(0).toInt());
+ while(rangeQuery.next()) {
+ Message msg(QDateTime::fromTime_t(rangeQuery.value(1).toInt()),
+ bufferInfo,
+ (Message::Type)rangeQuery.value(2).toUInt(),
+ rangeQuery.value(5).toString(),
+ rangeQuery.value(4).toString(),
+ (Message::Flags)rangeQuery.value(3).toUInt());
+ msg.setMsgId(rangeQuery.value(0).toInt());
messagelist << msg;
}
}
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";
}
-