From 794102b32cb9b9c0ddb0c8268c572acb256dd6ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 30 Apr 2017 02:54:37 +0200 Subject: NOISSUE less jumpy download progress bars and redirect URL fix --- api/logic/net/NetJob.cpp | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'api/logic/net/NetJob.cpp') diff --git a/api/logic/net/NetJob.cpp b/api/logic/net/NetJob.cpp index cf04998f..ff2c711b 100644 --- a/api/logic/net/NetJob.cpp +++ b/api/logic/net/NetJob.cpp @@ -69,14 +69,16 @@ void NetJob::partProgress(qint64 bytesReceived, qint64 bytesTotal) void NetJob::setPartProgress(int index, qint64 bytesReceived, qint64 bytesTotal) { auto &slot = m_parts[index]; - - current_progress -= slot.current_progress; slot.current_progress = bytesReceived; - current_progress += slot.current_progress; - - total_progress -= slot.total_progress; slot.total_progress = bytesTotal; - total_progress += slot.total_progress; + qint64 current_progress = m_done.count() * 100; + qint64 total_progress = m_parts.count() * 100; + for(auto iter = m_doing.begin(); iter != m_doing.end(); iter++) + { + auto &part = m_parts[*iter]; + float percentage = (float(part.current_progress) / float(part.total_progress)) * 100.0f; + current_progress += (qint64) percentage; + } setProgress(current_progress, total_progress); } @@ -196,14 +198,8 @@ void NetJob::addNetAction(NetActionPtr action) } m_parts.append(pi); - total_progress += pi.total_progress; - current_progress += pi.current_progress; - - // if this is already running, the action needs to be started right away! if (isRunning()) { - setProgress(current_progress, total_progress); - connectAction(action.get()); - action->start(); + m_todo.enqueue(m_parts.size() - 1); } } -- cgit v1.2.3