tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix reported file transfer speed

Browse source 
Don't mix milliseconds and seconds
Start calculating in the beginning
Output the requested file size
This commit is contained in:
Aleix Pol 2017-08-01 22:45:28 +02:00
parent af778b71b1
commit d61d52ac1f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/filetransferjob.cpp
View file

@ -50,7 +50,7 @@ FileTransferJob::FileTransferJob(const QSharedPointer<QIODevice>& origin, qint64
}
setCapabilities(Killable);
qCDebug(KDECONNECT_CORE) << "FileTransferJob Downloading payload to" << destination;
qCDebug(KDECONNECT_CORE) << "FileTransferJob Downloading payload to" << destination << "size:" << size;
}
void FileTransferJob::start()
@ -84,7 +84,6 @@ void FileTransferJob::startTransfer()
return;
setProcessedAmount(Bytes, 0);
mTimer.start();
description(this, i18n("Receiving file over KDE Connect"),
{ i18nc("File transfer origin", "From"), mFrom },
{ i18nc("File transfer destination", "To"), mDestination.toLocalFile() });
@ -94,11 +93,13 @@ void FileTransferJob::startTransfer()
mReply = Daemon::instance()->networkAccessManager()->put(req, mOrigin.data());
connect(mReply, &QNetworkReply::uploadProgress, this, [this](qint64 bytesSent, qint64 /*bytesTotal*/) {
if (!mTimer.isValid())
mTimer.start();
setProcessedAmount(Bytes, bytesSent);
const auto elapsed = mTimer.elapsed();
if (elapsed > 0) {
emitSpeed(bytesSent / elapsed);
emitSpeed(1000 * (bytesSent / elapsed));
}
});
connect(mReply, static_cast<void (QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::error),