mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

auc: use /json/v1/ 

Currently `auc` uses the outdated /json/ path, this commit uses
/json/v1/ to be more future proof.

Signed-off-by: Paul Spooren <mail@aparcar.org>
This commit is contained in:
Paul Spooren 2021-09-23 14:18:44 -10:00
parent ff68df2faa
commit 69b5c28929
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
utils/auc/src/auc.c
View File

@ -46,6 +46,7 @@
#define API_BRANCHES "branches" #define API_BRANCHES "branches"
#define API_INDEX "index" #define API_INDEX "index"
#define API_JSON "json" #define API_JSON "json"
#define API_JSON_VERSION "v1"
#define API_JSON_EXT "." API_JSON #define API_JSON_EXT "." API_JSON
#define API_PACKAGES "packages" #define API_PACKAGES "packages"
#define API_REQUEST "api/v1/build" #define API_REQUEST "api/v1/build"
@ -1198,8 +1199,8 @@ static void process_branch(struct blob_attr *branch, bool only_active)
continue; continue;
} }
asprintf(&board_json_file, "%s/%s/%s/%s/%s/%s%s", serverurl, API_JSON, asprintf(&board_json_file, "%s/%s/%s/%s/%s/%s/%s%s", serverurl, API_JSON,
br->path, API_TARGETS, target, board_name, API_JSON_EXT); API_JSON_VERSION, br->path, API_TARGETS, target, board_name, API_JSON_EXT);
tmp = board_json_file; tmp = board_json_file;
while ((tmp = strchr(tmp, ','))) while ((tmp = strchr(tmp, ',')))
*tmp = '_'; *tmp = '_';
@ -1225,8 +1226,8 @@ static int request_branches(bool only_active)
struct blob_attr *data; struct blob_attr *data;
blobmsg_buf_init(&brbuf); blobmsg_buf_init(&brbuf);
snprintf(url, sizeof(url), "%s/%s/%s%s", serverurl, API_JSON, snprintf(url, sizeof(url), "%s/%s/%s/%s%s", serverurl, API_JSON,
API_BRANCHES, API_JSON_EXT); API_JSON_VERSION, API_BRANCHES, API_JSON_EXT);
if ((rc = server_request(url, NULL, &brbuf))) { if ((rc = server_request(url, NULL, &brbuf))) {
blob_buf_free(&brbuf); blob_buf_free(&brbuf);
@ -1366,8 +1367,8 @@ static int request_packages(struct branch *branch)
fprintf(stderr, "Requesting package lists...\n"); fprintf(stderr, "Requesting package lists...\n");
blobmsg_buf_init(&archpkgbuf); blobmsg_buf_init(&archpkgbuf);
snprintf(url, sizeof(url), "%s/%s/%s/%s/%s/%s%s", serverurl, API_JSON, snprintf(url, sizeof(url), "%s/%s/%s/%s/%s/%s/%s%s", serverurl, API_JSON,
branch->path, API_TARGETS, target, API_INDEX, API_JSON_EXT); API_JSON_VERSION, branch->path, API_TARGETS, target, API_INDEX, API_JSON_EXT);
if ((rc = server_request(url, NULL, &archpkgbuf))) { if ((rc = server_request(url, NULL, &archpkgbuf))) {
blob_buf_free(&archpkgbuf); blob_buf_free(&archpkgbuf);
return rc; return rc;
@ -1380,8 +1381,9 @@ static int request_packages(struct branch *branch)
return ret; return ret;
blobmsg_buf_init(&pkgbuf); blobmsg_buf_init(&pkgbuf);
snprintf(url, sizeof(url), "%s/%s/%s/%s/%s-%s%s", serverurl, API_JSON, snprintf(url, sizeof(url), "%s/%s/%s/%s/%s/%s-%s%s", serverurl, API_JSON,
branch->path, API_PACKAGES, branch->arch_packages, API_INDEX, API_JSON_EXT); API_JSON_VERSION, branch->path, API_PACKAGES, branch->arch_packages,
API_INDEX, API_JSON_EXT);
if ((rc = server_request(url, NULL, &pkgbuf))) { if ((rc = server_request(url, NULL, &pkgbuf))) {
blob_buf_free(&archpkgbuf); blob_buf_free(&archpkgbuf);
blob_buf_free(&pkgbuf); blob_buf_free(&pkgbuf);