WIP: json

Author: Duncaen

bin/xbps-query/defs.h

@@ -55,7 +55,7 @@ int	ownedby(struct xbps_handle *, const char *, bool, bool);
 int	list_manual_pkgs(struct xbps_handle *, xbps_object_t, const char *, void *, bool *);
 int	list_orphans(struct xbps_handle *, const char *);
 int	list_pkgs_pkgdb(struct xbps_handle *);
-int	list_pkgdb(struct xbps_handle *, int (*filter)(xbps_object_t), const char *format);
+int	list_pkgdb(struct xbps_handle *, int (*filter)(xbps_object_t), const char *format, int json);
 
 int	repo_list(struct xbps_handle *);
 

bin/xbps-query/list.c

@@ -36,6 +36,7 @@
 
 #include "defs.h"
 #include "xbps.h"
+#include "xbps/json.h"
 
 struct length_max_cb {
 	const char *key;
@@ -135,6 +136,7 @@ list_pkgs_pkgdb(struct xbps_handle *xhp)
 
 struct list_pkgdb_cb {
 	struct xbps_fmt *fmt;
+	struct xbps_json_printer *json;
 	int (*filter)(xbps_object_t obj);
 };
 
@@ -153,23 +155,33 @@ list_pkgdb_cb(struct xbps_handle *xhp UNUSED, xbps_object_t obj,
 			return 0;
 	}
 
-	r = xbps_fmt_dictionary(ctx->fmt, obj, stdout);
-	if (r < 0)
-		return r;
-	return 0;
+	if (ctx->fmt) {
+		r = xbps_fmt_dictionary(ctx->fmt, obj, stdout);
+	} else if (ctx->json) {
+		r = xbps_json_print_xbps_object(ctx->json, obj);
+	} else {
+		r = -ENOTSUP;
+	}
+	return r;
 }
 
 int
