X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.h;h=9df9be340a328ede5e9ffc6df48263f97f168e27;hp=b661aedaa4cf23921baa49b5b33093eb48c01929;hb=26b9300ccab24e526a9f43bef95a2a70f59161df;hpb=8699dd758516d0ded076811e8ea656adc95e69d0

diff --git a/src/core/sqlitestorage.h b/src/core/sqlitestorage.h
index b661aeda..9df9be34 100644
--- a/src/core/sqlitestorage.h
+++ b/src/core/sqlitestorage.h
@@ -18,78 +18,87 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _SQLITESTORAGE_H_
-#define _SQLITESTORAGE_H_
+#ifndef SQLITESTORAGE_H
+#define SQLITESTORAGE_H
 
-#include <QCryptographicHash>
+#include "abstractsqlstorage.h"
 
-#include "storage.h"
+#include <QSqlDatabase>
 
 class QSqlQuery;
 
-class SqliteStorage : public Storage {
+class SqliteStorage : public AbstractSqlStorage {
   Q_OBJECT
 
-  public:
-    SqliteStorage();
-    virtual ~SqliteStorage();
-
-  public slots:
-    /* 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
-
-    /* User handling */
-
-    virtual UserId addUser(const QString &user, const QString &password);
-    virtual void updateUser(UserId user, const QString &password);
-    virtual void renameUser(UserId user, const QString &newName);
-    virtual UserId validateUser(const QString &user, const QString &password);
-    virtual void delUser(UserId user);
-
-    /* Network handling */
-    virtual uint getNetworkId(UserId user, const QString &network);
-
-    /* Buffer handling */
-    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(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 bufferInfoUpdated(BufferInfo);
-
-  protected:
-
-  private:
-    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;
-    QSqlQuery *requestMsgsQuery;
-    QSqlQuery *requestMsgsOffsetQuery;
-    QSqlQuery *requestMsgsSinceQuery;
-    QSqlQuery *requestMsgsSinceOffsetQuery;
-    QSqlQuery *requestMsgRangeQuery;
-    QSqlQuery *createNetworkQuery;
-    QSqlQuery *createBufferQuery;
-    QSqlQuery *getBufferInfoQuery;
+public:
+  SqliteStorage(QObject *parent = 0);
+  virtual ~SqliteStorage();
+
+public slots:
+  /* General */
+  
+  bool isAvailable() const;
+  QString displayName() const;
+  QString description() const;
+
+  // TODO: Add functions for configuring the backlog handling, i.e. defining auto-cleanup settings etc
+  
+  /* User handling */
+  
+  virtual UserId addUser(const QString &user, const QString &password);
+  virtual void updateUser(UserId user, const QString &password);
+  virtual void renameUser(UserId user, const QString &newName);
+  virtual UserId validateUser(const QString &user, const QString &password);
+  virtual UserId internalUser();
+  virtual void delUser(UserId user);
+  virtual void setUserSetting(UserId userId, const QString &settingName, const QVariant &data);
+  virtual QVariant getUserSetting(UserId userId, const QString &settingName, const QVariant &defaultData = QVariant());
+
+  
+  /* Network handling */
+  virtual NetworkId createNetwork(UserId user, const NetworkInfo &info);
+  virtual bool updateNetwork(UserId user, const NetworkInfo &info);
+  virtual bool removeNetwork(UserId user, const NetworkId &networkId);
+  virtual QList<NetworkInfo> networks(UserId user);
+  virtual QList<NetworkId> connectedNetworks(UserId user);
+  virtual void setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected);
+
+  /* persistent channels */
+  virtual QHash<QString, QString> persistentChannels(UserId user, const NetworkId &networkId);
+  virtual void setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined);
+  virtual void setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key);
+  
+  /* Buffer handling */
+  virtual BufferInfo getBufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer = "");
+  virtual BufferInfo getBufferInfo(UserId user, const BufferId &bufferId);
+  virtual QList<BufferInfo> requestBuffers(UserId user);
+  virtual QList<BufferId> requestBufferIdsForNetwork(UserId user, NetworkId networkId);
+  virtual bool removeBuffer(const UserId &user, const BufferId &bufferId);
+  virtual BufferId renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName);
+  virtual void setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId);
+  virtual QHash<BufferId, MsgId> bufferLastSeenMsgIds(UserId user);
+  
+  /* Message handling */
+  
+  virtual MsgId logMessage(Message msg);
+  virtual QList<Message> requestMsgs(UserId user, BufferId bufferId, int limit = -1, int offset = -1);
+  virtual QList<Message> requestMsgs(UserId user, BufferId bufferId, QDateTime since, int offset = -1);
+  virtual QList<Message> requestMsgRange(UserId user, BufferId bufferId, int first, int last);
+
+protected:
+  inline virtual QString driverName() { return "QSQLITE"; }
+  inline virtual QString databaseName() { return backlogFile(); }
+  virtual int installedSchemaVersion();
+  bool safeExec(QSqlQuery &query, int retryCount = 0);
+  
+private:
+  static QString backlogFile();
+  bool isValidNetwork(UserId user, const NetworkId &networkId);
+  bool isValidBuffer(const UserId &user, const BufferId &bufferId);
+  NetworkId getNetworkId(UserId user, const QString &network);
+  void createBuffer(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer);
+
+  static int _maxRetryCount;
 };
 
 #endif