From db297d3dda12306459341da01e9892b4df2d6d37 Mon Sep 17 00:00:00 2001
From: Philipp Otterbein <potterbein@blockstream.com>
Date: Wed, 12 Mar 2025 00:50:20 +0100
Subject: [PATCH] libstore: same progress bar behavior for PUT and POST
requests
- no differentiation between uploads and downloads in CLI
---
src/libstore/filetransfer.cc | 24 +++++--------------
.../include/nix/store/filetransfer.hh | 2 +-
2 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc
index d00330601..a917188d9 100644
--- a/src/libstore/filetransfer.cc
+++ b/src/libstore/filetransfer.cc
@@ -93,7 +93,7 @@ struct curlFileTransfer : public FileTransfer
: fileTransfer(fileTransfer)
, request(request)
, act(*logger, lvlTalkative, actFileTransfer,
- request.post ? "" : fmt(request.data ? "uploading '%s'" : "downloading '%s'", request.uri),
+ fmt("%sing '%s'", request.verb(), request.uri),
{request.uri}, request.parentAct)
, callback(std::move(callback))
, finalSink([this](std::string_view data) {
@@ -270,19 +270,11 @@ struct curlFileTransfer : public FileTransfer
return getInterrupted();
}
- int silentProgressCallback(curl_off_t dltotal, curl_off_t dlnow)
- {
- return getInterrupted();
- }
-
static int progressCallbackWrapper(void * userp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
{
- return ((TransferItem *) userp)->progressCallback(dltotal, dlnow);
- }
-
- static int silentProgressCallbackWrapper(void * userp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
- {
- return ((TransferItem *) userp)->silentProgressCallback(dltotal, dlnow);
+ auto & item = *static_cast<TransferItem *>(userp);
+ auto isUpload = bool(item.request.data);
+ return item.progressCallback(isUpload ? ultotal : dltotal, isUpload ? ulnow : dlnow);
}
static int debugCallback(CURL * handle, curl_infotype type, char * data, size_t size, void * userptr)
@@ -349,10 +341,7 @@ struct curlFileTransfer : public FileTransfer
curl_easy_setopt(req, CURLOPT_HEADERFUNCTION, TransferItem::headerCallbackWrapper);
curl_easy_setopt(req, CURLOPT_HEADERDATA, this);
- if (request.post)
- curl_easy_setopt(req, CURLOPT_XFERINFOFUNCTION, silentProgressCallbackWrapper);
- else
- curl_easy_setopt(req, CURLOPT_XFERINFOFUNCTION, progressCallbackWrapper);
+ curl_easy_setopt(req, CURLOPT_XFERINFOFUNCTION, progressCallbackWrapper);
curl_easy_setopt(req, CURLOPT_XFERINFODATA, this);
curl_easy_setopt(req, CURLOPT_NOPROGRESS, 0);
@@ -445,8 +434,7 @@ struct curlFileTransfer : public FileTransfer
if (httpStatus == 304 && result.etag == "")
result.etag = request.expectedETag;
- if (!request.post)
- act.progress(result.bodySize, result.bodySize);
+ act.progress(result.bodySize, result.bodySize);
done = true;
callback(std::move(result));
}
diff --git a/src/libstore/include/nix/store/filetransfer.hh b/src/libstore/include/nix/store/filetransfer.hh
index b0fe8fcce..f9b1f620f 100644
--- a/src/libstore/include/nix/store/filetransfer.hh
+++ b/src/libstore/include/nix/store/filetransfer.hh
@@ -77,7 +77,7 @@ struct FileTransferRequest
FileTransferRequest(std::string_view uri)
: uri(uri), parentAct(getCurActivity()) { }
- std::string verb()
+ std::string verb() const
{
return data ? "upload" : "download";
}