X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.h;h=e9b2f14da7084749ad66c4e9397a5a0b02aadf90;hp=bee848bc62f4662adc8b493cb1fb6412f10ff9e7;hb=2bb25e1fbdb848b76790fe060094fb62f28e65a1;hpb=d3ea803d8977692f95bbe31fbaba3686fc2ce5a9

diff --git a/src/core/sqlitestorage.h b/src/core/sqlitestorage.h
index bee848bc..e9b2f14d 100644
--- a/src/core/sqlitestorage.h
+++ b/src/core/sqlitestorage.h
@@ -36,48 +36,68 @@ public:
 
 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, const QString &buffer = "");
-  virtual QList<BufferInfo> requestBuffers(UserId user, QDateTime since = QDateTime());
-  
+  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(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);
+  virtual QList<Message> requestMsgs(UserId user, BufferId bufferId, MsgId first = -1, MsgId last = -1, int limit = -1);
+  virtual QList<Message> requestAllMsgs(UserId user, MsgId first = -1, MsgId last = -1, int limit = -1);
 
 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, const QString &buffer);
+  void createBuffer(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer);
+
+  static int _maxRetryCount;
 };
 
 #endif