From 798e8adfee469ea2028060a37aadb082e7b5da36 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Mon, 4 Jun 2018 10:32:20 +0200
Subject: [PATCH] remote-info: Add show-runtime and show-sdk

Also, print sdk in regular output

Closes: #1753
Approved by: alexlarsson
---
 app/flatpak-builtins-info-remote.c | 63 ++++++++++++++++++++++++------
 1 file changed, 52 insertions(+), 11 deletions(-)

diff --git a/app/flatpak-builtins-info-remote.c b/app/flatpak-builtins-info-remote.c
index 4eed507f..97c1a508 100644
--- a/app/flatpak-builtins-info-remote.c
+++ b/app/flatpak-builtins-info-remote.c
@@ -43,6 +43,8 @@ static gboolean opt_show_commit;
 static gboolean opt_show_parent;
 static gboolean opt_show_metadata;
 static gboolean opt_log;
+static gboolean opt_show_runtime;
+static gboolean opt_show_sdk;
 
 static GOptionEntry options[] = {
   { "arch", 0, 0, G_OPTION_ARG_STRING, &opt_arch, N_("Arch to install for"), N_("ARCH") },
@@ -54,6 +56,8 @@ static GOptionEntry options[] = {
   { "show-commit", 'c', 0, G_OPTION_ARG_NONE, &opt_show_commit, N_("Show commit"), NULL },
   { "show-parent", 'p', 0, G_OPTION_ARG_NONE, &opt_show_parent, N_("Show parent"), NULL },
   { "show-metadata", 'm', 0, G_OPTION_ARG_NONE, &opt_show_metadata, N_("Show metadata"), NULL },
+  { "show-runtime", 0, 0, G_OPTION_ARG_NONE, &opt_show_runtime, N_("Show runtime"), NULL },
+  { "show-sdk", 0, 0, G_OPTION_ARG_NONE, &opt_show_sdk, N_("Show sdk"), NULL },
   { NULL }
 };
 
@@ -160,9 +164,11 @@ flatpak_builtin_info_remote (int argc, char **argv, GCancellable *cancellable, G
       off = FLATPAK_ANSI_BOLD_OFF; /* bold off */
     }
 
-  if (opt_show_ref || opt_show_commit || opt_show_parent || opt_show_metadata)
+  if (opt_show_ref || opt_show_commit || opt_show_parent || opt_show_metadata || opt_show_runtime || opt_show_sdk)
     friendly = FALSE;
 
+  parts = g_strsplit (ref, "/", 0);
+
   if (friendly)
     {
       g_variant_get (commit_v, "(a{sv}aya(say)&s&stayay)", NULL, NULL, NULL,
@@ -192,7 +198,6 @@ flatpak_builtin_info_remote (int argc, char **argv, GCancellable *cancellable, G
       if (g_variant_lookup (commit_metadata, "xa.download-size", "t", &download_size))
         download_size = GUINT64_FROM_BE (download_size);
 
-      parts = g_strsplit (ref, "/", 0);
       formatted_installed_size = g_format_size (installed_size);
       formatted_download_size = g_format_size (download_size);
       formatted_timestamp = format_timestamp (timestamp);
@@ -212,8 +217,11 @@ flatpak_builtin_info_remote (int argc, char **argv, GCancellable *cancellable, G
       if (strcmp (parts[0], "app") == 0 && metakey != NULL)
         {
           g_autofree char *runtime = NULL;
+          g_autofree char *sdk = NULL;
           runtime = g_key_file_get_string (metakey, "Application", "runtime", error);
           g_print ("%s%s%s %s\n", on, _("Runtime:"), off, runtime ? runtime : "-");
+          sdk = g_key_file_get_string (metakey, "Application", "sdk", error);
+          g_print ("%s%s%s %s\n", on, _("Sdk:"), off, sdk ? sdk : "-");
         }
 
       if (opt_log)
@@ -260,8 +268,19 @@ flatpak_builtin_info_remote (int argc, char **argv, GCancellable *cancellable, G
       do
         {
           g_autofree char *p = ostree_commit_get_parent (c_v);
+          g_autoptr(GVariant) c_m = g_variant_get_child_value (c_v, 0);
           gboolean first = TRUE;
 
+          g_variant_lookup (c_m, "xa.metadata", "&s", &xa_metadata);
+          if (xa_metadata == NULL)
+            g_printerr (_("Warning: Commit %s has no flatpak metadata\n"), c);
+          else
+            {
+              metakey = g_key_file_new ();
+              if (!g_key_file_load_from_data (metakey, xa_metadata, -1, 0, error))
+                return FALSE;
+            }
+
           if (opt_show_ref)
             {
               maybe_print_space (&first);
@@ -280,19 +299,41 @@ flatpak_builtin_info_remote (int argc, char **argv, GCancellable *cancellable, G
               g_print ("%s", p ? p : "-");
             }
 
+          if (opt_show_runtime)
+            {
+              g_autofree char *runtime = NULL;
+              maybe_print_space (&first);
+
+              if (metakey)
+                {
+                  if (strcmp (parts[0], "app") == 0)
+                    runtime = g_key_file_get_string (metakey, "Application", "runtime", NULL);
+                  else
+                    runtime = g_key_file_get_string (metakey, "Runtime", "runtime", NULL);
+                }
+              g_print ("%s", runtime ? runtime : "-");
+            }
+
+          if (opt_show_sdk)
+            {
+              g_autofree char *sdk = NULL;
+              maybe_print_space (&first);
+
+              if (metakey)
+                {
+                  if (strcmp (parts[0], "app") == 0)
+                    sdk = g_key_file_get_string (metakey, "Application", "sdk", NULL);
+                  else
+                    sdk = g_key_file_get_string (metakey, "Runtime", "sdk", NULL);
+                }
+              g_print ("%s", sdk ? sdk : "-");
+            }
+
           if (!first)
             g_print ("\n");
 
           if (opt_show_metadata)
-            {
-              g_autoptr(GVariant) c_m = NULL;
-              c_m = g_variant_get_child_value (c_v, 0);
-              g_variant_lookup (c_m, "xa.metadata", "&s", &xa_metadata);
-              if (xa_metadata == NULL)
-                g_printerr (_("Warning: Commit %s has no flatpak metadata\n"), c);
-              else
-                g_print ("%s", xa_metadata);
-            }
+            g_print ("%s", xa_metadata);
 
           g_free (c);
           c = g_steal_pointer (&p);