emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Also show the conflicts object if available and simplify the code.

Browse Source
This commit is contained in:
Juan RP 2010-12-03 06:37:01 +01:00
parent d2f5535162
commit 98a2034fcf
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
bin/xbps-repo/util.c
View File

@ -34,10 +34,6 @@
#include <xbps_api.h> #include <xbps_api.h>
#include "defs.h" #include "defs.h"
#ifndef __UNCONST
#define __UNCONST(a) ((void *)(unsigned long)(const void *)(a))
#endif
void void
show_pkg_info_only_repo(prop_dictionary_t dict) show_pkg_info_only_repo(prop_dictionary_t dict)
{ {
@ -46,10 +42,10 @@ show_pkg_info_only_repo(prop_dictionary_t dict)
int rv = 0; int rv = 0;
obj = prop_dictionary_get(dict, "filename"); obj = prop_dictionary_get(dict, "filename");
if (obj && prop_object_type(obj) == PROP_TYPE_STRING) { if (prop_object_type(obj) == PROP_TYPE_STRING) {
printf("Filename: %s", prop_string_cstring_nocopy(obj)); printf("Filename: %s", prop_string_cstring_nocopy(obj));
obj = prop_dictionary_get(dict, "filename-size"); obj = prop_dictionary_get(dict, "filename-size");
if (obj && prop_object_type(obj) == PROP_TYPE_NUMBER) { if (prop_object_type(obj) == PROP_TYPE_NUMBER) {
rv = xbps_humanize_number(size, 5, rv = xbps_humanize_number(size, 5,
(int64_t)prop_number_unsigned_integer_value(obj), (int64_t)prop_number_unsigned_integer_value(obj),
"", HN_AUTOSCALE, HN_B|HN_DECIMAL|HN_NOSPACE); "", HN_AUTOSCALE, HN_B|HN_DECIMAL|HN_NOSPACE);
@ -63,7 +59,7 @@ show_pkg_info_only_repo(prop_dictionary_t dict)
} }
obj = prop_dictionary_get(dict, "filename-sha256"); obj = prop_dictionary_get(dict, "filename-sha256");
if (obj && prop_object_type(obj) == PROP_TYPE_STRING) if (prop_object_type(obj) == PROP_TYPE_STRING)
printf("SHA256: %s\n", prop_string_cstring_nocopy(obj)); printf("SHA256: %s\n", prop_string_cstring_nocopy(obj));
} }
@ -71,24 +67,23 @@ void
show_pkg_info(prop_dictionary_t dict) show_pkg_info(prop_dictionary_t dict)
{ {
prop_object_t obj; prop_object_t obj;
const char *sep; char size[64], *sep;
char size[64];
int rv = 0; int rv = 0;
assert(dict != NULL); assert(dict != NULL);
assert(prop_dictionary_count(dict) != 0); assert(prop_dictionary_count(dict) != 0);
obj = prop_dictionary_get(dict, "archive-compression-type"); obj = prop_dictionary_get(dict, "archive-compression-type");
if (obj && prop_object_type(obj) == PROP_TYPE_STRING) if (prop_object_type(obj) == PROP_TYPE_STRING)
printf("Compression type: %s\n", printf("Compression type: %s\n",
prop_string_cstring_nocopy(obj)); prop_string_cstring_nocopy(obj));
obj = prop_dictionary_get(dict, "pkgname"); obj = prop_dictionary_get(dict, "pkgname");
if (obj && prop_object_type(obj) == PROP_TYPE_STRING) if (prop_object_type(obj) == PROP_TYPE_STRING)
printf("Package: %s\n", prop_string_cstring_nocopy(obj)); printf("Package: %s\n", prop_string_cstring_nocopy(obj));
obj = prop_dictionary_get(dict, "installed_size"); obj = prop_dictionary_get(dict, "installed_size");
if (obj && prop_object_type(obj) == PROP_TYPE_NUMBER) { if (prop_object_type(obj) == PROP_TYPE_NUMBER) {
printf("Installed size: "); printf("Installed size: ");
rv = xbps_humanize_number(size, 5, rv = xbps_humanize_number(size, 5,
(int64_t)prop_number_unsigned_integer_value(obj), (int64_t)prop_number_unsigned_integer_value(obj),
@ -101,44 +96,51 @@ show_pkg_info(prop_dictionary_t dict)
} }
obj = prop_dictionary_get(dict, "maintainer"); obj = prop_dictionary_get(dict, "maintainer");
if (obj && prop_object_type(obj) == PROP_TYPE_STRING) if (prop_object_type(obj) == PROP_TYPE_STRING)
printf("Maintainer: %s\n", prop_string_cstring_nocopy(obj)); printf("Maintainer: %s\n", prop_string_cstring_nocopy(obj));
obj = prop_dictionary_get(dict, "architecture"); obj = prop_dictionary_get(dict, "architecture");
if (obj && prop_object_type(obj) == PROP_TYPE_STRING) if (prop_object_type(obj) == PROP_TYPE_STRING)
printf("Architecture: %s\n", prop_string_cstring_nocopy(obj)); printf("Architecture: %s\n", prop_string_cstring_nocopy(obj));
obj = prop_dictionary_get(dict, "version"); obj = prop_dictionary_get(dict, "version");
if (obj && prop_object_type(obj) == PROP_TYPE_STRING) if (prop_object_type(obj) == PROP_TYPE_STRING)
printf("Version: %s\n", prop_string_cstring_nocopy(obj)); printf("Version: %s\n", prop_string_cstring_nocopy(obj));
obj = prop_dictionary_get(dict, "preserve"); obj = prop_dictionary_get(dict, "preserve");
if (obj && prop_object_type(obj) == PROP_TYPE_BOOL) if (prop_object_type(obj) == PROP_TYPE_BOOL)
printf("Preserve files: %s\n", printf("Preserve files: %s\n",
prop_bool_true(obj) ? "yes" : "no"); prop_bool_true(obj) ? "yes" : "no");
obj = prop_dictionary_get(dict, "replaces"); obj = prop_dictionary_get(dict, "replaces");
if (obj && prop_object_type(obj) == PROP_TYPE_ARRAY) { if (prop_object_type(obj) == PROP_TYPE_ARRAY) {
printf("Replaces: "); printf("Replaces: ");
(void)xbps_callback_array_iter_in_dict(dict, "replaces", (void)xbps_callback_array_iter_in_dict(dict, "replaces",
list_strings_sep_in_array, NULL); list_strings_sep_in_array, NULL);
} }
obj = prop_dictionary_get(dict, "conflicts");
if (prop_object_type(obj) == PROP_TYPE_ARRAY) {
printf("Conflicts: ");
(void)xbps_callback_array_iter_in_dict(dict, "conflicts",
list_strings_sep_in_array, NULL);
}
obj = prop_dictionary_get(dict, "conf_files"); obj = prop_dictionary_get(dict, "conf_files");
if (obj && prop_object_type(obj) == PROP_TYPE_ARRAY) { if (prop_object_type(obj) == PROP_TYPE_ARRAY) {
printf("Configuration files:\n"); printf("Configuration files:\n");
sep = " "; sep = " ";
(void)xbps_callback_array_iter_in_dict(dict, "conf_files", (void)xbps_callback_array_iter_in_dict(dict, "conf_files",
list_strings_sep_in_array, __UNCONST(sep)); list_strings_sep_in_array, sep);
printf("\n"); printf("\n");
} }
obj = prop_dictionary_get(dict, "short_desc"); obj = prop_dictionary_get(dict, "short_desc");
if (obj && prop_object_type(obj) == PROP_TYPE_STRING) if (prop_object_type(obj) == PROP_TYPE_STRING)
printf("Description: %s", prop_string_cstring_nocopy(obj)); printf("Description: %s", prop_string_cstring_nocopy(obj));
obj = prop_dictionary_get(dict, "long_desc"); obj = prop_dictionary_get(dict, "long_desc");
if (obj && prop_object_type(obj) == PROP_TYPE_STRING) if (prop_object_type(obj) == PROP_TYPE_STRING)
printf(" %s\n", prop_string_cstring_nocopy(obj)); printf(" %s\n", prop_string_cstring_nocopy(obj));
} }