filetransfer: remove dataCallback from interface

this is highly questionable. single-arg download calls will misbehave
with it set, and two-arg download calls will just overwrite it. being
an implementation detail this should not have been in the API at all.

Change-Id: I613772951ee03d8302366085f06a53601d13f132

src/libstore/filetransfer.cc

@@ -49,6 +49,7 @@ struct curlFileTransfer : public FileTransfer
         Activity act;
         bool done = false; // whether either the success or failure function has been called
         Callback<FileTransferResult> callback;
+        std::function<void(std::string_view data)> dataCallback;
         CURL * req = 0;
         bool active = false; // whether the handle has been added to the multi object
         bool headersProcessed = false;
@@ -82,20 +83,22 @@ struct curlFileTransfer : public FileTransfer
 
         TransferItem(curlFileTransfer & fileTransfer,
             const FileTransferRequest & request,
-            Callback<FileTransferResult> && callback)
+            Callback<FileTransferResult> && callback,
+            std::function<void(std::string_view data)> dataCallback)
             : fileTransfer(fileTransfer)
             , request(request)
             , act(*logger, lvlTalkative, actFileTransfer,
                 fmt(request.data ? "uploading '%s'" : "downloading '%s'", request.uri),
                 {request.uri}, request.parentAct)
             , callback(std::move(callback))
+            , dataCallback(std::move(dataCallback))
             , finalSink([this](std::string_view data) {
                 auto httpStatus = getHTTPStatus();
                     /* Only write data to the sink if this is a
                        successful response. */
-                if (successfulStatuses.count(httpStatus) && this->request.dataCallback) {
+                if (successfulStatuses.count(httpStatus) && this->dataCallback) {
                     writtenToSink += data.size();
-                    this->request.dataCallback(data);
+                    this->dataCallback(data);
                 } else
                     this->result.data.append(data);
               })
@@ -455,7 +458,7 @@ struct curlFileTransfer : public FileTransfer
                    ranged requests. */
                 if (err == Transient
                     && attempt < request.tries
-                    && (!this->request.dataCallback
+                    && (!this->dataCallback
                         || writtenToSink == 0
                         || (acceptRanges && encoding.empty())))
                 {
@@ -665,6 +668,13 @@ struct curlFileTransfer : public FileTransfer
 
     void enqueueFileTransfer(const FileTransferRequest & request,
         Callback<FileTransferResult> callback) override
+    {
+        enqueueFileTransfer(request, std::move(callback), {});
+    }
+
+    void enqueueFileTransfer(const FileTransferRequest & request,
+        Callback<FileTransferResult> callback,
+        std::function<void(std::string_view data)> dataCallback)
     {
         /* Ugly hack to support s3:// URIs. */
         if (request.uri.starts_with("s3://")) {
@@ -694,7 +704,9 @@ struct curlFileTransfer : public FileTransfer
             return;
         }
 
-        enqueueItem(std::make_shared<TransferItem>(*this, request, std::move(callback)));
+        enqueueItem(std::make_shared<TransferItem>(
+            *this, request, std::move(callback), std::move(dataCallback)
+        ));
     }
 
     void download(FileTransferRequest && request, Sink & sink) override
@@ -724,8 +736,19 @@ struct curlFileTransfer : public FileTransfer
             state->request.notify_one();
         });
 
-        request.dataCallback = [_state](std::string_view data) {
+        enqueueFileTransfer(request,
-
+            {[_state](std::future<FileTransferResult> fut) {
+                auto state(_state->lock());
+                state->quit = true;
+                try {
+                    fut.get();
+                } catch (...) {
+                    state->exc = std::current_exception();
+                }
+                state->avail.notify_one();
+                state->request.notify_one();
+            }},
+            [_state](std::string_view data) {
                 auto state(_state->lock());
 
                 if (state->quit) return;
@@ -744,20 +767,7 @@ struct curlFileTransfer : public FileTransfer
                 thread. */
                 state->data.append(data);
                 state->avail.notify_one();
-        };
+            });
-
-        enqueueFileTransfer(request,
-            {[_state](std::future<FileTransferResult> fut) {
-                auto state(_state->lock());
-                state->quit = true;
-                try {
-                    fut.get();
-                } catch (...) {
-                    state->exc = std::current_exception();
-                }
-                state->avail.notify_one();
-                state->request.notify_one();
-            }});
 
         while (true) {
             checkInterrupt();

src/libstore/filetransfer.hh

@@ -61,7 +61,6 @@ struct FileTransferRequest
     ActivityId parentAct;
     std::optional<std::string> data;
     std::string mimeType;
-    std::function<void(std::string_view data)> dataCallback;
 
     FileTransferRequest(std::string_view uri)
         : uri(uri), parentAct(getCurActivity()) { }