-list_pkgdb(struct xbps_handle *xhp, int (*filter)(xbps_object_t), const char *format)
+list_pkgdb(struct xbps_handle *xhp, int (*filter)(xbps_object_t), const char *format, int json)
 {
 	struct list_pkgdb_cb ctx = {.filter = filter};
+	struct xbps_json_printer pr = {0};
 	int r;
-
-	ctx.fmt = xbps_fmt_parse(format);
-	if (!ctx.fmt) {
-		r = -errno;
-		xbps_error_printf("failed to parse format: %s\n", strerror(-r));
-		return r;
+	if (json > 0) {
+		pr.indent = (json-1) * 2;
+		pr.file = stdout;
+		ctx.json = &pr;
+	} else if (format) {
+		ctx.fmt = xbps_fmt_parse(format);
+		if (!ctx.fmt) {
+			r = -errno;
+			xbps_error_printf("failed to parse format: %s\n", strerror(-r));
+			return r;
+		}
 	}
 	r = xbps_pkgdb_foreach_cb(xhp, list_pkgdb_cb, &ctx);
 	xbps_fmt_free(ctx.fmt);

bin/xbps-query/main.c

@@ -33,6 +33,8 @@
 #include <xbps.h>
 
 #include "defs.h"
+#include "xbps.h"
+#include "xbps/json.h"
 
 static void __attribute__((noreturn))
 usage(bool fail)
@@ -100,7 +102,7 @@ filter_repolock(xbps_object_t obj)
 int
 main(int argc, char **argv)
 {
-	const char *shortopts = "C:c:dF:f:hHiLlMmOo:p:Rr:s:S:VvX:x:";
+	const char *shortopts = "C:c:dF:f:hHiJLlMmOo:p:Rr:s:S:VvX:x:";
 	const struct option longopts[] = {
 		{ "config", required_argument, NULL, 'C' },
 		{ "cachedir", required_argument, NULL, 'c' },
@@ -137,6 +139,7 @@ main(int argc, char **argv)
 	bool list_pkgs, list_repos, orphans, own, list_repolock;
 	bool list_manual, list_hold, show_prop, show_files, show_deps, show_rdeps;
 	bool show, pkg_search, regex, repo_mode, opmode, fulldeptree;
+	int json = 0;
 
 	rootdir = cachedir = confdir = props = pkg = catfile = format = NULL;
 	flags = rv = c = 0;
@@ -165,6 +168,9 @@ main(int argc, char **argv)
 		case 'F':
 			format = optarg;
 			break;
+		case 'J':
+			json++;
+			break;
 		case 'H':
 			list_hold = opmode = true;
 			break;
@@ -286,20 +292,21 @@ main(int argc, char **argv)
 		rv = repo_list(&xh);
 
 	} else if (list_hold) {
-		rv = list_pkgdb(&xh, filter_hold, format ? format : "{pkgver}\n") < 0;
+		rv = list_pkgdb(&xh, filter_hold, format ? format : "{pkgver}\n", json) < 0;
 
 	} else if (list_repolock) {
-		rv = list_pkgdb(&xh, filter_repolock, format ? format : "{pkgver}\n") < 0;
+		rv = list_pkgdb(&xh, filter_repolock, format ? format : "{pkgver}\n", json) < 0;
 
 	} else if (list_manual) {
-		rv = list_pkgdb(&xh, filter_manual, format ? format : "{pkgver}\n") < 0;
+		rv = list_pkgdb(&xh, filter_manual, format ? format : "{pkgver}\n", json) < 0;
 
 	} else if (list_pkgs) {
 		/* list available pkgs */
-		if (format)
-			rv = list_pkgdb(&xh, NULL, format);
-		else
+		if (format || json > 0) {
+			rv = list_pkgdb(&xh, NULL, format, json);
+		} else {
 			rv = list_pkgs_pkgdb(&xh);
+		}
 
 	} else if (orphans) {
 		/* list pkg orphans */

include/xbps/json.h

@@ -0,0 +1,37 @@
+/* SPDX-FileCopyrightText: Copyright 2023 Duncan Overbruck <[email protected]> */
+/* SPDX-License-Identifier: BSD-2-Clause */
+#ifndef _XBPS_JSON_H_
+#define _XBPS_JSON_H_
+
+#include <stdio.h>
+#include <stdint.h>
+
+#include <xbps/xbps_array.h>
+#include <xbps/xbps_bool.h>
+#include <xbps/xbps_dictionary.h>
+#include <xbps/xbps_number.h>
+#include <xbps/xbps_object.h>
+#include <xbps/xbps_string.h>
+
+struct xbps_json_printer {
+	FILE *file;
+	unsigned depth;
+	uint8_t indent;
+	bool compact;
+};
+
+
+int xbps_json_printf(struct xbps_json_printer *p, const char *fmt, ...) __attribute__ ((format (printf, 2, 3)));
+int xbps_json_print_escape(struct xbps_json_printer *p, const char *s);
+int xbps_json_print_quote(struct xbps_json_printer *p, const char *s);
+int xbps_json_print_bool(struct xbps_json_printer *p, bool b);
+
+
+int xbps_json_print_xbps_string(struct xbps_json_printer *p, xbps_string_t str);
+int xbps_json_print_xbps_number(struct xbps_json_printer *p, xbps_number_t num);
+int xbps_json_print_xbps_boolean(struct xbps_json_printer *p, xbps_bool_t b);
+int xbps_json_print_xbps_array(struct xbps_json_printer *p, xbps_array_t array);
+int xbps_json_print_xbps_dictionary(struct xbps_json_printer *p, xbps_dictionary_t dict);
+int xbps_json_print_xbps_object(struct xbps_json_printer *p, xbps_object_t obj);
+
+#endif /* !_XBPS_JSON_H_ */

lib/Makefile

@@ -51,7 +51,7 @@ OBJS += plist_remove.o plist_fetch.o util.o util_path.o util_hash.o
 OBJS += repo.o repo_sync.o
 OBJS += rpool.o cb_util.o proplib_wrapper.o
 OBJS += package_alternatives.o
-OBJS += conf.o log.o format.o
+OBJS += conf.o log.o format.o json.o
 OBJS += $(EXTOBJS) $(COMPAT_OBJS)
 # unnecessary unless pkgdb format changes
 # OBJS += pkgdb_conversion.o

lib/format.c

@@ -28,6 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "xbps/json.h"
 #include "xbps_api_impl.h"
 #include "compat.h"
 
@@ -283,7 +284,7 @@ parse_default(const char **pos, struct xbps_fmt *fmt, struct strbuf *buf,
 }
 
 struct xbps_fmt_conv {
-	enum { HUMANIZE = 1, STRMODE } type;
+	enum { HUMANIZE = 1, STRMODE, JSON } type;
 	union {
 		struct humanize {
 			unsigned width    : 8;
@@ -361,6 +362,10 @@ parse_conversion(const char **pos, struct xbps_fmt *fmt, struct xbps_fmt_conv *c
 		fmt->conv->type = HUMANIZE;
 		*pos += sizeof("humanize");
 		return parse_humanize(pos, &fmt->conv->humanize);
+	} else if (strncmp(*pos + 1, "json", sizeof("json") - 1) == 0) {
+		fmt->conv->type = JSON;
+		*pos += sizeof("json");
+		return 0;
 	}
 	return -EINVAL;
 }
@@ -641,6 +646,12 @@ int
 xbps_fmt_print_string(const struct xbps_fmt *fmt, const char *str, size_t len, FILE *fp)
 {
 	const struct xbps_fmt_spec *spec = fmt->spec;
+
+	if (fmt->conv && fmt->conv->type == JSON) {
+		struct xbps_json_printer pr = {.file = fp};
+		return xbps_json_print_quote(&pr, str);
+	}
+
 	if (len == 0)
 		len = strlen(str);
 	if (spec && spec->align == '>' && spec->width > (unsigned)len) {
@@ -700,6 +711,7 @@ xbps_fmt_print_number(const struct xbps_fmt *fmt, int64_t d, FILE *fp)
 		switch (fmt->conv->type) {
 		case HUMANIZE: return humanize(&fmt->conv->humanize, fmt, d, fp);
 		case STRMODE:  return tostrmode(fmt, d, fp);
+		case JSON:     break;
 		}
 	}
 	if (spec) {
@@ -732,6 +744,10 @@ xbps_fmt_print_number(const struct xbps_fmt *fmt, int64_t d, FILE *fp)
 int
 xbps_fmt_print_object(const struct xbps_fmt *fmt, xbps_object_t obj, FILE *fp)
 {
+	if (fmt->conv && fmt->conv->type == JSON) {
+		struct xbps_json_printer pr = {.file = fp};
+		return xbps_json_print_xbps_object(&pr, obj);
+	}
 	switch (xbps_object_type(obj)) {
 	case XBPS_TYPE_BOOL:
 		return xbps_fmt_print_string(fmt, xbps_bool_true(obj) ? "true" : "false", 0, fp);