X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/47b409bd9db9e40c113860e2d6a1b84cef6e2ebe..fc4c6a6be85aa955662601f7b3462bde995c4245:/src/upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 5912fc0..0e5a84e 100644
--- 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,27 +252,70 @@ 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;
 }
 
-static int export(struct upkg *pkg, GObject *obj, unsigned idx)
+static int export(GTypeModule *pkg, GObject *obj, unsigned idx)
 {
-	const struct upkg_export *export = upkg_get_export(pkg, idx);
+	struct upkg *upkg = U_PKG(pkg)->pkg;
 	char name[256];
 	FILE *of;
 
-	if (u_object_deserialize(obj, pkg, idx) != 0) {
+	if (u_object_deserialize(obj, upkg, idx) != 0) {
 		return -1;
 	}
 
@@ -283,7 +325,10 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx)
 
 	u_object_export_name(obj, name, sizeof name);
 
-	printf("exporting %s to %s\n", export->name, name);
+	printf("exporting ");
+	export_print_fullname(pkg, upkg_get_export(upkg, idx));
+	printf(" to %s\n", name);
+
 	of = fopen(name, "wb");
 	if (!of) {
 		perror(name);
@@ -304,15 +349,16 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx)
 	return 0;
 }
 
-int package_export(struct upkg *pkg)
+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 < pkg->export_count; i++) {
-		class = upkg_export_class(pkg, i, &package);
+	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;
@@ -388,13 +434,13 @@ 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);
 		break;
 	case MODE_EXPORT:
-		ret = package_export(U_PKG(pkg)->pkg);
+		ret = package_export(pkg);
 		break;
 	default:
 		abort();