shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2025-03-19 22:50:35 +03:00
Code Issues Projects Releases Wiki Activity

ostree: Improve formatting for well-known summary metadata keys

Browse Source 
If a summary metadata key is well-known, like ostree.static-deltas, or
ostree.summary.last-modified, format it a little more nicely.

This is especially important for timestamps like last-modified, since
otherwise they’re formatted as a big-endian uint64, which is basically
unusable for the user.

Non-formatted output can still be retrieved using the OSTREE_DUMP_RAW
flag, and the non-formatted key name is always printed for clarity.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Closes: #826
Approved by: cgwalters
This commit is contained in:
Philip Withnall 2017-05-04 11:32:46 +01:00 committed by Atomic Bot
parent 8ea654251a
commit a946c3d423
1 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/ostree/ot-dump.c
View File

@ -199,6 +199,18 @@ dump_summary_ref (const char *ref_name,
}
}
static gchar *
uint64_secs_to_iso8601 (guint64 secs)
{
g_autoptr(GDateTime) dt = g_date_time_new_from_unix_utc (secs);
g_autoptr(GDateTime) local = (dt != NULL) ? g_date_time_to_local (dt) : NULL;
if (local != NULL)
return g_date_time_format (local, "%FT%T%:::z");
else
return g_strdup ("invalid");
}
void
ot_dump_summary_bytes (GBytes *summary_bytes,
OstreeDumpFlags flags)
@ -251,11 +263,35 @@ ot_dump_summary_bytes (GBytes *summary_bytes,
g_variant_iter_init (&iter, exts);
/* XXX Should we print something more human-friendly for
* known extension names like 'ostree.static-deltas'? */
while (g_variant_iter_loop (&iter, "{sv}", &key, &value))
{
g_autofree char *string = g_variant_print (value, FALSE);
g_print ("%s: %s\n", key, string);
g_autofree gchar *value_str = NULL;
const gchar *pretty_key = NULL;
if (g_strcmp0 (key, "ostree.static-deltas") == 0)
{
pretty_key = "Static Deltas";
value_str = g_variant_print (value, FALSE);
}
else if (g_strcmp0 (key, "ostree.summary.last-modified") == 0)
{
pretty_key = "Last-Modified";
value_str = uint64_secs_to_iso8601 (GUINT64_FROM_BE (g_variant_get_uint64 (value)));
}
else if (g_strcmp0 (key, "ostree.summary.expires") == 0)
{
pretty_key = "Expires";
value_str = uint64_secs_to_iso8601 (GUINT64_FROM_BE (g_variant_get_uint64 (value)));
}
else
{
value_str = g_variant_print (value, FALSE);
}
/* Print out. */
if (pretty_key != NULL)
g_print ("%s (%s): %s\n", pretty_key, key, value_str);
else
g_print ("%s: %s\n", key, value_str);
}
}