lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

libstore: de-future-ize FileTransfer::enqueueUpload

Browse source 
it's only used once, and synchronously at that.

Change-Id: Ife9db15dd97bc0de8de59a25d27f3f7afeb8791b
This commit is contained in:
eldritch horrors 2024-10-27 18:27:11 +01:00
parent 6f18e1ebde
commit 5cd7055044
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/filetransfer.cc
View file

@ -663,10 +663,9 @@ struct curlFileTransfer : public FileTransfer
return enqueueFileTransfer(uri, headers, std::nullopt, false); return enqueueFileTransfer(uri, headers, std::nullopt, false);
} }
std::future<FileTransferResult> void upload(const std::string & uri, std::string data, const Headers & headers) override
enqueueUpload(const std::string & uri, std::string data, const Headers & headers) override
{ {
return enqueueFileTransfer(uri, headers, std::move(data), false); enqueueFileTransfer(uri, headers, std::move(data), false).get();
} }
std::future<FileTransferResult> enqueueFileTransfer( std::future<FileTransferResult> enqueueFileTransfer(

4
src/libstore/filetransfer.hh
View file

@ -80,8 +80,8 @@ struct FileTransfer
/** /**
* Upload some data. May throw a FileTransferError exception. * Upload some data. May throw a FileTransferError exception.
*/ */
virtual std::future<FileTransferResult> virtual void
enqueueUpload(const std::string & uri, std::string data, const Headers & headers = {}) = 0; upload(const std::string & uri, std::string data, const Headers & headers = {}) = 0;
/** /**
* Checks whether the given URI exists. For historical reasons this function * Checks whether the given URI exists. For historical reasons this function

4
src/libstore/http-binary-cache-store.cc
View file

@ -127,9 +127,7 @@ protected:
{ {
auto data = StreamToSourceAdapter(istream).drain(); auto data = StreamToSourceAdapter(istream).drain();
try { try {
getFileTransfer() getFileTransfer()->upload(makeURI(path), std::move(data), {{"Content-Type", mimeType}});
->enqueueUpload(makeURI(path), std::move(data), {{"Content-Type", mimeType}})
.get();
} catch (FileTransferError & e) { } catch (FileTransferError & e) {
throw UploadToHTTP( throw UploadToHTTP(
"while uploading to HTTP binary cache at '%s': %s", cacheUri, e.msg() "while uploading to HTTP binary cache at '%s': %s", cacheUri, e.msg()