diff options
Diffstat (limited to 'cython/plist.pyx')
| -rw-r--r-- | cython/plist.pyx | 85 |
1 files changed, 62 insertions, 23 deletions
diff --git a/cython/plist.pyx b/cython/plist.pyx index 0149ffa..a16e7be 100644 --- a/cython/plist.pyx +++ b/cython/plist.pyx @@ -2,14 +2,10 @@ cimport cpython cimport libc.stdlib from libc.stdint cimport * -# https://groups.google.com/forum/#!topic/cython-users/xoKNFTRagvk -cdef _from_string_and_size(char *s, size_t length): - return s[:length].encode('utf-8') - cdef extern from *: ctypedef enum plist_type: PLIST_BOOLEAN, - PLIST_UINT, + PLIST_INT, PLIST_REAL, PLIST_STRING, PLIST_ARRAY, @@ -18,6 +14,7 @@ cdef extern from *: PLIST_DATA, PLIST_KEY, PLIST_UID, + PLIST_NULL, PLIST_NONE plist_t plist_new_bool(uint8_t val) @@ -28,6 +25,10 @@ cdef extern from *: void plist_get_uint_val(plist_t node, uint64_t *val) void plist_set_uint_val(plist_t node, uint64_t val) + plist_t plist_new_int(int64_t val) + void plist_get_int_val(plist_t node, int64_t *val) + void plist_set_int_val(plist_t node, int64_t val) + plist_t plist_new_real(double val) void plist_get_real_val(plist_t node, double *val) void plist_set_real_val(plist_t node, double val) @@ -47,9 +48,11 @@ cdef extern from *: void plist_get_string_val(plist_t node, char **val) void plist_set_string_val(plist_t node, char *val) - plist_t plist_new_data(char *val, uint64_t length) - void plist_get_data_val(plist_t node, char **val, uint64_t * length) - void plist_set_data_val(plist_t node, char *val, uint64_t length) + plist_t plist_new_data(uint8_t *val, uint64_t length) + void plist_get_data_val(plist_t node, uint8_t **val, uint64_t * length) + void plist_set_data_val(plist_t node, uint8_t *val, uint64_t length) + + plist_t plist_new_null(); plist_t plist_new_dict() int plist_dict_get_size(plist_t node) @@ -81,6 +84,8 @@ cdef extern from *: void plist_from_xml(char *plist_xml, uint32_t length, plist_t * plist) void plist_from_bin(char *plist_bin, uint32_t length, plist_t * plist) + int plist_int_val_is_negative(plist_t node); + cdef class Node: def __init__(self, *args, **kwargs): self._c_managed = True @@ -181,19 +186,22 @@ cdef Bool Bool_factory(plist_t c_node, bint managed=True): cdef class Integer(Node): def __cinit__(self, object value=None, *args, **kwargs): if value is None: - self._c_node = plist_new_uint(0) + self._c_node = plist_new_int(0) else: - self._c_node = plist_new_uint(int(value)) + if value < 0 or value <= INT64_MAX: + self._c_node = plist_new_int(int(value)) + else: + self._c_node = plist_new_uint(int(value)) def __repr__(self): - cdef uint64_t i = self.get_value() - return '<Integer: %s>' % i + return '<Integer: %s>' % self.get_value() def __int__(self): return self.get_value() def __float__(self): - return float(self.get_value()) + v = self.get_value() + return float(v) def __richcmp__(self, other, op): cdef int i = self.get_value() @@ -213,10 +221,18 @@ cdef class Integer(Node): cpdef set_value(self, object value): plist_set_uint_val(self._c_node, int(value)) - cpdef uint64_t get_value(self): - cdef uint64_t value - plist_get_uint_val(self._c_node, &value) - return value + cpdef get_value(self): + cdef int64_t ivalue + cdef uint64_t uvalue + if self.is_negative(): + plist_get_int_val(self._c_node, &ivalue) + return int(ivalue) + else: + plist_get_uint_val(self._c_node, &uvalue) + return int(uvalue) + + cpdef bint is_negative(self): + return plist_int_val_is_negative(self._c_node); cdef Integer Integer_factory(plist_t c_node, bint managed=True): cdef Integer instance = Integer.__new__(Integer) @@ -285,7 +301,8 @@ cdef class Uid(Node): return self.get_value() def __float__(self): - return float(self.get_value()) + v = self.get_value() + return float(v) def __richcmp__(self, other, op): cdef int i = self.get_value() @@ -316,6 +333,20 @@ cdef Uid Uid_factory(plist_t c_node, bint managed=True): instance._c_node = c_node return instance +cdef class Null(Node): + def __cinit__(self, object value=None, *args, **kwargs): + self._c_node = plist_new_null() + + def __repr__(self): + cdef uint64_t i = self.get_value() + return '<Null>' + +cdef Null Null_factory(plist_t c_node, bint managed=True): + cdef Null instance = Null.__new__(Null) + instance._c_managed = managed + instance._c_node = c_node + return instance + from cpython cimport PY_MAJOR_VERSION cdef class Key(Node): @@ -457,6 +488,8 @@ cdef String String_factory(plist_t c_node, bint managed=True): instance._c_node = c_node return instance +MAC_EPOCH = 978307200 + cdef extern from "plist_util.h": void datetime_to_ints(object obj, int32_t* sec, int32_t* usec) object ints_to_datetime(int32_t sec, int32_t usec) @@ -470,6 +503,7 @@ cdef plist_t create_date_plist(value=None): node = plist_new_date(0, 0) elif check_datetime(value): datetime_to_ints(value, &secs, &usecs) + secs -= MAC_EPOCH node = plist_new_date(secs, usecs) return node @@ -500,6 +534,7 @@ cdef class Date(Node): cdef int32_t secs = 0 cdef int32_t usecs = 0 plist_get_date_val(self._c_node, &secs, &usecs) + secs += MAC_EPOCH return ints_to_datetime(secs, usecs) cpdef set_value(self, object value): @@ -544,12 +579,12 @@ cdef class Data(Node): cpdef bytes get_value(self): cdef: - char* val = NULL + uint8_t* val = NULL uint64_t length = 0 plist_get_data_val(self._c_node, &val, &length) try: - return _from_string_and_size(val, length) + return bytes(val[:length]) finally: libc.stdlib.free(val) @@ -683,7 +718,7 @@ cdef class Dict(Node): def __delitem__(self, key): cpython.PyDict_DelItem(self._map, key) - plist_dict_remove_item(self._c_node, key) + plist_dict_remove_item(self._c_node, key.encode('utf-8')) cdef Dict Dict_factory(plist_t c_node, bint managed=True): cdef Dict instance = Dict.__new__(Dict) @@ -831,7 +866,7 @@ cdef object plist_t_to_node(plist_t c_plist, bint managed=True): cdef plist_type t = plist_get_node_type(c_plist) if t == PLIST_BOOLEAN: return Bool_factory(c_plist, managed) - if t == PLIST_UINT: + if t == PLIST_INT: return Integer_factory(c_plist, managed) if t == PLIST_KEY: return Key_factory(c_plist, managed) @@ -849,6 +884,8 @@ cdef object plist_t_to_node(plist_t c_plist, bint managed=True): return Data_factory(c_plist, managed) if t == PLIST_UID: return Uid_factory(c_plist, managed) + if t == PLIST_NULL: + return Null_factory(c_plist, managed) if t == PLIST_NONE: return None @@ -940,8 +977,10 @@ cpdef object dumps(value, fmt=FMT_XML, sort_keys=True, skipkeys=False): node = Dict(value) elif type(value) in (list, set, tuple): node = Array(value) + else: + node = value if fmt == FMT_XML: - return node.to_xml() + return node.to_xml().encode('utf-8') return node.to_bin() |