X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=091c0f71bbd8a3b9179672e541ee3bd8540811b1;hp=1ceaec44a23de7e9c6acd4fd74522a2fe6986bf0;hb=59579d82e3a16a815a197a4300c8ef279275ccfc;hpb=d1f2e1324046ad4108d30434c92fc0a2d688ef09 diff --git a/src/core/core.h b/src/core/core.h index 1ceaec44..091c0f71 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -21,16 +21,24 @@ #ifndef _CORE_H_ #define _CORE_H_ +#include +#include #include #include +#include #include #include +#include "bufferinfo.h" +#include "message.h" #include "global.h" +#include "sessionthread.h" #include "types.h" class CoreSession; +class SessionThread; class Storage; +struct NetworkInfo; class Core : public QObject { Q_OBJECT @@ -39,16 +47,100 @@ 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. + + //! Create a NetworkId in the Storage and store it in the given NetworkInfo + /** \note This method is thredsafe. + * + * \param user The core user + * \param networkInfo a NetworkInfo definition to store the newly created ID in + * \return true if successfull. + */ + static bool createNetworkId(UserId user, NetworkInfo &info); + + //! 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 networkId The network id + * \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 NetworkId &networkId, 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 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 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 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 requestBuffers(UserId user, QDateTime since = QDateTime()); + + public slots: + //! Make storage data persistent + /** \note This method is threadsafe. + */ + void syncStorage(); + + 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,34 +148,34 @@ class Core : public QObject { void clientHasData(); void clientDisconnected(); - bool initStorageSqlite(QVariantMap dbSettings, bool setup); + 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, bool restoreState = false); + void setupClientSession(QTcpSocket *socket, UserId uid); void processCoreSetup(QTcpSocket *socket, QVariantMap &msg); - + QStringList availableStorageProviders(); UserId guiUser; - QHash sessions; + QHash sessions; Storage *storage; + QTimer _storageSyncTimer; QTcpServer server; // TODO: implement SSL - QHash blockSizes; - + QHash blocksizes; + QHash clientInfo; + + QDateTime startTime; + bool configured; + + static QMutex mutex; }; #endif