From: Toon Claes <toon@iotcl.com>
To: git@vger.kernel.org
Cc: Toon Claes <toon@iotcl.com>
Subject: [PATCH 2/4] http: add the ability to log progress
Date: Wed, 8 May 2024 14:44:51 +0200 [thread overview]
Message-ID: <20240508124453.600871-3-toon@iotcl.com> (raw)
In-Reply-To: <20240508124453.600871-1-toon@iotcl.com>
Add an option `progress` to `struct http_get_options` to allow the
caller to enable download progress using the progress.c API.
Signed-off-by: Toon Claes <toon@iotcl.com>
---
http.c | 32 ++++++++++++++++++++++++++++++++
http.h | 5 +++++
2 files changed, 37 insertions(+)
diff --git a/http.c b/http.c
index 3d80bd6116..15c5d53712 100644
--- a/http.c
+++ b/http.c
@@ -10,6 +10,7 @@
#include "credential.h"
#include "version.h"
#include "pkt-line.h"
+#include "progress.h"
#include "gettext.h"
#include "trace.h"
#include "transport.h"
@@ -1457,6 +1458,9 @@ struct active_request_slot *get_active_slot(void)
curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
curl_easy_setopt(slot->curl, CURLOPT_FAILONERROR, 1);
curl_easy_setopt(slot->curl, CURLOPT_RANGE, NULL);
+ curl_easy_setopt(slot->curl, CURLOPT_NOPROGRESS, 1L);
+ curl_easy_setopt(slot->curl, CURLOPT_XFERINFODATA, NULL);
+ curl_easy_setopt(slot->curl, CURLOPT_XFERINFOFUNCTION, NULL);
/*
* Default following to off unless "ALWAYS" is configured; this gives
@@ -2017,6 +2021,21 @@ static void http_opt_request_remainder(CURL *curl, off_t pos)
#define HTTP_REQUEST_STRBUF 0
#define HTTP_REQUEST_FILE 1
+static int http_progress_callback(void *clientp, curl_off_t dltotal,
+ curl_off_t dlnow, curl_off_t ultotal,
+ curl_off_t ulnow)
+{
+ struct progress *progress = clientp;
+
+ if (progress) {
+ progress_set_total(progress, dltotal);
+ display_progress(progress, dlnow);
+ display_throughput(progress, dlnow);
+ }
+
+ return 0;
+}
+
static int http_request(const char *url,
void *result, int target,
const struct http_get_options *options)
@@ -2025,6 +2044,7 @@ static int http_request(const char *url,
struct slot_results results;
struct curl_slist *headers = http_copy_default_headers();
struct strbuf buf = STRBUF_INIT;
+ struct progress *progress = NULL;
const char *accept_language;
int ret;
@@ -2061,6 +2081,13 @@ static int http_request(const char *url,
if (options && options->initial_request &&
http_follow_config == HTTP_FOLLOW_INITIAL)
curl_easy_setopt(slot->curl, CURLOPT_FOLLOWLOCATION, 1);
+ if (options && options->progress) {
+ progress = start_progress(_("Downloading via HTTP"), 0);
+
+ curl_easy_setopt(slot->curl, CURLOPT_NOPROGRESS, 0L);
+ curl_easy_setopt(slot->curl, CURLOPT_XFERINFODATA, progress);
+ curl_easy_setopt(slot->curl, CURLOPT_XFERINFOFUNCTION, &http_progress_callback);
+ }
headers = curl_slist_append(headers, buf.buf);
@@ -2079,6 +2106,11 @@ static int http_request(const char *url,
ret = run_one_slot(slot, &results);
+ if (progress) {
+ curl_easy_setopt(slot->curl, CURLOPT_XFERINFODATA, NULL);
+ stop_progress(&progress);
+ }
+
if (options && options->content_type) {
struct strbuf raw = STRBUF_INIT;
curlinfo_strbuf(slot->curl, CURLINFO_CONTENT_TYPE, &raw);
diff --git a/http.h b/http.h
index 3af19a8bf5..37ecddec17 100644
--- a/http.h
+++ b/http.h
@@ -146,6 +146,11 @@ struct http_get_options {
* request has completed.
*/
struct string_list *extra_headers;
+
+ /*
+ * If not zero, display the progress.
+ */
+ int progress;
};
/* Return values for http_get_*() */
--
2.44.0.651.g21306a098c
next prev parent reply other threads:[~2024-05-08 12:45 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-08 12:44 [PATCH 0/4] bundle-uri: show progress when downloading from bundle URIs Toon Claes
2024-05-08 12:44 ` [PATCH 1/4] progress: add function to set total Toon Claes
2024-05-08 12:44 ` Toon Claes [this message]
2024-05-08 16:52 ` [PATCH 2/4] http: add the ability to log progress Eric Sunshine
2024-05-09 16:34 ` Jeff King
2024-05-09 16:51 ` Junio C Hamano
2024-05-09 17:04 ` Jeff King
2024-05-09 16:52 ` Jeff King
2024-05-08 12:44 ` [PATCH 3/4] remote-curl: optionally show progress for HTTP get Toon Claes
2024-05-08 22:29 ` Junio C Hamano
2024-05-08 12:44 ` [PATCH 4/4] bundle-uri: enable git-remote-https progress Toon Claes
2024-05-09 16:46 ` Jeff King
2025-02-14 11:26 ` Toon Claes
2025-02-21 7:36 ` Jeff King
2024-05-08 23:49 ` [PATCH 0/4] bundle-uri: show progress when downloading from bundle URIs Junio C Hamano
2025-02-19 14:30 ` [PATCH v2 0/7] Show " Toon Claes
2025-02-19 14:30 ` [PATCH v2 1/7] progress: add function to set total Toon Claes
2025-02-21 7:43 ` Jeff King
2025-02-19 14:30 ` [PATCH v2 2/7] progress: allow pure-throughput progress meters Toon Claes
2025-02-19 14:30 ` [PATCH v2 3/7] http: turn off curl signals Toon Claes
2025-02-19 14:30 ` [PATCH v2 4/7] http: add the ability to log progress Toon Claes
2025-02-19 14:30 ` [PATCH v2 5/7] remote-curl: optionally show progress for HTTP get Toon Claes
2025-02-19 14:30 ` [PATCH v2 6/7] bundle-uri: enable git-remote-https progress Toon Claes
2025-02-19 14:30 ` [PATCH v2 7/7] http: silence stderr when progress is enabled Toon Claes
2025-02-21 7:48 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240508124453.600871-3-toon@iotcl.com \
--to=toon@iotcl.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).