X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Ftransfer.h;h=3612450ad95b550942d3d467935c03c895ac59ef;hb=ab7ef4d24f62b5848b628482b7762ebfc0b53e1a;hp=e36ed15cc955d9d53dfb1f010b0bf0ef1dbe7012;hpb=f5bb6544096b45cde4642e821654c48e26a9f79c;p=quassel.git

diff --git a/src/common/transfer.h b/src/common/transfer.h
index e36ed15c..3612450a 100644
--- a/src/common/transfer.h
+++ b/src/common/transfer.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,8 +24,8 @@
 #include <QHostAddress>
 #include <QUuid>
 
+#include "peer.h"
 #include "syncableobject.h"
-#include "types.h"
 
 class Transfer : public SyncableObject
 {
@@ -33,8 +33,8 @@ class Transfer : public SyncableObject
     SYNCABLE_OBJECT
 
     Q_PROPERTY(QUuid uuid READ uuid);
-    Q_PROPERTY(State state READ state WRITE setState NOTIFY stateChanged);
-    Q_PROPERTY(Direction direction READ direction WRITE setDirection NOTIFY directionChanged);
+    Q_PROPERTY(Transfer::Status status READ status WRITE setStatus NOTIFY statusChanged);
+    Q_PROPERTY(Transfer::Direction direction READ direction WRITE setDirection NOTIFY directionChanged);
     Q_PROPERTY(QHostAddress address READ address WRITE setAddress NOTIFY addressChanged);
     Q_PROPERTY(quint16 port READ port WRITE setPort NOTIFY portChanged);
     Q_PROPERTY(QString fileName READ fileName WRITE setFileName NOTIFY fileNameChanged);
@@ -42,9 +42,10 @@ class Transfer : public SyncableObject
     Q_PROPERTY(QString nick READ nick WRITE setNick NOTIFY nickChanged);
 
 public:
-    enum State {
+    enum class Status {
         New,
         Pending,
+        Connecting,
         Transferring,
         Paused,
         Completed,
@@ -53,7 +54,7 @@ public:
     };
     Q_ENUMS(State)
 
-    enum Direction {
+    enum class Direction {
         Send,
         Receive
     };
@@ -61,9 +62,11 @@ public:
 
     Transfer(const QUuid &uuid, QObject *parent = 0); // for creating a syncable object client-side
     Transfer(Direction direction, const QString &nick, const QString &fileName, const QHostAddress &address, quint16 port, quint64 size = 0, QObject *parent = 0);
+    inline const QMetaObject *syncMetaObject() const override { return &staticMetaObject; }
 
     QUuid uuid() const;
-    State state() const;
+    Status status() const;
+    QString prettyStatus() const;
     Direction direction() const;
     QString fileName() const;
     QHostAddress address() const;
@@ -71,31 +74,40 @@ public:
     quint64 fileSize() const;
     QString nick() const;
 
-    QString savePath() const;
+    virtual quint64 transferred() const = 0;
 
 public slots:
     // called on the client side
-    void accept(const QString &savePath) const;
-    void reject() const;
+    virtual void accept(const QString &savePath) const { Q_UNUSED(savePath); }
+    virtual void reject() const {}
 
     // called on the core side through sync calls
-    void requestAccepted(PeerPtr peer = 0);
-    void requestRejected();
+    virtual void requestAccepted(PeerPtr peer) { Q_UNUSED(peer); }
+    virtual void requestRejected(PeerPtr peer) { Q_UNUSED(peer); }
 
 signals:
-    void stateChanged(State state);
-    void directionChanged(Direction direction);
+    void statusChanged(Transfer::Status state);
+    void directionChanged(Transfer::Direction direction);
     void addressChanged(const QHostAddress &address);
     void portChanged(quint16 port);
     void fileNameChanged(const QString &fileName);
     void fileSizeChanged(quint64 fileSize);
+    void transferredChanged(quint64 transferred);
     void nickChanged(const QString &nick);
 
+    void error(const QString &errorString);
+
     void accepted(PeerPtr peer = 0) const;
-    void rejected() const;
+    void rejected(PeerPtr peer = 0) const;
+
+protected slots:
+    void setStatus(Transfer::Status status);
+    void setError(const QString &errorString);
+
+    // called on the client side through sync calls
+    virtual void dataReceived(PeerPtr, const QByteArray &data) { Q_UNUSED(data); }
 
-protected:
-    void setState(State state);
+    virtual void cleanUp() = 0;
 
 private:
     void init();
@@ -108,7 +120,7 @@ private:
     void setNick(const QString &nick);
 
 
-    State _state;
+    Status _status;
     Direction _direction;
     QString _fileName;
     QHostAddress _address;
@@ -116,9 +128,14 @@ private:
     quint64 _fileSize;
     QString _nick;
     QUuid _uuid;
-
-    // non-synced attributes
-    mutable QString _savePath;
 };
 
+Q_DECLARE_METATYPE(Transfer::Status)
+Q_DECLARE_METATYPE(Transfer::Direction)
+
+QDataStream &operator<<(QDataStream &out, Transfer::Status state);
+QDataStream &operator>>(QDataStream &in, Transfer::Status &state);
+QDataStream &operator<<(QDataStream &out, Transfer::Direction direction);
+QDataStream &operator>>(QDataStream &in, Transfer::Direction &direction);
+
 #endif