[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=82a686d

The following commit has been merged in the master branch:
commit 82a686dbe5632012af4781bec5c8cd73e8c3a243
Author: Àlex Fiestas <afiestas at kde.org>
Date:   Mon Mar 3 21:12:06 2014 +0100

    Calculate the speed in FileTransferJob if we know the size
    
    KJob doesn't do this for us so we have to do the math
    ourselves.
---
 kded/filetransferjob.cpp | 21 ++++++++++++++++++---
 kded/filetransferjob.h   |  3 +++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/kded/filetransferjob.cpp b/kded/filetransferjob.cpp
index a5b408e..4cb2bd1 100644
--- a/kded/filetransferjob.cpp
+++ b/kded/filetransferjob.cpp
@@ -37,7 +37,9 @@ FileTransferJob::FileTransferJob(const QSharedPointer<QIODevice>& origin, int si
     mOrigin = origin;
     mSize = size;
     mWritten = 0;
+    m_speedBytes = 0;
     mDeviceName = i18nc("Device name that will appear on the jobs", "KDE-Connect");
+    qDebug() << "SIZE: " << mSize;
     kDebug(kdeconnect_kded()) << "FileTransferJob Downloading payload to" << destination;
 }
 
@@ -49,7 +51,9 @@ void FileTransferJob::openFinished(KJob* job)
 void FileTransferJob::start()
 {
     //kDebug(kdeconnect_kded()) << "FileTransferJob start";
-
+    setTotalAmount(Bytes, mSize);
+    setProcessedAmount(Bytes, 0);
+    m_time = QTime::currentTime();
     description(this, i18n("Receiving file over KDE-Connect"),
                         QPair<QString, QString>(i18nc("File transfer origin", "From"),
                         QString(mDeviceName)),
@@ -84,12 +88,23 @@ void FileTransferJob::readyRead()
     int bytes = qMin(qint64(4096), mOrigin->bytesAvailable());
     QByteArray data = mOrigin->read(bytes);
     mDestination->write(data);
-    mWritten += bytes;
+    mWritten += data.size();
+    setProcessedAmount(Bytes, mWritten);
 
     //kDebug(kdeconnect_kded()) << "readyRead" << mSize << mWritten << bytes;
 
     if (mSize > -1) {
-        setPercent((mWritten*100)/mSize);
+        //If a least 1 second has passed since last update
+        int secondsSinceLastTime = m_time.secsTo(QTime::currentTime());
+        if (secondsSinceLastTime > 0 && m_speedBytes > 0) {
+            float speed = (mWritten - m_speedBytes) / secondsSinceLastTime;
+            emitSpeed(speed);
+
+            m_time = QTime::currentTime();
+            m_speedBytes = mWritten;
+        } else if(m_speedBytes == 0) {
+            m_speedBytes = mWritten;
+        }
     }
 
     if (mSize > -1 && mWritten >= mSize) { //At the end or expected size reached
diff --git a/kded/filetransferjob.h b/kded/filetransferjob.h
index 69425e0..3c3db49 100644
--- a/kded/filetransferjob.h
+++ b/kded/filetransferjob.h
@@ -22,6 +22,7 @@
 #define FILETRANSFERJOB_H
 
 #include <QIODevice>
+#include <QTime>
 #include <QTemporaryFile>
 
 #include <KJob>
@@ -50,6 +51,8 @@ private:
     QSharedPointer<QIODevice> mOrigin;
     KIO::FileJob* mDestination;
     QString mDeviceName;
+    QTime m_time;
+    qulonglong m_speedBytes;
     int mSize;
     int mWritten;
 

-- 
kdeconnect packaging