X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=76693176ffeed7329ba4603ea31a435ed7802dae;hp=ae39dc18c45b9818207c0bec8e9d23ce536774f7;hb=d1b6499b0b848d4287efae89107576548533502c;hpb=f37791b92e3bf6e78b93036c0669926eeba3347b

diff --git a/src/core/core.h b/src/core/core.h
index ae39dc18..76693176 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -21,15 +21,21 @@
 #ifndef _CORE_H_
 #define _CORE_H_
 
+#include <QDateTime>
+#include <QMutex>
 #include <QString>
 #include <QVariant>
 #include <QTcpServer>
 #include <QTcpSocket>
 
+#include "bufferinfo.h"
+#include "message.h"
 #include "global.h"
+#include "sessionthread.h"
 #include "types.h"
 
 class CoreSession;
+class SessionThread;
 class Storage;
 
 class Core : public QObject {
@@ -39,16 +45,85 @@ class Core : public QObject {
     static Core * instance();
     static void destroy();
 
-    static CoreSession * session(UserId);
-    static CoreSession * localSession();
-    static CoreSession * createSession(UserId);
-
-    static QVariant connectLocalClient(QString user, QString passwd);
-    static void disconnectLocalClient();
-
     static void saveState();
     static void restoreState();
 
+    /*** Storage access ***/
+    // These methods are threadsafe.
+
+    //! Get the NetworkId for a network name.
+    /** \note This method is threadsafe.
+     *
+     *  \param user    The core user
+     *  \param network The name of the network
+     *  \return The NetworkId corresponding to the given network.
+     */
+    static NetworkId networkId(UserId user, const QString &network);
+
+    //! Get the unique BufferInfo for the given combination of network and buffername for a user.
+    /** \note This method is threadsafe.
+     *
+     *  \param user    The core user who owns this buffername
+     *  \param network The network name
+     *  \param buffer  The buffer name (if empty, the net's status buffer is returned)
+     *  \return The BufferInfo corresponding to the given network and buffer name, or 0 if not found
+     */
+    static BufferInfo bufferInfo(UserId user, const QString &network, const QString &buffer = "");
+
+    //! Store a Message in the backlog.
+    /** \note This method is threadsafe.
+     *
+     *  \param msg  The message object to be stored
+     *  \return The globally unique id for the stored message
+     */
+    static MsgId storeMessage(const Message &message);
+
+    //! Request a certain number (or all) messages stored in a given buffer.
+    /** \note This method is threadsafe.
+     *
+     *  \param buffer   The buffer we request messages from
+     *  \param lastmsgs The number of messages we would like to receive, or -1 if we'd like all messages from that buffername
+     *  \param offset   Do not return (but DO count) messages with MsgId >= offset, if offset >= 0
+     *  \return The requested list of messages
+     */
+    static QList<Message> requestMsgs(BufferInfo buffer, int lastmsgs = -1, int offset = -1);
+
+    //! Request messages stored in a given buffer since a certain point in time.
+    /** \note This method is threadsafe.
+     *
+     *  \param buffer   The buffer we request messages from
+     *  \param since    Only return messages newer than this point in time
+     *  \param offset   Do not return messages with MsgId >= offset, if offset >= 0
+     *  \return The requested list of messages
+     */
+    static QList<Message> requestMsgs(BufferInfo buffer, QDateTime since, int offset = -1);
+
+    //! Request a range of messages stored in a given buffer.
+    /** \note This method is threadsafe.
+     *
+     *  \param buffer   The buffer we request messages from
+     *  \param first    Return messages with first <= MsgId <= last
+     *  \param last     Return messages with first <= MsgId <= last
+     *  \return The requested list of messages
+     */
+    static QList<Message> requestMsgRange(BufferInfo buffer, int first, int last);
+
+    //! Request a list of all buffers known to a user since a certain point in time.
+    /** This method is used to get a list of all buffers we have stored a backlog from.
+     *  Optionally, a QDateTime can be given, so that only buffers are listed that were active
+     *  since that point in time.
+     *  \note This method is threadsafe.
+     *
+     *  \param user  The user whose buffers we request
+     *  \param since If this is defined, older buffers will be ignored
+     *  \return A list of the BufferInfos for all buffers as requested
+     */
+    static QList<BufferInfo> requestBuffers(UserId user, QDateTime since = QDateTime());
+
+  signals:
+    //! Sent when a BufferInfo is updated in storage.
+    void bufferInfoUpdated(UserId user, const BufferInfo &info);
+
   private slots:
     bool startListening(uint port = Global::defaultPort);
     void stopListening();
@@ -56,35 +131,33 @@ class Core : public QObject {
     void clientHasData();
     void clientDisconnected();
 
-    bool initStorage(QVariantMap dbSettings, bool setup);
-    bool initStorage(QVariantMap dbSettings);
+    bool initStorage(QVariantMap dbSettings, bool setup = false);
 
   private:
     Core();
     ~Core();
     void init();
     static Core *instanceptr;
-    
-    //! Initiate a session for the user with the given credentials if one does not already exist.
-    /** This function is called during the init process for a new client. If there is no session for the
-     *  given user, one is created.
-     * \param userId The user
-     * \return A QVariant containing the session data, e.g. global data and buffers
-     */
-    QVariant initSession(UserId userId);
-    void processClientInit(QTcpSocket *socket, const QVariantMap &msg);
+
+    SessionThread *createSession(UserId userId);
+    void setupClientSession(QTcpSocket *socket, UserId uid);
     void processCoreSetup(QTcpSocket *socket, QVariantMap &msg);
-    
+
     QStringList availableStorageProviders();
 
     UserId guiUser;
-    QHash<UserId, CoreSession *> sessions;
+    QHash<UserId, SessionThread *> sessions;
     Storage *storage;
 
     QTcpServer server; // TODO: implement SSL
-    QHash<QTcpSocket *, quint32> blockSizes;
-    
+    QHash<QTcpSocket *, quint32> blocksizes;
+    QHash<QTcpSocket *, QVariantMap> clientInfo;
+
+    QDateTime startTime;
+
     bool configured;
+
+    static QMutex mutex;
 };
 
 #endif