RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 21:47:46 +00:00
Code Issues Activity Actions

ProtocolServer: Implement and handle download progress

Browse source 
Also updates `pro` to display download progress and speed on stderr
This commit is contained in:
AnotherTest 2020-05-03 09:01:06 +04:30 • committed by Andreas Kling
parent c6825a96c7
commit 06cf9d3fb7
14 changed files with 97 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Libraries/LibCore/NetworkJob.cpp
View file

@ -78,6 +78,16 @@ void NetworkJob::did_fail(Error error)
shutdown();
}
void NetworkJob::did_progress(Optional<u32> total_size, u32 downloaded)
{
// NOTE: We protect ourselves here, since the callback may otherwise
// trigger destruction of this job somehow.
NonnullRefPtr<NetworkJob> protector(*this);
if (on_progress)
on_progress(total_size, downloaded);
}
const char* to_string(NetworkJob::Error error)
{
switch (error) {

2
Libraries/LibCore/NetworkJob.h
View file

@ -44,6 +44,7 @@ public:
virtual ~NetworkJob() override;
Function<void(bool success)> on_finish;
Function<void(Optional<u32>, u32)> on_progress;
bool is_cancelled() const { return m_error == Error::Cancelled; }
bool has_error() const { return m_error != Error::None; }
@ -64,6 +65,7 @@ protected:
NetworkJob();
void did_finish(NonnullRefPtr<NetworkResponse>&&);
void did_fail(Error);
void did_progress(Optional<u32> total_size, u32 downloaded);
private:
RefPtr<NetworkResponse> m_response;

18
Libraries/LibHTTP/HttpJob.cpp
View file

@ -156,11 +156,23 @@ void HttpJob::on_socket_connected()
m_received_size += payload.size();
auto content_length_header = m_headers.get("Content-Length");
Optional<u32> content_length {};
if (content_length_header.has_value()) {
bool ok;
auto content_length = content_length_header.value().to_uint(ok);
if (ok && m_received_size >= content_length) {
m_received_size = content_length;
auto length = content_length_header.value().to_uint(ok);
if (ok)
content_length = length;
}
deferred_invoke([this, content_length](auto&) {
did_progress(content_length, m_received_size);
});
if (content_length.has_value()) {
auto length = content_length.value();
if (m_received_size >= length) {
m_received_size = length;
finish_up();
}
}

21
Libraries/LibHTTP/HttpsJob.cpp
View file

@ -166,16 +166,25 @@ void HttpsJob::on_socket_connected()
m_received_size += payload.size();
auto content_length_header = m_headers.get("Content-Length");
Optional<u32> content_length {};
if (content_length_header.has_value()) {
bool ok;
auto content_length = content_length_header.value().to_uint(ok);
if (ok && m_received_size >= content_length) {
m_received_size = content_length;
auto length = content_length_header.value().to_uint(ok);
if (ok)
content_length = length;
}
// This needs to be synchronous
// FIXME: Somehow enforce that this should not modify anything
did_progress(content_length, m_received_size);
if (content_length.has_value()) {
auto length = content_length.value();
if (m_received_size >= length) {
m_received_size = length;
finish_up();
}
} else {
// no content-length, assume closed connection
finish_up();
}
};
}

2
Libraries/LibProtocol/Download.cpp
View file

@ -55,7 +55,7 @@ void Download::did_finish(Badge<Client>, bool success, u32 total_size, i32 shbuf
on_finish(success, payload, move(shared_buffer));
}
void Download::did_progress(Badge<Client>, u32 total_size, u32 downloaded_size)
void Download::did_progress(Badge<Client>, Optional<u32> total_size, u32 downloaded_size)
{
if (on_progress)
on_progress(total_size, downloaded_size);

4
Libraries/LibProtocol/Download.h
View file

@ -47,10 +47,10 @@ public:
bool stop();
Function<void(bool success, const ByteBuffer& payload, RefPtr<SharedBuffer> payload_storage)> on_finish;
Function<void(u32 total_size, u32 downloaded_size)> on_progress;
Function<void(Optional<u32> total_size, u32 downloaded_size)> on_progress;
void did_finish(Badge<Client>, bool success, u32 total_size, i32 shbuf_id);
void did_progress(Badge<Client>, u32 total_size, u32 downloaded_size);
void did_progress(Badge<Client>, Optional<u32> total_size, u32 downloaded_size);
private:
explicit Download(Client&, i32 download_id);