From: David Sterba <dsterba@suse.cz>
To: Christoph Heiss <christoph@c8h4.io>
Cc: linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 7/7] btrfs-progs: subvol show: implement json format output
Date: Thu, 17 Aug 2023 22:02:26 +0200 [thread overview]
Message-ID: <20230817200226.GW2420@twin.jikos.cz> (raw)
In-Reply-To: <20230813094555.106052-8-christoph@c8h4.io>
On Sun, Aug 13, 2023 at 11:45:02AM +0200, Christoph Heiss wrote:
> Implements JSON-formatted output for the `subvolume list` command using
> the `--format json` global option, much like it is implemented for other
> commands.
>
> Signed-off-by: Christoph Heiss <christoph@c8h4.io>
> ---
> cmds/subvolume.c | 108 ++++++++++++++++++++++++++++++++++++++++++-----
> 1 file changed, 98 insertions(+), 10 deletions(-)
>
> diff --git a/cmds/subvolume.c b/cmds/subvolume.c
> index f7076655..1f513a4a 100644
> --- a/cmds/subvolume.c
> +++ b/cmds/subvolume.c
> @@ -1375,6 +1375,64 @@ static void print_subvolume_show_quota_text(const struct btrfs_util_subvolume_in
> pretty_size_mode(stats->info.exclusive, unit_mode));
> }
>
> +static void print_subvolume_show_json(struct format_ctx *fctx,
> + const struct btrfs_util_subvolume_info *subvol,
> + const char *subvol_path, const char *subvol_name)
> +{
> + fmt_print(fctx, "name", subvol_name);
> +
> + if (!uuid_is_null(subvol->uuid))
> + fmt_print(fctx, "uuid", subvol->uuid);
Regarding the "more is better" approach, no conditionals for similar
data.
> + if (!uuid_is_null(subvol->parent_uuid))
> + fmt_print(fctx, "parent_uuid", subvol->parent_uuid);
> + if (!uuid_is_null(subvol->received_uuid))
> + fmt_print(fctx, "received_uuid", subvol->received_uuid);
> +
> + fmt_print(fctx, "otime", subvol->otime);
> + fmt_print(fctx, "ID", subvol->id);
> + fmt_print(fctx, "gen", subvol->generation);
> + fmt_print(fctx, "cgen", subvol->otransid);
> + fmt_print(fctx, "parent", subvol->parent_id);
> + fmt_print(fctx, "top level", subvol->parent_id);
> +
> + fmt_print_start_group(fctx, "flags", JSON_TYPE_ARRAY);
> + if (subvol->flags & BTRFS_ROOT_SUBVOL_RDONLY)
> + fmt_print(fctx, "flag-list-item", "readonly");
> + fmt_print_end_group(fctx, "flags");
> +
> + if (subvol->stransid)
> + fmt_print(fctx, "stransid", subvol->stransid);
> +
> + if (subvol->stime.tv_sec)
> + fmt_print(fctx, "stime", subvol->stime);
> +
> + if (subvol->rtransid)
> + fmt_print(fctx, "rtransid", subvol->rtransid);
> +
> + if (subvol->rtime.tv_sec)
> + fmt_print(fctx, "rtime", subvol->rtime);
> +}
next prev parent reply other threads:[~2023-08-17 20:09 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-13 9:44 [PATCH 0/7] btrfs-progs: implement json output for subvolume subcommands Christoph Heiss
2023-08-13 9:44 ` [PATCH 1/7] btrfs-progs: common: document `time-long` output format Christoph Heiss
2023-08-13 9:44 ` [PATCH 2/7] btrfs-progs: subvol show: remove duplicated quotas error check Christoph Heiss
2023-08-13 9:44 ` [PATCH 3/7] btrfs-progs: subvol show: factor out text printing to own function Christoph Heiss
2023-08-13 9:44 ` [PATCH 4/7] btrfs-progs: subvol: introduce rowspec definition for json output Christoph Heiss
2023-08-13 9:45 ` [PATCH 5/7] btrfs-progs: subvol list: implement json format output Christoph Heiss
2023-08-17 19:59 ` David Sterba
2023-08-13 9:45 ` [PATCH 6/7] btrfs-progs: subvol get-default: " Christoph Heiss
2023-08-17 20:04 ` David Sterba
2023-08-18 18:49 ` Christoph Heiss
2023-08-13 9:45 ` [PATCH 7/7] btrfs-progs: subvol show: " Christoph Heiss
2023-08-17 20:02 ` David Sterba [this message]
2023-08-17 19:34 ` [PATCH 0/7] btrfs-progs: implement json output for subvolume subcommands David Sterba
2023-08-18 18:39 ` Christoph Heiss
2023-08-21 15:19 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230817200226.GW2420@twin.jikos.cz \
--to=dsterba@suse.cz \
--cc=christoph@c8h4.io \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox