X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Ftransfer.cpp;h=cf07f29d401d53f7e5ca6a6482152ff04cc73c8d;hp=bba0c431326ce9c38f7fb7ee738c74b4ba2acff1;hb=8582c2ad5708a1972c85bea1cf8d81ad3ece4814;hpb=234d1cbd0d5b83602df964251ced84ec5ed4f371

diff --git a/src/common/transfer.cpp b/src/common/transfer.cpp
index bba0c431..cf07f29d 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-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,30 +20,47 @@
 
 #include "transfer.h"
 
-INIT_SYNCABLE_OBJECT(Transfer)
+#include <utility>
+
 Transfer::Transfer(const QUuid &uuid, QObject *parent)
     : SyncableObject(parent),
-    _state(New),
-    _direction(Receive),
+    _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 &nick, const QString &fileName, const QHostAddress &address, quint16 port, quint64 fileSize, QObject *parent)
+Transfer::Transfer(Direction direction, QString nick, QString fileName, const QHostAddress &address, quint16 port, quint64 fileSize, QObject *parent)
     : SyncableObject(parent),
-    _state(New),
+    _status(Status::New),
     _direction(direction),
-    _fileName(fileName),
+    _fileName(std::move(fileName)),
     _address(address),
     _port(port),
     _fileSize(fileSize),
-    _nick(nick),
+    _nick(std::move(nick)),
     _uuid(QUuid::createUuid())
 {
+    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);
+
     renameObject(QString("Transfer/%1").arg(_uuid.toString()));
+    setAllowClientUpdates(true);
 }
 
 
@@ -53,22 +70,50 @@ QUuid Transfer::uuid() const
 }
 
 
-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
 {
@@ -164,3 +209,36 @@ void Transfer::setNick(const QString &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;
+}