From d534631f62f0f72dd2cbb2cb64c1970dfeda7189 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 21 Dec 2008 07:22:44 +0100
Subject: [PATCH] Better metadata printing for the 'show' target.

All objects are sorted to be comparable to 'apt-cache show'
output, like:

$ ./xbps-bin show openssl
Repository: /storage/xbps/binpkgs
Package: openssl
Installed size: 10265289 bytes
Maintainer: Juan RP [xtraeme@gmail.com]
Architecture: x86_64
Version: 0.9.8i
Filename: openssl-0.9.8i.x86_64.xbps
SHA256: 33204337e944bdcca285af5540cee39e60cdcbc4bc99cb5da32040793844eab5
Dependencies:
	glibc-2.8 zlib-1.2.3

Configuration files:
	/etc/ssl/openssl.cnf

Permanent directories:
	/etc/ssl

Description: Secure Socket Layer and cryptographic library
The OpenSSL Project is a collaborative effort to develop a robust,
commercial-grade, full-featured, and Open Source toolkit implementing
the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
protocols as well as a full-strength general purpose cryptography
library.
$

--HG--
extra : convert_revision : 77e59abbd586e495288c3e0805d7865269846bd8
---
 utils/plist.c | 91 +++++++++++++++++++++++++++++++--------------------
 1 file changed, 56 insertions(+), 35 deletions(-)

diff --git a/utils/plist.c b/utils/plist.c
index b017f3aca3c..262be0217fc 100644
--- a/utils/plist.c
+++ b/utils/plist.c
@@ -321,53 +321,74 @@ xbps_unregister_repository(const char *uri)
 void
 xbps_show_pkg_info(prop_dictionary_t dict)
 {
-	prop_object_iterator_t iter;
-	prop_object_t obj, obj2;
+	prop_object_t obj;
 	const char *sep = NULL;
-	bool rundeps = false;
 
 	assert(dict != NULL);
 	if (prop_dictionary_count(dict) == 0)
 		return;
 
-	iter = prop_dictionary_iterator(dict);
-	if (iter == NULL)
-		return;
+	obj = prop_dictionary_get(dict, "pkgname");
+	if (obj && prop_object_type(obj) == PROP_TYPE_STRING)
+		printf("Package: %s\n", prop_string_cstring_nocopy(obj));
 
-	while ((obj = prop_object_iterator_next(iter))) {
-		/* Print the key */
-		printf("%s: ", prop_dictionary_keysym_cstring_nocopy(obj));
-		/* Get the obj for current keysym */
-		obj2 = prop_dictionary_get_keysym(dict, obj);
+	obj = prop_dictionary_get(dict, "installed_size");
+	if (obj && prop_object_type(obj) == PROP_TYPE_NUMBER)
+		printf("Installed size: %zu bytes\n",
+		    prop_number_unsigned_integer_value(obj));
 
-		if (prop_object_type(obj2) == PROP_TYPE_STRING) {
-			printf("%s\n", prop_string_cstring_nocopy(obj2));
+	obj = prop_dictionary_get(dict, "maintainer");
+	if (obj && prop_object_type(obj) == PROP_TYPE_STRING)
+		printf("Maintainer: %s\n", prop_string_cstring_nocopy(obj));
 
-		} else if (prop_object_type(obj2) == PROP_TYPE_NUMBER) {
-			printf("%zu\n",
-			    prop_number_unsigned_integer_value(obj2));
+	obj = prop_dictionary_get(dict, "architecture");
+	if (obj && prop_object_type(obj) == PROP_TYPE_STRING)
+		printf("Architecture: %s\n", prop_string_cstring_nocopy(obj));
 
-		} else if (prop_object_type(obj2) == PROP_TYPE_ARRAY) {
-			/*
-			 * Apply some indentation for array objs other than
-			 * "run_depends".
-			 */
-			if (strcmp(prop_dictionary_keysym_cstring_nocopy(obj),
-			    "run_depends") == 0) {
-				rundeps = true;
-				sep = " ";
-			}
-			printf("\n\t");
-			xbps_callback_array_iter_in_dict(dict,
-			    prop_dictionary_keysym_cstring_nocopy(obj),
-			    xbps_list_strings_in_array2, (void *)sep);
-			printf("\n");
-			if (rundeps)
-				printf("\n");
-		}
+	obj = prop_dictionary_get(dict, "version");
+	if (obj && prop_object_type(obj) == PROP_TYPE_STRING)
+		printf("Version: %s\n", prop_string_cstring_nocopy(obj));
+
+	obj = prop_dictionary_get(dict, "filename");
+	if (obj && prop_object_type(obj) == PROP_TYPE_STRING)
+		printf("Filename: %s\n", prop_string_cstring_nocopy(obj));
+
+	obj = prop_dictionary_get(dict, "filename-sha256");
+	if (obj && prop_object_type(obj) == PROP_TYPE_STRING)
+		printf("SHA256: %s\n", prop_string_cstring_nocopy(obj));
+
+	obj = prop_dictionary_get(dict, "run_depends");
+	if (obj && prop_object_type(obj) == PROP_TYPE_ARRAY) {
+		printf("Dependencies:\n\t");
+		sep = " ";
+		xbps_callback_array_iter_in_dict(dict, "run_depends",
+		    xbps_list_strings_in_array2, (void *)sep);
+		printf("\n\n");
 	}
 
-	prop_object_iterator_release(iter);
+	obj = prop_dictionary_get(dict, "conf_files");
+	if (obj && prop_object_type(obj) == PROP_TYPE_ARRAY) {
+		printf("Configuration files:\n\t");
+		xbps_callback_array_iter_in_dict(dict, "conf_files",
+		    xbps_list_strings_in_array2, NULL);
+		printf("\n");
+	}
+
+	obj = prop_dictionary_get(dict, "keep_dirs");
+	if (obj && prop_object_type(obj) == PROP_TYPE_ARRAY) {
+		printf("Permanent directories:\n\t");
+		xbps_callback_array_iter_in_dict(dict, "keep_dirs",
+		    xbps_list_strings_in_array2, NULL);
+		printf("\n");
+	}
+
+	obj = prop_dictionary_get(dict, "short_desc");
+	if (obj && prop_object_type(obj) == PROP_TYPE_STRING)
+		printf("Description: %s", prop_string_cstring_nocopy(obj));
+
+	obj = prop_dictionary_get(dict, "long_desc");
+	if (obj && prop_object_type(obj) == PROP_TYPE_STRING)
+		printf(" %s\n", prop_string_cstring_nocopy(obj));
 }
 
 bool