X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.h;h=ca56cabf1380b29c3275af8012f172e488e84f33;hb=99fb0a0f1f66ae5117fa64cc204256e5b3a19499;hp=a4f5fec08ca7d18f5409cf1a9859440c714153a6;hpb=c7ad7451b1e899ba0de2ded9ac08359dff5cca61;p=quassel.git

diff --git a/src/core/sqlitestorage.h b/src/core/sqlitestorage.h
index a4f5fec0..ca56cabf 100644
--- a/src/core/sqlitestorage.h
+++ b/src/core/sqlitestorage.h
@@ -23,7 +23,6 @@
 
 #include <QCryptographicHash>
 
-#include "global.h"
 #include "storage.h"
 
 class QSqlQuery;
@@ -35,12 +34,12 @@ class SqliteStorage : public Storage {
     SqliteStorage();
     virtual ~SqliteStorage();
 
-    static void init();
-
     /* General */
 
     static bool isAvailable();
     static QString displayName();
+    virtual bool setup(const QVariantMap &settings = QVariantMap());
+    virtual bool init(const QVariantMap &settings = QVariantMap());
 
     // TODO: Add functions for configuring the backlog handling, i.e. defining auto-cleanup settings etc
 
@@ -56,32 +55,29 @@ class SqliteStorage : public Storage {
     virtual uint getNetworkId(UserId user, const QString &network);
 
     /* Buffer handling */
-    virtual BufferId getBufferId(UserId user, const QString &network, const QString &buffer = "");
-    virtual QList<BufferId> requestBuffers(UserId user, QDateTime since = QDateTime());
+    virtual BufferInfo getBufferInfo(UserId user, const QString &network, const QString &buffer = "");
+    virtual QList<BufferInfo> requestBuffers(UserId user, QDateTime since = QDateTime());
 
     /* Message handling */
 
     virtual MsgId logMessage(Message msg);
-    virtual QList<Message> requestMsgs(BufferId buffer, int lastmsgs = -1, int offset = -1);
-    virtual QList<Message> requestMsgs(BufferId buffer, QDateTime since, int offset = -1);
-    virtual QList<Message> requestMsgRange(BufferId buffer, int first, int last);
-
-  public slots:
-    //! This is just for importing the old file-based backlog */
-    /** This slot needs to be implemented in the storage backends.
-     *  It should first prepare (delete?) the database, then call initBackLogOld(UserId id).
-     *  If the importing was successful, backLogEnabledOld will be true afterwards.
-     */
-    void importOldBacklog();
+    virtual QList<Message> requestMsgs(BufferInfo buffer, int lastmsgs = -1, int offset = -1);
+    virtual QList<Message> requestMsgs(BufferInfo buffer, QDateTime since, int offset = -1);
+    virtual QList<Message> requestMsgRange(BufferInfo buffer, int first, int last);
 
   signals:
-    void bufferIdUpdated(BufferId);
+    void bufferInfoUpdated(BufferInfo);
 
   protected:
 
   private:
-    void initDb();
+    static QString backlogFile(bool createPath = false);
+    
     void createBuffer(UserId user, const QString &network, const QString &buffer);
+    bool watchQuery(QSqlQuery *query);
+
+    QSqlDatabase logDb;
+
     QSqlQuery *logMessageQuery;
     QSqlQuery *addSenderQuery;
     QSqlQuery *getLastMessageIdQuery;
@@ -92,8 +88,7 @@ class SqliteStorage : public Storage {
     QSqlQuery *requestMsgRangeQuery;
     QSqlQuery *createNetworkQuery;
     QSqlQuery *createBufferQuery;
-    QSqlQuery *getBufferIdQuery;
+    QSqlQuery *getBufferInfoQuery;
 };
 
-
 #endif