X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=7dd0a53ab4a5e1d6f684e92cf888e9063fd2d9c0;hp=32e34ec5a0128a84439f418c4955a3e83f237d5f;hb=3ed7d3bb6e9123ff0aa77023b264a39d1f63bd90;hpb=8699dd758516d0ded076811e8ea656adc95e69d0

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 32e34ec5..7dd0a53a 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -21,16 +21,17 @@
 #ifndef _CORESESSION_H_
 #define _CORESESSION_H_
 
-#include <QObject>
 #include <QString>
 #include <QVariant>
 
 #include "message.h"
 
+class BufferSyncer;
 class Identity;
-class Server;
+class NetworkConnection;
+class Network;
+struct NetworkInfo;
 class SignalProxy;
-class Storage;
 
 class QScriptEngine;
 
@@ -38,63 +39,97 @@ class CoreSession : public QObject {
   Q_OBJECT
 
 public:
-  CoreSession(UserId, Storage *, QObject *parent = 0);
-  virtual ~CoreSession();
+  CoreSession(UserId, bool restoreState, QObject *parent = 0);
+  ~CoreSession();
 
-  NetworkId getNetworkId(const QString &network) const;
   QList<BufferInfo> buffers() const;
-  UserId userId() const;
-  QVariant sessionState();
+  UserId user() const;
+  Network *network(NetworkId) const;
+  NetworkConnection *networkConnection(NetworkId) const;
+  Identity *identity(IdentityId) const;
 
-  //! Retrieve a piece of session-wide data.
-  QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
+  QVariant sessionState();
 
   SignalProxy *signalProxy() const;
 
-  void attachServer(Server *server);
+  void attachNetworkConnection(NetworkConnection *conn);
 
   //! Return necessary data for restoring the session after restarting the core
-  QVariant state() const;
-  void restoreState(const QVariant &previousState);
+  void saveSessionState() const;
+  void restoreSessionState();
 
 public slots:
-  //! Store a piece session-wide data and distribute it to connected clients.
-  void storeSessionData(const QString &key, const QVariant &data);
+  void networkStateRequested();
 
-  void serverStateRequested();
+  void addClient(QObject *socket);
 
-  void addClient(QIODevice *connection);
+  void connectToNetwork(NetworkId);
+  void disconnectFromNetwork(NetworkId id);
 
-  void connectToNetwork(QString, const QVariant &previousState = QVariant());
-  //void connectToNetwork(NetworkId);
-
-  //void processSignal(ClientSignal, QVariant, QVariant, QVariant);
   void sendBacklog(BufferInfo, QVariant, QVariant);
-  void msgFromGui(BufferInfo, QString message);
+  void msgFromClient(BufferInfo, QString message);
+
+  //! Create an identity and propagate the changes to the clients.
+  /** \param identity The identity to be created.
+   */
+  void createIdentity(const Identity &identity);
 
-  //! Create or update an identity and propagate the changes to the clients.
-  /** \param identity The identity to be created/updated.
+  //! Update an identity and propagate the changes to the clients.
+  /** \param identity The identity to be updated.
    */
-  void createOrUpdateIdentity(const Identity &identity);
+  void updateIdentity(const Identity &identity);
 
   //! Remove identity and propagate that fact to the clients.
   /** \param identity The identity to be removed.
    */
   void removeIdentity(IdentityId identity);
 
+  //! Create a network and propagate the changes to the clients.
+  /** \param info The network's settings.
+   */
+  void createNetwork(const NetworkInfo &info);
+
+  //! Update a network and propagate the changes to the clients.
+  /** \param info The updated network settings.
+   */
+  void updateNetwork(const NetworkInfo &info);
+
+  //! Remove identity and propagate that fact to the clients.
+  /** \param identity The identity to be removed.
+   */
+  void removeNetwork(NetworkId network);
+
+  //! Remove a buffer and it's backlog permanently
+  /** \param bufferId The id of the buffer to be removed.
+   *  emits bufferRemoved(bufferId) on success.
+   */
+  void removeBufferRequested(BufferId bufferId);
+
+  //! Rename a Buffer for a given network
+  /* \param networkId The id of the network the buffer belongs to
+   * \param newName   The new name of the buffer
+   * \param oldName   The old name of the buffer
+   * emits bufferRenamed(bufferId, newName) on success.
+   */
+  void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName);
+
+  void channelJoined(NetworkId id, const QString &channel, const QString &key = QString());
+  void channelParted(NetworkId, const QString &channel);
+  QHash<QString, QString> persistentChannels(NetworkId) const;
+
 signals:
-  void msgFromGui(uint netid, QString buf, QString message);
+  void initialized();
+
+  //void msgFromGui(uint netid, QString buf, QString message);
   void displayMsg(Message message);
   void displayStatusMsg(QString, QString);
 
-  void connectToIrc(QString net);
-  void disconnectFromIrc(QString net);
+  //void connectToIrc(QString net);
+  //void disconnectFromIrc(QString net);
 
   void backlogData(BufferInfo, QVariantList, bool done);
 
   void bufferInfoUpdated(BufferInfo);
-  void sessionDataChanged(const QString &key);
-  void sessionDataChanged(const QString &key, const QVariant &data);
 
   void scriptResult(QString result);
 
@@ -110,29 +145,46 @@ signals:
    */
   void identityRemoved(IdentityId identity);
 
+  void networkCreated(NetworkId);
+  void networkRemoved(NetworkId);
+  void bufferRemoved(BufferId);
+  void bufferRenamed(BufferId, QString);
+
 private slots:
   void recvStatusMsgFromServer(QString msg);
-  void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
-  void serverConnected(uint networkid);
-  void serverDisconnected(uint networkid);
+  void recvMessageFromServer(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
+  void networkConnected(NetworkId networkid);
+  void networkDisconnected(NetworkId networkid);
+
+  void destroyNetwork(NetworkId);
+
+  //! Called when storage updated a BufferInfo.
+  /** This emits bufferInfoUpdated() via SignalProxy, iff it's one of our buffers.
+   *  \param user       The buffer's owner (not necessarily us)
+   *  \param bufferInfo The updated BufferInfo
+   */
+  void updateBufferInfo(UserId user, const BufferInfo &bufferInfo);
+
+  void storeBufferLastSeen(BufferId buffer, const QDateTime &lastSeen);
 
   void scriptRequest(QString script);
-  
+
 private:
+  void loadSettings();
   void initScriptEngine();
-  
-  UserId user;
-  
+
+  UserId _user;
+
   SignalProxy *_signalProxy;
-  Storage *storage;
-  QHash<NetworkId, Server *> servers;
-  
-  QVariantMap sessionData;
-  QMutex mutex;
+  QHash<NetworkId, NetworkConnection *> _connections;
+  QHash<NetworkId, Network *> _networks;
+  QHash<NetworkId, Network *> _networksToRemove;
+  QHash<IdentityId, Identity *> _identities;
+
+  BufferSyncer *_bufferSyncer;
 
   QScriptEngine *scriptEngine;
 
-  QHash<IdentityId, Identity *> _identities;
 };
 
 #endif