X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.cpp;h=7ba61fcdbf76e7340866c0af75fed0a68b60f685;hp=86bf9881877f829ac428052c85a0b2c01437d4b1;hb=902c95728306e5ba115de84800fc8d5d239c9d62;hpb=06a03c2c69ee934aaeec83512bae2fffee83a340

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 86bf9881..7ba61fcd 100644
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -53,8 +53,8 @@ SqliteStorage::SqliteStorage() {
   createNetworkQuery = new QSqlQuery(logDb);
   createNetworkQuery->prepare("INSERT INTO network (userid, networkname) VALUES (:userid, :networkname)");
 
-  getBufferIdQuery = new QSqlQuery(logDb);
-  getBufferIdQuery->prepare("SELECT bufferid FROM buffer "
+  getBufferInfoQuery = new QSqlQuery(logDb);
+  getBufferInfoQuery->prepare("SELECT bufferid FROM buffer "
                             "JOIN network ON buffer.networkid = network.networkid "
                             "WHERE network.networkname = :networkname AND buffer.userid = :userid AND buffer.buffername = :buffername ");
 
@@ -120,7 +120,7 @@ SqliteStorage::~SqliteStorage() {
   delete requestMsgRangeQuery;
   delete createNetworkQuery;
   delete createBufferQuery;
-  delete getBufferIdQuery;
+  delete getBufferInfoQuery;
   logDb.close();
 }
 
@@ -187,11 +187,10 @@ bool SqliteStorage::isAvailable() {
 }
 
 QString SqliteStorage::displayName() {
-  // I think the class name is a good start here
   return QString("SqliteStorage");
 }
 
-UserId SqliteStorage::addUser(QString user, QString password) {
+UserId SqliteStorage::addUser(const QString &user, const QString &password) {
   QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
   cryptopass = cryptopass.toHex();
 
@@ -213,7 +212,7 @@ UserId SqliteStorage::addUser(QString user, QString password) {
   return uid;
 }
 
-void SqliteStorage::updateUser(UserId user, QString password) {
+void SqliteStorage::updateUser(UserId user, const QString &password) {
   QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
   cryptopass = cryptopass.toHex();
 
@@ -224,7 +223,7 @@ void SqliteStorage::updateUser(UserId user, QString password) {
   query.exec();
 }
 
-void SqliteStorage::renameUser(UserId user, QString newName) {
+void SqliteStorage::renameUser(UserId user, const QString &newName) {
   QSqlQuery query(logDb);
   query.prepare("UPDATE quasseluser SET username = :username WHERE userid = :userid");
   query.bindValue(":userid", user);
@@ -233,7 +232,7 @@ void SqliteStorage::renameUser(UserId user, QString newName) {
   emit userRenamed(user, newName);
 }
 
-UserId SqliteStorage::validateUser(QString user, QString password) {
+UserId SqliteStorage::validateUser(const QString &user, const QString &password) {
   QByteArray cryptopass = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Sha1);
   cryptopass = cryptopass.toHex();
 
@@ -272,7 +271,7 @@ void SqliteStorage::delUser(UserId user) {
   emit userRemoved(user);
 }
 
-void SqliteStorage::createBuffer(UserId user, QString network, QString buffer) {
+void SqliteStorage::createBuffer(UserId user, const QString &network, const QString &buffer) {
   createBufferQuery->bindValue(":userid", user);
   createBufferQuery->bindValue(":networkname", network);
   createBufferQuery->bindValue(":buffername", buffer);
@@ -294,31 +293,46 @@ void SqliteStorage::createBuffer(UserId user, QString network, QString buffer) {
   }
 }
 
-BufferId SqliteStorage::getBufferId(UserId user, QString network, QString buffer) {
-  BufferId bufferid;
-  getBufferIdQuery->bindValue(":networkname", network);
-  getBufferIdQuery->bindValue(":userid", user);
-  getBufferIdQuery->bindValue(":buffername", buffer);
-  getBufferIdQuery->exec();
+uint SqliteStorage::getNetworkId(UserId user, const QString &network) {
+  QSqlQuery query(logDb);
+  query.prepare("SELECT networkid FROM network "
+		"WHERE userid = :userid AND networkname = :networkname");
+  query.bindValue(":userid", user);
+  query.bindValue(":networkname", network);
+  query.exec();
+  
+  if(query.first())
+    return query.value(0).toUInt();
+  else
+    return 0;
+}
+
+BufferInfo SqliteStorage::getBufferInfo(UserId user, const QString &network, const QString &buffer) {
+  BufferInfo bufferid;
+  uint networkId = getNetworkId(user, network);
+  getBufferInfoQuery->bindValue(":networkname", network);
+  getBufferInfoQuery->bindValue(":userid", user);
+  getBufferInfoQuery->bindValue(":buffername", buffer);
+  getBufferInfoQuery->exec();
 
-  if(!getBufferIdQuery->first()) {
+  if(!getBufferInfoQuery->first()) {
     createBuffer(user, network, buffer);
-    getBufferIdQuery->exec();
-    if(getBufferIdQuery->first()) {
-      bufferid = BufferId(getBufferIdQuery->value(0).toUInt(), network, buffer);
-      emit bufferIdUpdated(bufferid);
+    getBufferInfoQuery->exec();
+    if(getBufferInfoQuery->first()) {
+      bufferid = BufferInfo(getBufferInfoQuery->value(0).toUInt(), networkId, 0, network, buffer);
+      emit bufferInfoUpdated(bufferid);
     }
   } else {
-    bufferid = BufferId(getBufferIdQuery->value(0).toUInt(), network, buffer);
+    bufferid = BufferInfo(getBufferInfoQuery->value(0).toUInt(), networkId, 0, network, buffer);
   }
 
-  Q_ASSERT(!getBufferIdQuery->next());
+  Q_ASSERT(!getBufferInfoQuery->next());
 
   return bufferid;
 }
 
-QList<BufferId> SqliteStorage::requestBuffers(UserId user, QDateTime since) {
-  QList<BufferId> bufferlist;
+QList<BufferInfo> SqliteStorage::requestBuffers(UserId user, QDateTime since) {
+  QList<BufferInfo> bufferlist;
   QSqlQuery query(logDb);
   query.prepare("SELECT DISTINCT buffer.bufferid, networkname, buffername FROM buffer "
                 "JOIN network ON buffer.networkid = network.networkid "
@@ -334,24 +348,24 @@ QList<BufferId> SqliteStorage::requestBuffers(UserId user, QDateTime since) {
   query.exec();
 
   while(query.next()) {
-    bufferlist << BufferId(query.value(0).toUInt(), query.value(1).toString(), query.value(2).toString());
+    bufferlist << BufferInfo(query.value(0).toUInt(), getNetworkId(user, query.value(1).toString()), 0, query.value(1).toString(), query.value(2).toString());
   }
   return bufferlist;
 }
 
 MsgId SqliteStorage::logMessage(Message msg) {
-  logMessageQuery->bindValue(":time", msg.timeStamp.toTime_t());
-  logMessageQuery->bindValue(":bufferid", msg.buffer.uid());
-  logMessageQuery->bindValue(":type", msg.type);
-  logMessageQuery->bindValue(":flags", msg.flags);
-  logMessageQuery->bindValue(":sender", msg.sender);
-  logMessageQuery->bindValue(":message", msg.text);
+  logMessageQuery->bindValue(":time", msg.timeStamp().toTime_t());
+  logMessageQuery->bindValue(":bufferid", msg.buffer().uid());
+  logMessageQuery->bindValue(":type", msg.type());
+  logMessageQuery->bindValue(":flags", msg.flags());
+  logMessageQuery->bindValue(":sender", msg.sender());
+  logMessageQuery->bindValue(":message", msg.text());
   logMessageQuery->exec();
   
   if(logMessageQuery->lastError().isValid()) {
     // constraint violation - must be NOT NULL constraint - probably the sender is missing...
     if(logMessageQuery->lastError().number() == 19) { 
-      addSenderQuery->bindValue(":sender", msg.sender);
+      addSenderQuery->bindValue(":sender", msg.sender());
       addSenderQuery->exec();
       logMessageQuery->exec();
       Q_ASSERT(!logMessageQuery->lastError().isValid());
@@ -360,22 +374,22 @@ MsgId SqliteStorage::logMessage(Message msg) {
     }
   }
 
-  getLastMessageIdQuery->bindValue(":time", msg.timeStamp.toTime_t());
-  getLastMessageIdQuery->bindValue(":bufferid", msg.buffer.uid());
-  getLastMessageIdQuery->bindValue(":type", msg.type);
-  getLastMessageIdQuery->bindValue(":sender", msg.sender);
+  getLastMessageIdQuery->bindValue(":time", msg.timeStamp().toTime_t());
+  getLastMessageIdQuery->bindValue(":bufferid", msg.buffer().uid());
+  getLastMessageIdQuery->bindValue(":type", msg.type());
+  getLastMessageIdQuery->bindValue(":sender", msg.sender());
   getLastMessageIdQuery->exec();
 
   if(getLastMessageIdQuery->first()) {
     return getLastMessageIdQuery->value(0).toUInt();
   } else { // somethin went wrong... :(
-    qDebug() << getLastMessageIdQuery->lastQuery() << "time/bufferid/type/sender:" << msg.timeStamp.toTime_t() << msg.buffer.uid() << msg.type << msg.sender;
+    qDebug() << getLastMessageIdQuery->lastQuery() << "time/bufferid/type/sender:" << msg.timeStamp().toTime_t() << msg.buffer().uid() << msg.type() << msg.sender();
     Q_ASSERT(false);
     return 0;
   }
 }
 
-QList<Message> SqliteStorage::requestMsgs(BufferId buffer, int lastmsgs, int offset) {
+QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, int lastmsgs, int offset) {
   QList<Message> messagelist;
   // we have to determine the real offset first
   requestMsgsOffsetQuery->bindValue(":bufferid", buffer.uid());
@@ -397,14 +411,14 @@ QList<Message> SqliteStorage::requestMsgs(BufferId buffer, int lastmsgs, int off
                 requestMsgsQuery->value(5).toString(),
                 requestMsgsQuery->value(4).toString(),
                 requestMsgsQuery->value(3).toUInt());
-    msg.msgId = requestMsgsQuery->value(0).toUInt();
+    msg.setMsgId(requestMsgsQuery->value(0).toUInt());
     messagelist << msg;
   }
   return messagelist;
 }
 
 
-QList<Message> SqliteStorage::requestMsgs(BufferId buffer, QDateTime since, int offset) {
+QList<Message> SqliteStorage::requestMsgs(BufferInfo buffer, QDateTime since, int offset) {
   QList<Message> messagelist;
   // we have to determine the real offset first
   requestMsgsSinceOffsetQuery->bindValue(":bufferid", buffer.uid());
@@ -427,7 +441,7 @@ QList<Message> SqliteStorage::requestMsgs(BufferId buffer, QDateTime since, int
                 requestMsgsSinceQuery->value(5).toString(),
                 requestMsgsSinceQuery->value(4).toString(),
                 requestMsgsSinceQuery->value(3).toUInt());
-    msg.msgId = requestMsgsSinceQuery->value(0).toUInt();
+    msg.setMsgId(requestMsgsSinceQuery->value(0).toUInt());
     messagelist << msg;
   }
 
@@ -435,7 +449,7 @@ QList<Message> SqliteStorage::requestMsgs(BufferId buffer, QDateTime since, int
 }
 
 
-QList<Message> SqliteStorage::requestMsgRange(BufferId buffer, int first, int last) {
+QList<Message> SqliteStorage::requestMsgRange(BufferInfo buffer, int first, int last) {
   QList<Message> messagelist;
   requestMsgRangeQuery->bindValue(":bufferid", buffer.uid());
   requestMsgRangeQuery->bindValue(":bufferid2", buffer.uid());
@@ -449,7 +463,7 @@ QList<Message> SqliteStorage::requestMsgRange(BufferId buffer, int first, int la
                 requestMsgRangeQuery->value(5).toString(),
                 requestMsgRangeQuery->value(4).toString(),
                 requestMsgRangeQuery->value(3).toUInt());
-    msg.msgId = requestMsgRangeQuery->value(0).toUInt();
+    msg.setMsgId(requestMsgRangeQuery->value(0).toUInt());
     messagelist << msg;
   }