X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=091c0f71bbd8a3b9179672e541ee3bd8540811b1;hp=126e3a5799d69de7185618ef9e0cc9bbc7919c14;hb=59579d82e3a16a815a197a4300c8ef279275ccfc;hpb=077d44f36d2f5c730283ef6be839aea7dd073d56 diff --git a/src/core/core.h b/src/core/core.h index 126e3a57..091c0f71 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005/06 by The Quassel 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 * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * (at your option) version 3. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -21,16 +21,24 @@ #ifndef _CORE_H_ #define _CORE_H_ +#include +#include #include #include -#include +#include +#include +#include -#include "server.h" -#include "storage.h" +#include "bufferinfo.h" +#include "message.h" #include "global.h" -#include "coreproxy.h" +#include "sessionthread.h" +#include "types.h" class CoreSession; +class SessionThread; +class Storage; +struct NetworkInfo; class Core : public QObject { Q_OBJECT @@ -39,18 +47,108 @@ class Core : public QObject { static Core * instance(); static void destroy(); - static CoreSession * session(UserId); - static CoreSession * localSession(); - static CoreSession * createSession(UserId); + 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: - void recvProxySignal(CoreSignal, QVariant, QVariant, QVariant); - bool startListening(uint port = 4242); + bool startListening(uint port = Global::defaultPort); void stopListening(); void incomingConnection(); void clientHasData(); void clientDisconnected(); - void updateGlobalData(UserId, QString); + + bool initStorage(QVariantMap dbSettings, bool setup = false); private: Core(); @@ -58,111 +156,26 @@ class Core : public QObject { void init(); static Core *instanceptr; - void processClientInit(QTcpSocket *socket, const QVariant &v); - void processClientUpdate(QTcpSocket *socket, QString key, const QVariant &data); + 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 validClients; - QHash blockSizes; -}; - -class CoreSession : public QObject { - Q_OBJECT - - public: - CoreSession(UserId, Storage *); - ~CoreSession(); - - QList buffers() const; - inline UserId userId(); - QVariant sessionState(); - CoreProxy *proxy(); - - public slots: - void connectToIrc(QStringList); - void processSignal(ClientSignal, QVariant, QVariant, QVariant); - void sendBacklog(BufferId, QVariant, QVariant); - void msgFromGui(BufferId, QString message); - void sendServerStates(); - - signals: - void proxySignal(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant()); - - void msgFromGui(QString net, QString buf, QString message); - void displayMsg(Message message); - void displayStatusMsg(QString, QString); - - void connectToIrc(QString net); - void disconnectFromIrc(QString net); - void serverStateRequested(); - - void backlogData(BufferId, QList, bool done); - - void bufferIdUpdated(BufferId); - - private slots: - //void recvProxySignal(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant()); - void globalDataUpdated(UserId, QString); - void recvStatusMsgFromServer(QString msg); - void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None); - void serverConnected(QString net); - void serverDisconnected(QString net); - - private: - CoreProxy *coreProxy; - Storage *storage; - QHash servers; - UserId user; - -}; - -/* -class Core : public QObject { - Q_OBJECT + QHash blocksizes; + QHash clientInfo; - public: - - Core(); - ~Core(); - QList getBuffers(); + QDateTime startTime; - public slots: - void connectToIrc(QStringList); - void sendBacklog(BufferId, QVariant, QVariant); - void msgFromGUI(BufferId, QString message); - - signals: - void msgFromGUI(QString net, QString buf, QString message); - void displayMsg(Message message); - void displayStatusMsg(QString, QString); - - void connectToIrc(QString net); - void disconnectFromIrc(QString net); - void serverStateRequested(); - - void backlogData(BufferId, QList, bool done); - - void bufferIdUpdated(BufferId); - - private slots: - void globalDataUpdated(QString); - void recvStatusMsgFromServer(QString msg); - void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None); - void serverDisconnected(QString net); - - private: - Storage *storage; - QHash servers; - UserId user; + bool configured; + static QMutex mutex; }; -*/ -//extern Core *core; - - #endif