upkg: Use proper library routines in package_export.

[upkg.git] / src / upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 7448aba63baf3878b7d48f19da645245e9cfa619..176eca9ca491adc39a62c4e62104e5ff1600a412 100644 (file)
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <assert.h>
 #include <getopt.h>
 
 #include <glib-object.h>
@@ -214,7 +215,7 @@ int package_info(struct upkg *pkg)
        printf("Names:   %lu\n", pkg->name_count);
        if (verbose >= 3) {
                for (unsigned long i = 0; i < pkg->name_count; i++) {
-                       printf("\t%s\n", upkg_get_name(pkg, i));
+                       printf("%lu - %s\n", i, upkg_get_name(pkg, i));
                }
        }
 
@@ -228,7 +229,7 @@ int package_info(struct upkg *pkg)
 static void export_print_name(struct upkg *upkg, const struct upkg_export *e)
 {
        if (e) {
-               export_print_name(upkg, upkg_get_export(upkg, e->package-1));
+               export_print_name(upkg, e->parent);
                printf(".%s", e->name);
        }
 }
@@ -240,15 +241,20 @@ export_print_fullname(GTypeModule *pkg, const struct upkg_export *export)
        export_print_name(U_PKG(pkg)->pkg, export);
 }
 
-static int package_list(GTypeModule *pkg, long parent)
+static int package_list(GTypeModule *pkg, long current)
 {
        struct upkg *upkg = U_PKG(pkg)->pkg;
-       const struct upkg_export *export;
+       const struct upkg_export *parent = NULL;
+
+       if (current >= 0) {
+               parent = upkg_get_export(upkg, current);
+               assert(parent != NULL);
+       }
 
        for (unsigned i = 0; i < upkg->export_count; i++) {
-               export = upkg_get_export(upkg, i);
+               const struct upkg_export *export = upkg_get_export(upkg, i);
 
-               if (export->package != parent)
+               if (export->parent != parent)
                        continue;
 
                export_print_fullname(pkg, export);
@@ -296,13 +302,24 @@ static int object_info(GTypeModule *pkg, unsigned long idx)
                        GValue val = {0};
                        char *valstr;
 
-                       printf("  property %s: ", props[i]->name);
+                       printf("  property %s:", props[i]->name);
                        fflush(stdout);
 
                        g_value_init(&val, props[i]->value_type);
                        g_object_get_property(obj, props[i]->name, &val);
+
+                       if (G_VALUE_HOLDS(&val, U_TYPE_OBJECT)) {
+                               UObject *obj = g_value_get_object(&val);
+
+                               /* TODO: Display full object names here. */
+                               if (obj->pkg_name) {
+                                       printf(" %s", obj->pkg_name);
+                               }
+                       }
+
                        valstr = g_strdup_value_contents(&val);
-                       printf("%s\n", valstr);
+                       printf(" %s\n", valstr);
+                       g_free(valstr);
                }
                free(props);
 
@@ -336,6 +353,7 @@ static int export(GTypeModule *pkg, GObject *obj, unsigned idx)
        int rc;
 
        if (U_OBJECT_IS_LOADABLE(obj) && u_object_load(obj) != 0) {
+               fprintf(stderr, "%s: failed to load export data.\n", progname);
                return -1;
        }
 
@@ -397,28 +415,13 @@ out:
 int package_export(GTypeModule *pkg)
 {
        struct upkg *upkg = U_PKG(pkg)->pkg;
-       const char *class, *package;
        GObject *obj;
-       GType type;
        int ret = 0;
 
        for (unsigned i = 0; i < upkg->export_count; i++) {
-               class = upkg_export_class(upkg, i, &package);
-               if (!class) {
-                       fprintf(stderr, "error getting class information.\n");
-                       return -1;
-               }
-
-               type = u_object_module_get_class(package, class);
-               if (!type)
-                       continue;
-
-               obj = g_object_new(type, NULL);
-               if (U_OBJECT_IS_EXPORTABLE(obj)) {
-                       if (u_object_deserialize(obj, upkg, i) != 0
-                           || export(pkg, obj, i) != 0) {
-                               ret = -1;
-                       }
+               obj = u_object_new_from_package(upkg, i);
+               if (U_OBJECT_IS_EXPORTABLE(obj) && export(pkg, obj, i) != 0) {
+                       ret = -1;
                }
                g_object_unref(obj);
        }
@@ -484,7 +487,7 @@ static int process_object(int mode, const char *objname)
                        ret = object_info(pkg, current);
                break;
        case MODE_LIST:
-               ret = package_list(pkg, current+1);
+               ret = package_list(pkg, current);
                break;
        case MODE_EXPORT:
                if (current < 0)