X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.h;h=ebe8061963adb2ab8964e1493a8035ab4bb3adf2;hp=beb7b891675c4c278b0d3c4915b0509ed581ffcb;hb=b0dcbdccb27a6f9b95b3937bcd9232dcf9a68492;hpb=5c6804f291a63f978e328aeddcc8448e3443b45e diff --git a/src/core/core.h b/src/core/core.h index beb7b891..ebe80619 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-2013 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,14 +15,13 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef _CORE_H_ -#define _CORE_H_ +#ifndef CORE_H +#define CORE_H #include -#include #include #include #include @@ -37,19 +36,26 @@ #include "bufferinfo.h" #include "message.h" +#include "oidentdconfiggenerator.h" #include "sessionthread.h" +#include "storage.h" #include "types.h" class CoreSession; -class SessionThread; -class Storage; +class RemotePeer; struct NetworkInfo; +class SessionThread; +class SignalProxy; + +class AbstractSqlMigrationReader; +class AbstractSqlMigrationWriter; -class Core : public QObject { - Q_OBJECT +class Core : public QObject +{ + Q_OBJECT - public: - static Core * instance(); +public: + static Core *instance(); static void destroy(); static void saveState(); @@ -64,16 +70,48 @@ class Core : public QObject { * \param settingName The Name of the Setting * \param data The Value */ - static void setUserSetting(UserId userId, const QString &settingName, const QVariant &data); + static inline void setUserSetting(UserId userId, const QString &settingName, const QVariant &data) + { + instance()->_storage->setUserSetting(userId, settingName, data); + } + //! Retrieve a persistent user setting /** * \param userId The users Id * \param settingName The Name of the Setting - * \param default Value to return in case it's unset. + * \param defaultValue Value to return in case it's unset. * \return the Value of the Setting or the default value if it is unset. */ - static QVariant getUserSetting(UserId userId, const QString &settingName, const QVariant &data = QVariant()); + static inline QVariant getUserSetting(UserId userId, const QString &settingName, const QVariant &defaultValue = QVariant()) + { + return instance()->_storage->getUserSetting(userId, settingName, defaultValue); + } + + + /* Identity handling */ + static inline IdentityId createIdentity(UserId user, CoreIdentity &identity) + { + return instance()->_storage->createIdentity(user, identity); + } + + + static bool updateIdentity(UserId user, const CoreIdentity &identity) + { + return instance()->_storage->updateIdentity(user, identity); + } + + + static void removeIdentity(UserId user, IdentityId identityId) + { + instance()->_storage->removeIdentity(user, identityId); + } + + + static QList identities(UserId user) + { + return instance()->_storage->identities(user); + } //! Create a Network in the Storage and store it's Id in the given NetworkInfo @@ -92,7 +130,11 @@ class Core : public QObject { * \param networkInfo The Updated NetworkInfo * \return true if successfull. */ - static bool updateNetwork(UserId user, const NetworkInfo &info); + static inline bool updateNetwork(UserId user, const NetworkInfo &info) + { + return instance()->_storage->updateNetwork(user, info); + } + //! Permanently remove a Network and all the data associated with it. /** \note This method is thredsafe. @@ -101,7 +143,11 @@ class Core : public QObject { * \param networkId The network to delete * \return true if successfull. */ - static bool removeNetwork(UserId user, const NetworkId &networkId); + static inline bool removeNetwork(UserId user, const NetworkId &networkId) + { + return instance()->_storage->removeNetwork(user, networkId); + } + //! Returns a list of all NetworkInfos for the given UserId user /** \note This method is thredsafe. @@ -109,16 +155,11 @@ class Core : public QObject { * \param user The core user * \return QList. */ - static QList networks(UserId user); + static inline QList networks(UserId user) + { + return instance()->_storage->networks(user); + } - //! 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 a list of Networks to restore /** Return a list of networks the user was connected at the time of core shutdown @@ -126,7 +167,11 @@ class Core : public QObject { * * \param user The User Id in question */ - static QList connectedNetworks(UserId user); + static inline QList connectedNetworks(UserId user) + { + return instance()->_storage->connectedNetworks(user); + } + //! Update the connected state of a network /** \note This method is threadsafe @@ -135,7 +180,11 @@ class Core : public QObject { * \param networkId The Id of the network * \param isConnected whether the network is connected or not */ - static void setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected); + static inline void setNetworkConnected(UserId user, const NetworkId &networkId, bool isConnected) + { + return instance()->_storage->setNetworkConnected(user, networkId, isConnected); + } + //! Get a hash of channels with their channel keys for a given network /** The keys are channel names and values are passwords (possibly empty) @@ -144,7 +193,11 @@ class Core : public QObject { * \param user The id of the networks owner * \param networkId The Id of the network */ - static QHash persistentChannels(UserId user, const NetworkId &networkId); + static inline QHash persistentChannels(UserId user, const NetworkId &networkId) + { + return instance()->_storage->persistentChannels(user, networkId); + } + //! Update the connected state of a channel /** \note This method is threadsafe @@ -154,7 +207,11 @@ class Core : public QObject { * \param channel The name of the channel * \param isJoined whether the channel is connected or not */ - static void setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined); + static inline void setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined) + { + return instance()->_storage->setChannelPersistent(user, networkId, channel, isJoined); + } + //! Update the key of a channel /** \note This method is threadsafe @@ -164,7 +221,61 @@ class Core : public QObject { * \param channel The name of the channel * \param key The key of the channel (possibly empty) */ - static void setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key); + static inline void setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key) + { + return instance()->_storage->setPersistentChannelKey(user, networkId, channel, key); + } + + + //! retrieve last known away message for session restore + /** \note This method is threadsafe + * + * \param user The Id of the networks owner + * \param networkId The Id of the network + */ + static inline QString awayMessage(UserId user, NetworkId networkId) + { + return instance()->_storage->awayMessage(user, networkId); + } + + + //! Make away message persistent for session restore + /** \note This method is threadsafe + * + * \param user The Id of the networks owner + * \param networkId The Id of the network + * \param awayMsg The current away message of own user + */ + static inline void setAwayMessage(UserId user, NetworkId networkId, const QString &awayMsg) + { + return instance()->_storage->setAwayMessage(user, networkId, awayMsg); + } + + + //! retrieve last known user mode for session restore + /** \note This method is threadsafe + * + * \param user The Id of the networks owner + * \param networkId The Id of the network + */ + static inline QString userModes(UserId user, NetworkId networkId) + { + return instance()->_storage->userModes(user, networkId); + } + + + //! Make our user modes persistent for session restore + /** \note This method is threadsafe + * + * \param user The Id of the networks owner + * \param networkId The Id of the network + * \param userModes The current user modes of own user + */ + static inline void setUserModes(UserId user, NetworkId networkId, const QString &userModes) + { + return instance()->_storage->setUserModes(user, networkId, userModes); + } + //! Get the unique BufferInfo for the given combination of network and buffername for a user. /** \note This method is threadsafe. @@ -173,9 +284,14 @@ class Core : public QObject { * \param networkId The network id * \param type The type of the buffer (StatusBuffer, Channel, etc.) * \param buffer The buffer name (if empty, the net's status buffer is returned) + * \param create Whether or not the buffer should be created if it doesnt exist * \return The BufferInfo corresponding to the given network and buffer name, or 0 if not found */ - static BufferInfo bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type, const QString &buffer = ""); + static inline BufferInfo bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer = "", bool create = true) + { + return instance()->_storage->bufferInfo(user, networkId, type, buffer, create); + } + //! Get the unique BufferInfo for a bufferId /** \note This method is threadsafe @@ -183,46 +299,60 @@ class Core : public QObject { * \param bufferId The id of the buffer * \return The BufferInfo corresponding to the given buffer id, or an invalid BufferInfo if not found. */ - static BufferInfo getBufferInfo(UserId user, const BufferId &bufferId); + static inline BufferInfo getBufferInfo(UserId user, const BufferId &bufferId) + { + return instance()->_storage->getBufferInfo(user, bufferId); + } - //! Store a Message in the backlog. + //! Store a Message in the storage backend and set it's unique Id. /** \note This method is threadsafe. * - * \param msg The message object to be stored - * \return The globally unique id for the stored message + * \param message The message object to be stored + * \return true on success */ - static MsgId storeMessage(const Message &message); + static inline bool storeMessage(Message &message) + { + return instance()->_storage->logMessage(message); + } - //! Request a certain number (or all) messages stored in a given buffer. + + //! Store a list of Messages in the storage backend and set their unique Id. /** \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 + * \param messages The list message objects to be stored + * \return true on success */ - static QList requestMsgs(UserId user, BufferId buffer, int lastmsgs = -1, int offset = -1); + static inline bool storeMessages(MessageList &messages) + { + return instance()->_storage->logMessages(messages); + } - //! 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 + + //! Request a certain number messages stored in a given buffer. + /** \param buffer The buffer we request messages from + * \param first if != -1 return only messages with a MsgId >= first + * \param last if != -1 return only messages with a MsgId < last + * \param limit if != -1 limit the returned list to a max of \limit entries * \return The requested list of messages */ - static QList requestMsgs(UserId user, BufferId buffer, QDateTime since, int offset = -1); + static inline QList requestMsgs(UserId user, BufferId bufferId, MsgId first = -1, MsgId last = -1, int limit = -1) + { + return instance()->_storage->requestMsgs(user, bufferId, first, last, limit); + } - //! 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 + + //! Request a certain number of messages across all buffers + /** \param first if != -1 return only messages with a MsgId >= first + * \param last if != -1 return only messages with a MsgId < last + * \param limit Max amount of messages * \return The requested list of messages */ - static QList requestMsgRange(UserId user, BufferId buffer, int first, int last); + static inline QList requestAllMsgs(UserId user, MsgId first = -1, MsgId last = -1, int limit = -1) + { + return instance()->_storage->requestAllMsgs(user, first, last, limit); + } + //! Request a list of all buffers known to a user. /** This method is used to get a list of all buffers we have stored a backlog from. @@ -231,17 +361,24 @@ class Core : public QObject { * \param user The user whose buffers we request * \return A list of the BufferInfos for all buffers as requested */ - static QList requestBuffers(UserId user); + static inline QList requestBuffers(UserId user) + { + return instance()->_storage->requestBuffers(user); + } //! Request a list of BufferIds for a given NetworkId /** \note This method is threadsafe. - * - * \param user The user whose buffers we request - * \param networkId The NetworkId of the network in question - * \return List of BufferIds belonging to the Network - */ - static QList requestBufferIdsForNetwork(UserId user, NetworkId networkId); + * + * \param user The user whose buffers we request + * \param networkId The NetworkId of the network in question + * \return List of BufferIds belonging to the Network + */ + static inline QList requestBufferIdsForNetwork(UserId user, NetworkId networkId) + { + return instance()->_storage->requestBufferIdsForNetwork(user, networkId); + } + //! Remove permanently a buffer and it's content from the storage backend /** This call cannot be reverted! @@ -251,17 +388,37 @@ class Core : public QObject { * \param bufferId The bufferId * \return true if successfull */ - static bool removeBuffer(const UserId &user, const BufferId &bufferId); + static inline bool removeBuffer(const UserId &user, const BufferId &bufferId) + { + return instance()->_storage->removeBuffer(user, bufferId); + } + //! Rename a Buffer /** \note This method is threadsafe. * \param user The id of the buffer owner - * \param networkId The id of the network the buffer belongs to + * \param bufferId The bufferId * \param newName The new name of the buffer - * \param oldName The previous name of the buffer - * \return the BufferId of the affected buffer or an invalid BufferId if not successfull + * \return true if successfull + */ + static inline bool renameBuffer(const UserId &user, const BufferId &bufferId, const QString &newName) + { + return instance()->_storage->renameBuffer(user, bufferId, newName); + } + + + //! Merge the content of two Buffers permanently. This cannot be reversed! + /** \note This method is threadsafe. + * \param user The id of the buffer owner + * \param bufferId1 The bufferId of the remaining buffer + * \param bufferId2 The buffer that is about to be removed + * \return true if successfulln */ - static BufferId renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName); + static inline bool mergeBuffersPermanently(const UserId &user, const BufferId &bufferId1, const BufferId &bufferId2) + { + return instance()->_storage->mergeBuffersPermanently(user, bufferId1, bufferId2); + } + //! Update the LastSeenDate for a Buffer /** This Method is used to make the LastSeenDate of a Buffer persistent @@ -271,7 +428,11 @@ class Core : public QObject { * \param bufferId The buffer id * \param MsgId The Message id of the message that has been just seen */ - static void setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId); + static inline void setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) + { + return instance()->_storage->setBufferLastSeenMsg(user, bufferId, msgId); + } + //! Get a Hash of all last seen message ids /** This Method is called when the Quassel Core is started to restore the lastSeenMsgIds @@ -279,27 +440,70 @@ class Core : public QObject { * * \param user The Owner of the buffers */ - static QHash bufferLastSeenMsgIds(UserId user); + static inline QHash bufferLastSeenMsgIds(UserId user) + { + return instance()->_storage->bufferLastSeenMsgIds(user); + } + + + //! Update the MarkerLineMsgId for a Buffer + /** This Method is used to make the marker line position of a Buffer persistent + * \note This method is threadsafe. + * + * \param user The Owner of that Buffer + * \param bufferId The buffer id + * \param MsgId The Message id where the marker line should be placed + */ + static inline void setBufferMarkerLineMsg(UserId user, const BufferId &bufferId, const MsgId &msgId) + { + return instance()->_storage->setBufferMarkerLineMsg(user, bufferId, msgId); + } + + + //! Get a Hash of all marker line message ids + /** This Method is called when the Quassel Core is started to restore the MarkerLineMsgIds + * \note This method is threadsafe. + * + * \param user The Owner of the buffers + */ + static inline QHash bufferMarkerLineMsgIds(UserId user) + { + return instance()->_storage->bufferMarkerLineMsgIds(user); + } + + + const QDateTime &startTime() const { return _startTime; } + + static inline QTimer &syncTimer() { return instance()->_storageSyncTimer; } - const QDateTime &startTime() const { return _startTime; } + inline OidentdConfigGenerator *oidentdConfigGenerator() const { return _oidentdConfigGenerator; } - public slots: + static const int AddClientEventId; + +public slots: //! Make storage data persistent /** \note This method is threadsafe. */ void syncStorage(); + void setupInternalClientSession(InternalPeer *clientConnection); - signals: +signals: //! Sent when a BufferInfo is updated in storage. void bufferInfoUpdated(UserId user, const BufferInfo &info); - private slots: + //! Relay From CoreSession::sessionState(const QVariant &). Used for internal connection only + void sessionState(const QVariant &); + +protected: + virtual void customEvent(QEvent *event); + +private slots: bool startListening(); - void stopListening(); + void stopListening(const QString &msg = QString()); void incomingConnection(); - void clientHasData(); void clientDisconnected(); + bool initStorage(const QString &backend, QVariantMap settings, bool setup = false); bool initStorage(QVariantMap dbSettings, bool setup = false); #ifdef HAVE_SSL @@ -307,41 +511,57 @@ class Core : public QObject { #endif void socketError(QAbstractSocket::SocketError); - private: + void processClientMessage(const QVariant &data); + +private: Core(); ~Core(); void init(); static Core *instanceptr; SessionThread *createSession(UserId userId, bool restoreState = false); - void setupClientSession(QTcpSocket *socket, UserId uid); - void processClientMessage(QTcpSocket *socket, const QVariantMap &msg); + void setupClientSession(RemotePeer *peer, UserId uid); + void addClientHelper(RemotePeer *peer, UserId uid); //void processCoreSetup(QTcpSocket *socket, QVariantMap &msg); - QString setupCore(const QVariant &setupData); + QString setupCoreForInternalUsage(); + QString setupCore(QVariantMap setupData); + void registerStorageBackends(); bool registerStorageBackend(Storage *); + void unregisterStorageBackends(); void unregisterStorageBackend(Storage *); + bool selectBackend(const QString &backend); + void createUser(); + void changeUserPass(const QString &username); + void saveBackendSettings(const QString &backend, const QVariantMap &settings); + QVariantMap promptForSettings(const Storage *storage); QHash sessions; - Storage *storage; + Storage *_storage; QTimer _storageSyncTimer; #ifdef HAVE_SSL - SslServer _server, _v6server; + SslServer _server, _v6server; #else - QTcpServer _server, _v6server; + QTcpServer _server, _v6server; #endif - QHash blocksizes; - QHash clientInfo; + OidentdConfigGenerator *_oidentdConfigGenerator; + + QHash clientInfo; QHash _storageBackends; QDateTime _startTime; - bool configured; + bool _configured; - static QMutex mutex; + static AbstractSqlMigrationReader *getMigrationReader(Storage *storage); + static AbstractSqlMigrationWriter *getMigrationWriter(Storage *storage); + static void stdInEcho(bool on); + static inline void enableStdInEcho() { stdInEcho(true); } + static inline void disableStdInEcho() { stdInEcho(false); } }; + #endif