Commit f434c690cc7f5e47f122f54fa13ec26a533090ac
2021-04-22T12:52:55
tools: change xkbcli list to output YAML We have a lot of keyboard layouts and the current output format is virtually useless at searching for a specific one to debug any issues with either the layout list or the output from libxkbregistry. Let's use YAML instead because that can easily be post-processed to extract the specific layouts wanted, e.g. to get the list of all layouts: xkbcli-list | yq -r ".layouts[].layout" to get the list of all variants of the "us" layout: xkbcli-list | yq -r '.layouts[] | select(.layout == "us") | .variant and the number of option groups: xkbcli-list | yq -r '.option_groups[] | length' Note that the top-level nodes have been de-capitalized, so where it was "Models" before it is now "models" and the "Options" node is now "option_groups". Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107
diff --git a/tools/registry-list.c b/tools/registry-list.c
index d8848ac..6895e91 100644
--- a/tools/registry-list.c
+++ b/tools/registry-list.c
@@ -136,11 +136,13 @@ main(int argc, char **argv)
goto err;
}
- printf("Models:\n");
+ printf("models:\n");
m = rxkb_model_first(ctx);
assert(m); /* Empty model list is usually a bug or a bad xml file */
while (m) {
- printf("- %s:%s:%s\n",
+ printf("- name: %s\n"
+ " vendor: %s\n"
+ " description: %s\n",
rxkb_model_get_name(m),
rxkb_model_get_vendor(m),
rxkb_model_get_description(m));
@@ -148,7 +150,7 @@ main(int argc, char **argv)
}
printf("\n");
- printf("Layouts:\n");
+ printf("layouts:\n");
l = rxkb_layout_first(ctx);
assert(l); /* Empty layout list is usually a bug or a bad xml file */
while (l) {
@@ -157,56 +159,62 @@ main(int argc, char **argv)
const char *variant = rxkb_layout_get_variant(l);
const char *brief = rxkb_layout_get_brief(l);
- printf("- %s%s%s%s:%s:%s",
+ printf("- layout: %s\n"
+ " variant: %s\n"
+ " brief: %s\n"
+ " description: %s\n",
rxkb_layout_get_name(l),
- variant ? "(" : "",
- variant ? variant : "",
- variant ? ")" : "",
- brief ? brief : "",
+ variant ? variant : "''",
+ brief ? brief : "''",
rxkb_layout_get_description(l));
+ printf(" iso639: [");
iso639 = rxkb_layout_get_iso639_first(l);
if (iso639) {
const char *sep = "";
- printf(":iso639-");
while (iso639) {
printf("%s%s", sep, rxkb_iso639_code_get_code(iso639));
iso639 = rxkb_iso639_code_next(iso639);
- sep = ",";
+ sep = ", ";
}
}
+ printf("]\n");
+ printf(" iso3166: [");
iso3166 = rxkb_layout_get_iso3166_first(l);
if (iso3166) {
const char *sep = "";
- printf(":iso3166-");
while (iso3166) {
printf("%s%s", sep, rxkb_iso3166_code_get_code(iso3166));
iso3166 = rxkb_iso3166_code_next(iso3166);
- sep = ",";
+ sep = ", ";
}
}
-
- printf("\n");
+ printf("]\n");
l = rxkb_layout_next(l);
}
printf("\n");
- printf("Options:\n");
+ printf("option_groups:\n");
g = rxkb_option_group_first(ctx);
assert(g); /* Empty option goups list is usually a bug or a bad xml file */
while (g) {
struct rxkb_option *o;
- printf("- %s:%s (%s)\n",
+ printf("- name: %s\n"
+ " description: %s\n"
+ " allows_multiple: %s\n"
+ " options:\n",
rxkb_option_group_get_name(g),
rxkb_option_group_get_description(g),
- rxkb_option_group_allows_multiple(g) ? "multiple" : "single");
+ rxkb_option_group_allows_multiple(g) ? "true" : "false");
o = rxkb_option_first(g);
assert(o); /* Empty option list is usually a bug or a bad xml file */
while (o) {
const char *brief = rxkb_option_get_brief(o);
- printf(" - %s:%s:%s\n",
+ printf(" - name: '%s'\n"
+ " brief: '%s'\n"
+ " description: '%s'\n",
rxkb_option_get_name(o),
brief ? brief : "",
rxkb_option_get_description(o));