gvfs-helper: add the `endpoint` command

We already have the `config` command that accesses the `gvfs/config`
endpoint.

To implement `scalar`, we also need to be able to access the `vsts/info`
endpoint. Let's add a command to do precisely that.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin 2021-04-26 17:31:40 +02:00
Родитель 1b6ffdec72
Коммит 2223dbf43d
1 изменённых файлов: 54 добавлений и 7 удалений

Просмотреть файл

@ -202,6 +202,12 @@
// [2] Documentation/technical/long-running-process-protocol.txt // [2] Documentation/technical/long-running-process-protocol.txt
// [3] See GIT_TRACE_PACKET // [3] See GIT_TRACE_PACKET
// //
// endpoint
//
// Fetch the given endpoint from the main Git server (specifying
// `gvfs/config` as endpoint is idempotent to the `config`
// command mentioned above).
//
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
#include "cache.h" #include "cache.h"
@ -3110,18 +3116,20 @@ static void do_req__with_fallback(const char *url_component,
* *
* Return server's response buffer. This is probably a raw JSON string. * Return server's response buffer. This is probably a raw JSON string.
*/ */
static void do__http_get__gvfs_config(struct gh__response_status *status, static void do__http_get__simple_endpoint(struct gh__response_status *status,
struct strbuf *config_data) struct strbuf *response,
const char *endpoint,
const char *tr2_label)
{ {
struct gh__request_params params = GH__REQUEST_PARAMS_INIT; struct gh__request_params params = GH__REQUEST_PARAMS_INIT;
strbuf_addstr(&params.tr2_label, "GET/config"); strbuf_addstr(&params.tr2_label, tr2_label);
params.b_is_post = 0; params.b_is_post = 0;
params.b_write_to_file = 0; params.b_write_to_file = 0;
/* cache-servers do not handle gvfs/config REST calls */ /* cache-servers do not handle gvfs/config REST calls */
params.b_permit_cache_server_if_defined = 0; params.b_permit_cache_server_if_defined = 0;
params.buffer = config_data; params.buffer = response;
params.objects_mode = GH__OBJECTS_MODE__NONE; params.objects_mode = GH__OBJECTS_MODE__NONE;
params.object_count = 1; /* a bit of a lie */ params.object_count = 1; /* a bit of a lie */
@ -3143,15 +3151,22 @@ static void do__http_get__gvfs_config(struct gh__response_status *status,
* see any need to report progress on the upload side of * see any need to report progress on the upload side of
* the GET. So just report progress on the download side. * the GET. So just report progress on the download side.
*/ */
strbuf_addstr(&params.progress_base_phase3_msg, strbuf_addf(&params.progress_base_phase3_msg,
"Receiving gvfs/config"); "Receiving %s", endpoint);
} }
do_req__with_fallback("gvfs/config", &params, status); do_req__with_fallback(endpoint, &params, status);
gh__request_params__release(&params); gh__request_params__release(&params);
} }
static void do__http_get__gvfs_config(struct gh__response_status *status,
struct strbuf *config_data)
{
do__http_get__simple_endpoint(status, config_data, "gvfs/config",
"GET/config");
}
static void setup_gvfs_objects_progress(struct gh__request_params *params, static void setup_gvfs_objects_progress(struct gh__request_params *params,
unsigned long num, unsigned long den) unsigned long num, unsigned long den)
{ {
@ -3596,6 +3611,35 @@ static enum gh__error_code do_sub_cmd__config(int argc, const char **argv)
return ec; return ec;
} }
static enum gh__error_code do_sub_cmd__endpoint(int argc, const char **argv)
{
struct gh__response_status status = GH__RESPONSE_STATUS_INIT;
struct strbuf data = STRBUF_INIT;
enum gh__error_code ec = GH__ERROR_CODE__OK;
const char *endpoint;
if (argc != 2)
return GH__ERROR_CODE__ERROR;
endpoint = argv[1];
trace2_cmd_mode(endpoint);
finish_init(0);
do__http_get__simple_endpoint(&status, &data, endpoint, endpoint);
ec = status.ec;
if (ec == GH__ERROR_CODE__OK)
printf("%s\n", data.buf);
else
error("config: %s", status.error_message.buf);
gh__response_status__release(&status);
strbuf_release(&data);
return ec;
}
/* /*
* Read a list of objects from stdin and fetch them as a series of * Read a list of objects from stdin and fetch them as a series of
* single object HTTP GET requests. * single object HTTP GET requests.
@ -4087,6 +4131,9 @@ static enum gh__error_code do_sub_cmd(int argc, const char **argv)
if (!strcmp(argv[0], "config")) if (!strcmp(argv[0], "config"))
return do_sub_cmd__config(argc, argv); return do_sub_cmd__config(argc, argv);
if (!strcmp(argv[0], "endpoint"))
return do_sub_cmd__endpoint(argc, argv);
if (!strcmp(argv[0], "prefetch")) if (!strcmp(argv[0], "prefetch"))
return do_sub_cmd__prefetch(argc, argv); return do_sub_cmd__prefetch(argc, argv);