X-Git-Url: http://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/82202f3afe5b662d6896e91903e491630c1ec7dd..1906020cf2abc26cf8317a5a754dca7318802250:/src/uobject.c

diff --git a/src/uobject.c b/src/uobject.c
index d58ba33..175a624 100644
--- a/src/uobject.c
+++ b/src/uobject.c
@@ -61,6 +61,8 @@ struct uobject_priv {
 	unsigned long nbuf;
 };
 
+G_DEFINE_TYPE(UObject, u_object, G_TYPE_OBJECT);
+
 static unsigned long
 get_real_size(unsigned long *real, unsigned size, unsigned char *buf, size_t n)
 {
@@ -194,22 +196,54 @@ static int deserialize(UObject *o, struct upkg_file *f)
 	return 0;
 }
 
-int u_object_deserialize(GObject *obj, struct upkg_file *f)
+int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx)
 {
 	g_return_val_if_fail(IS_U_OBJECT(obj), -1);
-	return U_OBJECT_GET_CLASS(obj)->deserialize(U_OBJECT(obj), f);
+	UObject *uo = U_OBJECT(obj);
+	struct upkg_file *f;
+	int rc;
+
+	g_return_val_if_fail(uo->pkg_file == NULL, -1);
+	f = upkg_export_open(pkg, idx);
+	if (!f) {
+		return -1;
+	}
+
+	rc = U_OBJECT_GET_CLASS(obj)->deserialize(uo, f);
+	if (rc != 0) {
+		upkg_export_close(f);
+	} else {
+		uo->pkg      = pkg;
+		uo->pkg_idx  = idx;
+		uo->pkg_file = f;
+	}
+
+	return rc;
 }
 
 static void u_object_init(UObject *o)
 {
-	struct uobject_priv *priv = U_OBJECT_GET_PRIV(o);
+	o->pkg      = NULL;
+	o->pkg_file = NULL;
+	o->pkg_idx  = 0;
+}
+
+static void u_object_finalize(GObject *o)
+{
+	UObject *uo = U_OBJECT(o);
+
+	if (uo->pkg_file) {
+		upkg_export_close(uo->pkg_file);
+	}
+
+	G_OBJECT_CLASS(u_object_parent_class)->finalize(o);
 }
 
 static void u_object_class_init(UObjectClass *class)
 {
 	g_type_class_add_private(class, sizeof (struct uobject_priv));
+	GObjectClass *go = G_OBJECT_CLASS(class);
 
 	class->deserialize = deserialize;
+	go->finalize       = u_object_finalize;
 }
-
-G_DEFINE_TYPE(UObject, u_object, G_TYPE_OBJECT);