X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Ftransfer.cpp;h=f01b9335e83455f4c38d7f6e05606f4cbe901933;hp=523d9e320c70d49b73bfb4960e7752e32127f476;hb=097f625c4bd147f4127573ad8ab48555f9dc62d3;hpb=100a2678adf2016b7b4753d09d868929de83294e

diff --git a/src/common/transfer.cpp b/src/common/transfer.cpp
index 523d9e32..f01b9335 100644
--- a/src/common/transfer.cpp
+++ b/src/common/transfer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,61 +20,100 @@
 
 #include "transfer.h"
 
-INIT_SYNCABLE_OBJECT(Transfer)
-Transfer::Transfer(const QUuid &uuid, QObject *parent)
-    : SyncableObject(parent),
-    _state(New),
-    _direction(Receive),
-    _port(0),
-    _fileSize(0),
-    _uuid(uuid)
+#include <utility>
+
+Transfer::Transfer(const QUuid& uuid, QObject* parent)
+    : SyncableObject(parent)
+    , _status(Status::New)
+    , _direction(Direction::Receive)
+    , _port(0)
+    , _fileSize(0)
+    , _uuid(uuid)
 {
-    renameObject(QString("Transfer/%1").arg(_uuid.toString()));
+    init();
 }
 
-Transfer::Transfer(Direction direction, const QString &fileName, const QHostAddress &address, quint16 port, quint64 fileSize, QObject *parent)
-    : SyncableObject(parent),
-    _state(New),
-    _direction(direction),
-    _fileName(fileName),
-    _address(address),
-    _port(port),
-    _fileSize(fileSize),
-    _uuid(QUuid::createUuid())
+Transfer::Transfer(
+    Direction direction, QString nick, QString fileName, const QHostAddress& address, quint16 port, quint64 fileSize, QObject* parent)
+    : SyncableObject(parent)
+    , _status(Status::New)
+    , _direction(direction)
+    , _fileName(std::move(fileName))
+    , _address(address)
+    , _port(port)
+    , _fileSize(fileSize)
+    , _nick(std::move(nick))
+    , _uuid(QUuid::createUuid())
 {
-    renameObject(QString("Transfer/%1").arg(_uuid.toString()));
+    init();
 }
 
+void Transfer::init()
+{
+    static auto regTypes = []() -> bool {
+        qRegisterMetaType<Status>("Transfer::Status");
+        qRegisterMetaType<Direction>("Transfer::Direction");
+        qRegisterMetaTypeStreamOperators<Status>("Transfer::Status");
+        qRegisterMetaTypeStreamOperators<Direction>("Transfer::Direction");
+        return true;
+    }();
+    Q_UNUSED(regTypes);
+
+    setObjectName(QString("Transfer/%1").arg(_uuid.toString()));
+    setAllowClientUpdates(true);
+}
 
 QUuid Transfer::uuid() const
 {
     return _uuid;
 }
 
-
-Transfer::State Transfer::state() const
+Transfer::Status Transfer::status() const
 {
-    return _state;
+    return _status;
 }
 
-
-void Transfer::setState(Transfer::State state)
+void Transfer::setStatus(Transfer::Status status)
 {
-    if (_state != state) {
-        _state = state;
-        SYNC(ARG(state));
-        emit stateChanged(state);
+    if (_status != status) {
+        _status = status;
+        SYNC(ARG(status));
+        emit statusChanged(status);
+        if (status == Status::Completed || status == Status::Failed) {
+            cleanUp();
+        }
     }
 }
 
+QString Transfer::prettyStatus() const
+{
+    switch (status()) {
+    case Status::New:
+        return tr("New");
+    case Status::Pending:
+        return tr("Pending");
+    case Status::Connecting:
+        return tr("Connecting");
+    case Status::Transferring:
+        return tr("Transferring");
+    case Status::Paused:
+        return tr("Paused");
+    case Status::Completed:
+        return tr("Completed");
+    case Status::Failed:
+        return tr("Failed");
+    case Status::Rejected:
+        return tr("Rejected");
+    }
 
+    return QString();
+}
 
 Transfer::Direction Transfer::direction() const
 {
     return _direction;
 }
 
-
 void Transfer::setDirection(Transfer::Direction direction)
 {
     if (_direction != direction) {
@@ -84,14 +123,12 @@ void Transfer::setDirection(Transfer::Direction direction)
     }
 }
 
-
 QHostAddress Transfer::address() const
 {
     return _address;
 }
 
-
-void Transfer::setAddress(const QHostAddress &address)
+void Transfer::setAddress(const QHostAddress& address)
 {
     if (_address != address) {
         _address = address;
@@ -100,13 +137,11 @@ void Transfer::setAddress(const QHostAddress &address)
     }
 }
 
-
 quint16 Transfer::port() const
 {
     return _port;
 }
 
-
 void Transfer::setPort(quint16 port)
 {
     if (_port != port) {
@@ -116,14 +151,12 @@ void Transfer::setPort(quint16 port)
     }
 }
 
-
 QString Transfer::fileName() const
 {
     return _fileName;
 }
 
-
-void Transfer::setFileName(const QString &fileName)
+void Transfer::setFileName(const QString& fileName)
 {
     if (_fileName != fileName) {
         _fileName = fileName;
@@ -132,13 +165,11 @@ void Transfer::setFileName(const QString &fileName)
     }
 }
 
-
 quint64 Transfer::fileSize() const
 {
     return _fileSize;
 }
 
-
 void Transfer::setFileSize(quint64 fileSize)
 {
     if (_fileSize != fileSize) {
@@ -147,3 +178,52 @@ void Transfer::setFileSize(quint64 fileSize)
         emit fileSizeChanged(fileSize);
     }
 }
+
+QString Transfer::nick() const
+{
+    return _nick;
+}
+
+void Transfer::setNick(const QString& nick)
+{
+    if (_nick != nick) {
+        _nick = nick;
+        SYNC(ARG(nick));
+        emit nickChanged(nick);
+    }
+}
+
+void Transfer::setError(const QString& errorString)
+{
+    qWarning() << Q_FUNC_INFO << errorString;
+    emit error(errorString);
+    setStatus(Status::Failed);
+}
+
+QDataStream& operator<<(QDataStream& out, Transfer::Status state)
+{
+    out << static_cast<qint8>(state);
+    return out;
+}
+
+QDataStream& operator>>(QDataStream& in, Transfer::Status& state)
+{
+    qint8 s;
+    in >> s;
+    state = static_cast<Transfer::Status>(s);
+    return in;
+}
+
+QDataStream& operator<<(QDataStream& out, Transfer::Direction direction)
+{
+    out << static_cast<qint8>(direction);
+    return out;
+}
+
+QDataStream& operator>>(QDataStream& in, Transfer::Direction& direction)
+{
+    qint8 d;
+    in >> d;
+    direction = static_cast<Transfer::Direction>(d);
+    return in;
+}