update Packbuilder to just use cffi

Author: jeremywestwood

pygit2/decl/pack.h

@@ -4,13 +4,15 @@ typedef int (*git_packbuilder_progress)(
 	uint32_t total,
 	void *payload);
 
-
 int git_packbuilder_new(git_packbuilder **out, git_repository *repo);
+void git_packbuilder_free(git_packbuilder *pb);
+
 int git_packbuilder_insert(git_packbuilder *pb, const git_oid *id, const char *name);
+int git_packbuilder_insert_recur(git_packbuilder *pb, const git_oid *id, const char *name);
+
 size_t git_packbuilder_object_count(git_packbuilder *pb);
-unsigned int git_packbuilder_set_threads(git_packbuilder *pb, unsigned int n);
+
 int git_packbuilder_write(git_packbuilder *pb, const char *path, unsigned int mode, git_indexer_progress_cb progress_cb, void *progress_cb_payload);
-int git_packbuilder_insert_recur(git_packbuilder *pb, const git_oid *id, const char *name);
 uint32_t git_packbuilder_written(git_packbuilder *pb);
 
-const git_oid * git_packbuilder_hash(git_packbuilder *pb);
+unsigned int git_packbuilder_set_threads(git_packbuilder *pb, unsigned int n);

pygit2/packbuilder.py

@@ -25,20 +25,42 @@
 
 
 # Import from pygit2
-from ._pygit2 import PackBuilder as _PackBuilder
 from .errors import check_error
 from .ffi import ffi, C
 from .utils import to_bytes
 
 
-class PackBuilder(_PackBuilder):
+class PackBuilder:
 
-    def __init__(self, *args, **kwargs):
-        self.repo = args[0]
-        super().__init__(args[0])
-        packbuilder_cptr = ffi.new('git_packbuilder **')
-        ffi.buffer(packbuilder_cptr)[:] = self._pointer[:]
-        self._packbuilder = packbuilder_cptr[0]
+    def __init__(self, repo):
+
+        cpackbuilder = ffi.new('git_packbuilder **')
+        err = C.git_packbuilder_new(cpackbuilder, repo._repo)
+        check_error(err)
+
+        self._repo = repo
+        self._packbuilder = cpackbuilder[0]
+        self._cpackbuilder = cpackbuilder
+
+
+    @classmethod
+    def _from_c(cls, repo, ptr):
+        packbuilder = cls.__new__(cls)
+        packbuilder._repo = repo
+        packbuilder._packbuilder = ptr[0]
+        packbuilder._cpackbuilder = ptr
+
+        return packbuilder
+
+    @property
+    def _pointer(self):
+        return bytes(ffi.buffer(self._packbuilder)[:])
+
+    def __del__(self):
+        C.git_packbuilder_free(self._packbuilder)
+
+    def __len__(self):
+        return C.git_packbuilder_object_count(self._packbuilder)
 
     @staticmethod
     def convert_object_to_oid(git_object):
@@ -56,9 +78,6 @@ def add_recursive(self, git_object):
         err = C.git_packbuilder_insert_recur(self._packbuilder, oid, ffi.NULL)
         check_error(err)
 
-    def object_count(self):
-        return C.git_packbuilder_object_count(self._packbuilder)
-
     def set_max_threads(self, n_threads):
         return C.git_packbuilder_set_threads(self._packbuilder, n_threads)
 
@@ -69,12 +88,3 @@ def write(self, path):
     @property
     def written_objects_count(self):
         return C.git_packbuilder_written(self._packbuilder)
-
-    @classmethod
-    def _from_c(cls, ptr, repo):
-        cptr = ffi.new('git_packbuilder **')
-        cptr[0] = ptr
-        packbuilder = cls.__new__(cls)
-        packbuilder.repo = repo
-        super(cls, packbuilder)._from_c(bytes(ffi.buffer(cptr)[:]), repo)
-        return packbuilder

src/packbuilder.c

@@ -33,7 +33,6 @@
 #include "types.h"
 #include "utils.h"
 #include "repository.h"
-#include "packbuilder.h"
 #include "oid.h"
 #include "options.h"
 
@@ -42,7 +41,6 @@ PyObject *AlreadyExistsError;
 PyObject *InvalidSpecError;
 
 extern PyTypeObject RepositoryType;
-extern PyTypeObject PackBuilderType;
 extern PyTypeObject OdbType;
 extern PyTypeObject OdbBackendType;
 extern PyTypeObject OdbBackendPackType;
@@ -337,10 +335,6 @@ PyInit__pygit2(void)
     INIT_TYPE(RepositoryType, NULL, PyType_GenericNew)
     ADD_TYPE(m, Repository)
 
-    /* PackBuilder */
-    INIT_TYPE(PackBuilderType, NULL, PyType_GenericNew)
-    ADD_TYPE(m, PackBuilder)
-
     /* Odb */
     INIT_TYPE(OdbType, NULL, PyType_GenericNew)
     ADD_TYPE(m, Odb)

src/packbuilder.h

@@ -50,15 +50,6 @@ typedef struct {
     int owned;    /* _from_c() sometimes means we don't own the C pointer */
 } Repository;
 
-/* git_packbuilder */
-typedef struct {
-    PyObject_HEAD
-    git_packbuilder *packbuilder;
-    int owned;    /* _from_c() sometimes means we don't own the C pointer */
-    Repository *repo;
-} PackBuilder;
-
-
 typedef struct {
     PyObject_HEAD
     git_oid oid;