X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/bb9c28745ae254b832805e5d41f2a5e6c3cb8f40..8121d4abc912b7a7029c232b6ec0bcfd785fa82a:/src/upkg.c

diff --git a/src/upkg.c b/src/upkg.c
index 24df293..6b48f72 100644
--- a/src/upkg.c
+++ b/src/upkg.c
@@ -35,6 +35,7 @@
 
 enum {
 	MODE_INFO,
+	MODE_LIST,
 	MODE_EXPORT,
 	MODE_MAX
 };
@@ -42,9 +43,10 @@ enum {
 int verbose = 0;
 
 static const char *progname = "upkg";
-static const char *sopts = "ixvf:VH";
+static const char *sopts = "ilxvf:VH";
 static const struct option lopts[] = {
 	{ "info",     0, NULL, 'i' },
+	{ "list",     0, NULL, 'l' },
 	{ "export",   0, NULL, 'x' },
 	{ "file",     1, NULL, 'f' },
 	{ "verbose",  0, NULL, 'v' },
@@ -231,37 +233,107 @@ static void export_print_name(struct upkg *upkg, const struct upkg_export *e)
 	}
 }
 
-static int export_info(GTypeModule *pkg, unsigned long idx)
+static void
+export_print_fullname(GTypeModule *pkg, const struct upkg_export *export)
+{
+	printf("%s", pkg->name);
+	export_print_name(U_PKG(pkg)->pkg, export);
+}
+
+static int package_list(GTypeModule *pkg, long parent)
 {
 	struct upkg *upkg = U_PKG(pkg)->pkg;
 	const struct upkg_export *export;
 
+	for (unsigned i = 0; i < upkg->export_count; i++) {
+		export = upkg_get_export(upkg, i);
+
+		if (export->package != 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');
+	}
+
+	return 0;
+}
+
+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);
 
-	printf("%s", pkg->name);
-	export_print_name(upkg, export);
-	putchar('\n');
+	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;
+	int rc;
 
-	if (u_object_deserialize(obj, pkg, idx) != 0) {
+	if (U_OBJECT_IS_LOADABLE(obj) && u_object_load(obj) != 0) {
 		return -1;
 	}
 
-	if (U_OBJECT_IS_LOADABLE(obj) && u_object_load(obj) != 0) {
+	rc = u_object_export_name(obj, name, sizeof name);
+	if (rc <= 0) {
+		/* XXX: We could use a default name here. */
+		fprintf(stderr, "%s: failed to determine export filename.\n",
+		                progname);
 		return -1;
 	}
 
-	u_object_export_name(obj, name, sizeof name);
+	printf("exporting ");
+	export_print_fullname(pkg, upkg_get_export(upkg, idx));
+	printf(" to %s\n", name);
 
-	printf("exporting %s to %s\n", export->name, name);
 	of = fopen(name, "wb");
 	if (!of) {
 		perror(name);
@@ -282,26 +354,52 @@ static int export(struct upkg *pkg, GObject *obj, unsigned idx)
 	return 0;
 }
 
-int package_export(struct upkg *pkg)
+static int object_export(GTypeModule *pkg, unsigned long idx)
 {
+	struct upkg *upkg = U_PKG(pkg)->pkg;
+	GObject *obj;
+	int ret = -1;
+
+	obj = u_object_new_from_package(upkg, idx);
+	if (!obj) {
+		fprintf(stderr, "%s: failed to load object.\n", progname);
+		return -1;
+	}
+
+	if (!U_OBJECT_IS_EXPORTABLE(obj)) {
+		fprintf(stderr, "%s: object is not exportable.\n", progname);
+		goto out;
+	}
+
+	ret = export(pkg, obj, idx);
+out:
+	g_object_unref(obj);
+	return ret;
+}
+
+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;
 		}
 
 		type = u_object_module_get_class(package, class);
-		if (!type) continue;
+		if (!type)
+			continue;
 
 		obj = g_object_new(type, NULL);
 		if (U_OBJECT_IS_EXPORTABLE(obj)) {
-			if (export(pkg, obj, i) != 0) {
+			if (u_object_deserialize(obj, upkg, i) != 0
+			    || export(pkg, obj, i) != 0) {
 				ret = -1;
 			}
 		}
@@ -366,10 +464,16 @@ 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);
+		if (current < 0)
+			ret = package_export(pkg);
+		else
+			ret = object_export(pkg, current);
 		break;
 	default:
 		abort();
@@ -406,6 +510,9 @@ int main(int argc, char **argv)
 		case 'i':
 			mode = MODE_INFO;
 			break;
+		case 'l':
+			mode = MODE_LIST;
+			break;
 		case 'x':
 			mode = MODE_EXPORT;
 			break;