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

set total amount later

Browse source 
Otherwise the kwidgetjobtracker wouldn't notice it and it wouldn't be
reported properly.
This commit is contained in:
Aleix Pol 2017-08-02 01:48:37 +02:00
parent d1d84bc464
commit 364ab02aad
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/filetransferjob.cpp
View file

@ -37,6 +37,7 @@ FileTransferJob::FileTransferJob(const QSharedPointer<QIODevice>& origin, qint64
, mDestination(destination) , mDestination(destination)
, mSpeedBytes(0) , mSpeedBytes(0)
, mWritten(0) , mWritten(0)
, mSize(size)
{ {
Q_ASSERT(mOrigin); Q_ASSERT(mOrigin);
Q_ASSERT(mOrigin->isReadable()); Q_ASSERT(mOrigin->isReadable());
@ -45,10 +46,6 @@ FileTransferJob::FileTransferJob(const QSharedPointer<QIODevice>& origin, qint64
mDestination.setScheme(QStringLiteral("file")); mDestination.setScheme(QStringLiteral("file"));
} }
if (size >= 0) {
setTotalAmount(Bytes, size);
}
setCapabilities(Killable); setCapabilities(Killable);
qCDebug(KDECONNECT_CORE) << "FileTransferJob Downloading payload to" << destination << "size:" << size; qCDebug(KDECONNECT_CORE) << "FileTransferJob Downloading payload to" << destination << "size:" << size;
} }
@ -89,7 +86,10 @@ void FileTransferJob::startTransfer()
{ i18nc("File transfer destination", "To"), mDestination.toLocalFile() }); { i18nc("File transfer destination", "To"), mDestination.toLocalFile() });
QNetworkRequest req(mDestination); QNetworkRequest req(mDestination);
req.setHeader(QNetworkRequest::ContentLengthHeader, totalAmount(Bytes)); if (mSize >= 0) {
setTotalAmount(Bytes, mSize);
req.setHeader(QNetworkRequest::ContentLengthHeader, mSize);
}
mReply = Daemon::instance()->networkAccessManager()->put(req, mOrigin.data()); mReply = Daemon::instance()->networkAccessManager()->put(req, mOrigin.data());
connect(mReply, &QNetworkReply::uploadProgress, this, [this](qint64 bytesSent, qint64 /*bytesTotal*/) { connect(mReply, &QNetworkReply::uploadProgress, this, [this](qint64 bytesSent, qint64 /*bytesTotal*/) {

1
core/filetransferjob.h
View file

@ -72,6 +72,7 @@ private:
QElapsedTimer mTimer; QElapsedTimer mTimer;
qulonglong mSpeedBytes; qulonglong mSpeedBytes;
qint64 mWritten; qint64 mWritten;
qint64 mSize;
}; };
#endif #endif