X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.cpp;h=3d26a9b4e26e9cf7f979f8f2428e4e06a1ede150;hp=dda91b4d2621db068bdd776d5ab0728d77c89112;hb=d064f62ec2f316f17c3aac3c31184376380ef098;hpb=47b574c28983254b6679191f76ddb36fe7da7632

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index dda91b4d..3d26a9b4 100644
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -109,6 +109,7 @@ SqliteStorage::SqliteStorage() {
 }
 
 SqliteStorage::~SqliteStorage() {
+  //logDb.close();
   delete logMessageQuery;
   delete addSenderQuery;
   delete getLastMessageIdQuery;
@@ -186,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();
 
@@ -212,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();
 
@@ -223,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);
@@ -232,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();
 
@@ -271,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);
@@ -293,8 +293,23 @@ void SqliteStorage::createBuffer(UserId user, QString network, QString buffer) {
   }
 }
 
-BufferId SqliteStorage::getBufferId(UserId user, QString network, QString buffer) {
+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;
+}
+
+BufferId SqliteStorage::getBufferId(UserId user, const QString &network, const QString &buffer) {
   BufferId bufferid;
+  uint networkId = getNetworkId(user, network);
   getBufferIdQuery->bindValue(":networkname", network);
   getBufferIdQuery->bindValue(":userid", user);
   getBufferIdQuery->bindValue(":buffername", buffer);
@@ -304,11 +319,11 @@ BufferId SqliteStorage::getBufferId(UserId user, QString network, QString buffer
     createBuffer(user, network, buffer);
     getBufferIdQuery->exec();
     if(getBufferIdQuery->first()) {
-      bufferid = BufferId(getBufferIdQuery->value(0).toUInt(), network, buffer);
+      bufferid = BufferId(getBufferIdQuery->value(0).toUInt(), networkId, 0, network, buffer);
       emit bufferIdUpdated(bufferid);
     }
   } else {
-    bufferid = BufferId(getBufferIdQuery->value(0).toUInt(), network, buffer);
+    bufferid = BufferId(getBufferIdQuery->value(0).toUInt(), networkId, 0, network, buffer);
   }
 
   Q_ASSERT(!getBufferIdQuery->next());
@@ -333,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 << BufferId(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());
@@ -359,16 +374,16 @@ 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;
   }
@@ -396,7 +411,7 @@ 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;
@@ -426,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;
   }
 
@@ -448,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;
   }