added tag_setattr, added sprite support

[swftools.git] / lib / python / taglist.c

diff --git a/lib/python/taglist.c b/lib/python/taglist.c
index a5d28d1..d606ab3 100644 (file)
--- a/lib/python/taglist.c
+++ b/lib/python/taglist.c
@@ -15,6 +15,16 @@ typedef struct {
     PyObject* taglist;
 } TagListObject;
 //----------------------------------------------------------------------------
+static void taglist_showcontents(PyObject* self)
+{
+    TagListObject*taglist = (TagListObject*)self;
+    int t, l = PyList_Size(taglist->taglist);
+    for(t=0;t<l;t++) {
+       PyObject*item = PyList_GetItem(taglist->taglist, t);
+       mylog(" %08x(%d) taglist_showcontents   item=%08x(%d)\n", (int)self, self->ob_refcnt, item, item->ob_refcnt);
+    }
+}
+//----------------------------------------------------------------------------
 PyObject * taglist_new()
 {
     TagListObject* taglist = PyObject_New(TagListObject, &TagListClass);
@@ -29,22 +39,19 @@ PyObject * taglist_new2(TAG*tag)
     mylog("+%08x(%d) taglist_new2 tag=%08x", (int)taglist, taglist->ob_refcnt, tag);
     PyObject* tagmap = tagmap_new();
 
-    swf_FoldAllTags(tag);
-
-    int nr=0;
+    int nr=0, len=0;
     TAG*t = tag;
     TAG*last = t;
-    while(t) {nr++;last=t;t=t->next;}
+    while(t) {len++;last=t;t=t->next;}
 
     if(last && last->id==ST_END) {
-       swf_DeleteTag(last);
-       nr--;
+       swf_DeleteTag(last); last = 0;
+       len--;
+       if(len==0) tag = 0;
     }
 
-    taglist->taglist = PyList_New(nr);
+    taglist->taglist = PyList_New(len);
     
-    mylog("+%08x(%d) taglist_new2: %d items", (int)taglist, taglist->ob_refcnt, nr);
-
     nr = 0;
     t = tag;
     while(t) {
@@ -61,6 +68,7 @@ PyObject * taglist_new2(TAG*tag)
        }
        nr++;
        t=t->next;
+       Py_DECREF(newtag);
     }
     Py_DECREF(tagmap);
     return (PyObject*)taglist;
@@ -92,7 +100,6 @@ TAG* taglist_getTAGs(PyObject*self)
        }
        if(!firstTag)
            firstTag = tag;
-       mylog(" %08x(%d) taglist_getTAGs: added tag %08x", (int)self, self->ob_refcnt, tag);
     }
     Py_DECREF(tagmap);
     return firstTag;
@@ -140,15 +147,6 @@ static PyObject * taglist_optimizeOrder(PyObject* self, PyObject* args)
     return PY_NONE;
 }
 //----------------------------------------------------------------------------
-static void taglist_dealloc(PyObject* self)
-{
-    TagListObject*taglist = (TagListObject*)self;
-    mylog("-%08x(%d) taglist_dealloc\n", (int)self, self->ob_refcnt);
-    Py_DECREF(taglist->taglist);
-    taglist->taglist = 0;
-    PyObject_Del(self);
-}
-//----------------------------------------------------------------------------
 static PyMethodDef taglist_functions[] =
 {{"foldAll", taglist_foldAll, METH_VARARGS, "fold all sprites (movieclips) in the list"},
  {"unfoldAll", taglist_unfoldAll, METH_VARARGS, "unfold (expand) all sprites (movieclips) in the list"},
@@ -191,14 +189,12 @@ static PyObject * taglist_concat(PyObject * self, PyObject* list)
     PyObject*tag = 0;
     PY_ASSERT_TYPE(self, &TagListClass);
     TagListObject*taglist = (TagListObject*)self;
-    mylog(" %08x(%d) taglist_concat %08x", (int)self, self->ob_refcnt, list);
+    mylog(" %08x(%d) taglist_concat %08x(%d)", (int)self, self->ob_refcnt, list, list->ob_refcnt);
 
     if (PyArg_Parse(list, "O!", &TagClass, &tag)) {
-       mylog(" %08x(%d) taglist_concat: Tag %08x", (int)self, self->ob_refcnt, tag);
        list = tag_getDependencies(tag);
        int l = PyList_Size(list);
        int t;
-       mylog(" %08x(%d) taglist_concat: Tag: %d dependencies", (int)self, self->ob_refcnt, l);
        for(t=0;t<l;t++) {
            PyObject*item = PyList_GetItem(list, t);
            PyObject*_self = taglist_concat(self, item);
@@ -206,10 +202,11 @@ static PyObject * taglist_concat(PyObject * self, PyObject* list)
            self = _self;
        }
        if(!taglist_contains(self, tag)) {
-           mylog(" %08x(%d) taglist_concat: Adding Tag %08x", (int)self, self->ob_refcnt, tag);
+           mylog(" %08x(%d) taglist_concat: Adding Tag %08x(%d)", (int)self, self->ob_refcnt, tag, tag->ob_refcnt);
            PyList_Append(taglist->taglist, tag);
+       } else {
+           mylog(" %08x(%d) taglist_concat: Already contains Tag %08x(%d)", (int)self, self->ob_refcnt, tag, tag->ob_refcnt);
        }
-       mylog(" %08x(%d) taglist_concat: done", (int)self, self->ob_refcnt);
        Py_INCREF(self);
        return self;
        /* copy tag, so we don't have to do INCREF(tag) (and don't
@@ -239,7 +236,6 @@ static PyObject * taglist_concat(PyObject * self, PyObject* list)
     if (PyList_Check(list)) {
        int l = PyList_Size(list);
        int t;
-       mylog(" %08x(%d) taglist_concat: List", (int)self, self->ob_refcnt);
        for(t=0;t<l;t++) {
            PyObject*item = PyList_GetItem(list, t);
            if(!PY_CHECK_TYPE(item, &TagClass)) {
@@ -257,7 +253,6 @@ static PyObject * taglist_concat(PyObject * self, PyObject* list)
     }
     PyErr_Clear();
     if (PY_CHECK_TYPE(list, &TagListClass)) {
-       mylog(" %08x(%d) taglist_concat: TagList", (int)self, self->ob_refcnt);
        TagListObject*taglist2 = (TagListObject*)list;
        return taglist_concat(self, taglist2->taglist);
 
@@ -284,6 +279,16 @@ static PyObject * taglist_item(PyObject * self, int index)
     Py_INCREF(tag);
     return tag;
 }
+//----------------------------------------------------------------------------
+static void taglist_dealloc(PyObject* self)
+{
+    TagListObject*taglist = (TagListObject*)self;
+    mylog("-%08x(%d) taglist_dealloc list=%08x(%d)\n", (int)self, self->ob_refcnt, taglist->taglist, taglist->taglist->ob_refcnt);
+    Py_DECREF(taglist->taglist);
+    taglist->taglist = 0;
+    PyObject_Del(self);
+}
+//----------------------------------------------------------------------------
 static PySequenceMethods taglist_as_sequence =
 {
     sq_length: taglist_length, // len(obj)
@@ -295,7 +300,7 @@ static PySequenceMethods taglist_as_sequence =
     sq_ass_slice: 0,         // x[i:j] = v intintobjargproc
     sq_contains: taglist_contains,   //???
 };
-static PyTypeObject TagListClass = 
+PyTypeObject TagListClass = 
 {
     PyObject_HEAD_INIT(NULL)
     0,