uobject: Add a helper function to load objects from packages.

[upkg.git] / src / upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 5912fc04aee6dde22596f41aaaa2989b4931bcba..c13a867f7b1dfd8cbdbf21977c537ccc89d8da19 100644 (file)
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -238,7 +238,6 @@ export_print_fullname(GTypeModule *pkg, const struct upkg_export *export)
 {
        printf("%s", pkg->name);
        export_print_name(U_PKG(pkg)->pkg, export);
-       putchar('\n');
 }
 
 static int package_list(GTypeModule *pkg, long parent)
@@ -253,17 +252,60 @@ static int package_list(GTypeModule *pkg, long parent)
                        continue;
 
                export_print_fullname(pkg, export);
+
+               if (verbose >= 1) {
+                       const char *class, *package;
+
+                       class = upkg_export_class(upkg, i, &package);
+                       printf(" (%s.%s)", package, class);
+               }
+
+               putchar('\n');
        }
 }
 
-static int export_info(GTypeModule *pkg, unsigned long idx)
+static int object_info(GTypeModule *pkg, unsigned long idx)
 {
        struct upkg *upkg = U_PKG(pkg)->pkg;
        const struct upkg_export *export;
+       const char *class, *package;
 
        export = upkg_get_export(upkg, idx);
-
        export_print_fullname(pkg, export);
+
+       class = upkg_export_class(upkg, idx, &package);
+       printf(" (%s.%s)\n", package, class);
+
+       if (verbose >= 1) {
+               GParamSpec **props;
+               GObject *obj;
+               unsigned n;
+
+               obj = u_object_new_from_package(upkg, idx);
+               if (!obj) {
+                       fprintf(stderr, "%s: failed to load object.\n",
+                                       progname);
+                       return -1;
+               }
+
+               props = g_object_class_list_properties(G_OBJECT_GET_CLASS(obj), &n);
+               for (unsigned i = 0; i < n; i++) {
+                       GValue val = {0};
+                       char *valstr;
+
+                       printf("  %s: ", props[i]->name);
+                       fflush(stdout);
+
+                       g_value_init(&val, props[i]->value_type);
+                       g_object_get_property(obj, props[i]->name, &val);
+                       valstr = g_strdup_value_contents(&val);
+                       printf("%s\n", valstr);
+               }
+               free(props);
+
+               g_object_unref(obj);
+       }
+
        return 0;
 }
 
@@ -388,7 +430,7 @@ static int process_object(int mode, const char *objname)
                if (current < 0)
                        ret = package_info(U_PKG(pkg)->pkg);
                else
-                       ret = export_info(pkg, current);
+                       ret = object_info(pkg, current);
                break;
        case MODE_LIST:
                ret = package_list(pkg, current+1);