refactor: Adapt pytox to the new tox_system stuff.

Author: iphydf

BUILD.bazel

@@ -5,23 +5,50 @@ package(features = ["layering_check"])
 
 project()
 
+SUBSYSTEMS = [
+    "log",
+    "memory",
+    "network",
+    "random",
+    "system",
+    "time",
+]
+
+[genrule(
+    name = "pytox/" + sys,
+    srcs = [
+        "pytox/src/%s.pyx" % sys,
+        "//c-toxcore:tox/toxcore/tox_%s.h" % sys,
+    ],
+    outs = ["pytox/%s.pyx" % sys],
+    cmd = " ".join([
+        "$(location //py_toxcore_c/tools:gen_api)",
+        "$(location pytox/src/%s.pyx)" % sys,
+        "$(location //c-toxcore:tox/toxcore/tox_%s.h)" % sys,
+        "> $@",
+    ]),
+    tools = ["//py_toxcore_c/tools:gen_api"],
+) for sys in SUBSYSTEMS]
+
 genrule(
     name = "pytox/core",
     srcs = [
         "pytox/src/core.pyx",
-        "//c-toxcore:tox/tox.h",
+        "//c-toxcore:tox/toxcore/tox.h",
     ],
     outs = ["pytox/core.pyx"],
-    cmd = "$(location //py_toxcore_c/tools:gen_api) $(location pytox/src/core.pyx) $(location //c-toxcore:tox/tox.h) > $@",
+    cmd = "$(location //py_toxcore_c/tools:gen_api) $(location pytox/src/core.pyx) $(location //c-toxcore:tox/toxcore/tox.h) > $@",
     tools = ["//py_toxcore_c/tools:gen_api"],
 )
 
 pyx_library(
     name = "pytox",
     srcs = [
+        "pytox.pxd",
         "pytox/av.pyx",
         "pytox/core.pyx",
-    ],
+        "pytox/error.pyx",
+    ] + ["pytox/%s.pxd" % sys for sys in SUBSYSTEMS] + ["pytox/%s.pyx" % sys for sys in SUBSYSTEMS],
     cdeps = ["//c-toxcore"],
     cython_directives = {"language_level": "3"},
     visibility = ["//visibility:public"],

pytox.pxd

@@ -0,0 +1,15 @@
+class UseAfterFreeException(Exception):
+    def __init__(self):
+        super().__init__(
+                "object used after it was killed/freed (or it was never initialised)")
+
+class ToxException(Exception):
+    pass
+
+class ApiException(ToxException):
+    def __init__(self, err):
+        super().__init__(err)
+        self.error = err
+
+class LengthException(ToxException):
+    pass

pytox/error.pyx

@@ -0,0 +1,12 @@
+ctypedef struct Tox_Log
+
+cpdef enum Tox_Log_Level:
+    TOX_LOG_LEVEL_TRACE,
+    TOX_LOG_LEVEL_DEBUG,
+    TOX_LOG_LEVEL_INFO,
+    TOX_LOG_LEVEL_WARNING,
+    TOX_LOG_LEVEL_ERROR,
+
+cdef class ToxLog:
+
+    cdef Tox_Log *_get(self) except *

pytox/log.pxd

@@ -0,0 +1,5 @@
+ctypedef struct Tox_Memory
+
+cdef class ToxMemory:
+
+    cdef Tox_Memory *_get(self) except *

pytox/memory.pxd

@@ -0,0 +1,5 @@
+ctypedef struct Tox_Network
+
+cdef class ToxNetwork:
+
+    cdef Tox_Network *_get(self) except *

pytox/network.pxd

@@ -0,0 +1,5 @@
+ctypedef struct Tox_Random
+
+cdef class ToxRandom:
+
+    cdef Tox_Random *_get(self) except *

pytox/random.pxd

@@ -6,7 +6,11 @@ from libcpp cimport bool
 from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t
 from libc.stdlib cimport malloc, free
 
-cdef extern from "tox/tox.h": pass
+from pytox import error
+from pytox.log cimport Tox_Log_Level
+from pytox.system cimport Tox_System
+
+cdef extern from "tox/toxcore/tox.h": pass
 
 
 VERSION: str = "%d.%d.%d" % (tox_version_major(), tox_version_minor(), tox_version_patch())
@@ -28,37 +32,20 @@ MAX_FILENAME_LENGTH: int = tox_max_filename_length()
 MAX_HOSTNAME_LENGTH: int = tox_max_hostname_length()
 
 
-class UseAfterFreeException(Exception):
-    def __init__(self):
-        super().__init__(
-                "object used after it was killed/freed (or it was never initialised)")
-
-class ToxException(Exception):
-    pass
-
-class ApiException(ToxException):
-    def __init__(self, err):
-        super().__init__(err)
-        self.error = err
-
-class LengthException(ToxException):
-    pass
-
 cdef void _check_len(str name, bytes data, int expected_length) except *:
     if len(data) != expected_length:
-        raise LengthException(
+        raise error.LengthException(
                 f"parameter '{name}' received bytes of invalid"
                 f"length {len(data)}, expected {expected_length}")
 
-
 cdef class ToxOptions:
 
     cdef Tox_Options *_ptr
 
     def __init__(self):
         cdef Tox_Err_Options_New err = TOX_ERR_OPTIONS_NEW_OK
         self._ptr = tox_options_new(&err)
-        if err: raise ApiException(Tox_Err_Options_New(err))
+        if err: raise error.ApiException(Tox_Err_Options_New(err))
 
     def __dealloc__(self):
         self.__exit__(None, None, None)
@@ -72,7 +59,7 @@ cdef class ToxOptions:
 
     cdef Tox_Options *_get(self) except *:
         if self._ptr is NULL:
-            raise UseAfterFreeException()
+            raise error.UseAfterFreeException()
         return self._ptr
 
     @property
@@ -93,7 +80,7 @@ cdef class Core:
         if options is None:
             options = ToxOptions()
         self._ptr = tox_new(options._ptr, &err)
-        if err: raise ApiException(Tox_Err_New(err))
+        if err: raise error.ApiException(Tox_Err_New(err))
 
         install_handlers(self._get())
 
@@ -109,7 +96,7 @@ cdef class Core:
 
     cdef Tox *_get(self) except *:
         if self._ptr is NULL:
-            raise UseAfterFreeException()
+            raise error.UseAfterFreeException()
         return self._ptr
 
     @property
@@ -189,7 +176,7 @@ cdef class Core:
     def name(self, name: bytes) -> None:
         cdef Tox_Err_Set_Info err = TOX_ERR_SET_INFO_OK
         tox_self_set_name(self._get(), name, len(name), &err)
-        if err: raise ApiException(Tox_Err_Set_Info(err))
+        if err: raise error.ApiException(Tox_Err_Set_Info(err))
 
     @property
     def status_message(self) -> bytes:
@@ -205,7 +192,7 @@ cdef class Core:
     def status_message(self, status_message: bytes) -> None:
         cdef Tox_Err_Set_Info err = TOX_ERR_SET_INFO_OK
         tox_self_set_status_message(self._get(), status_message, len(status_message), &err)
-        if err: raise ApiException(Tox_Err_Set_Info(err))
+        if err: raise error.ApiException(Tox_Err_Set_Info(err))
 
     @property
     def status(self) -> Tox_User_Status:
@@ -219,15 +206,15 @@ cdef class Core:
         _check_len("address", address, tox_address_size())
         cdef Tox_Err_Friend_Add err = TOX_ERR_FRIEND_ADD_OK
         tox_friend_add(self._get(), address, message, len(message), &err)
-        if err: raise ApiException(Tox_Err_Friend_Add(err))
+        if err: raise error.ApiException(Tox_Err_Friend_Add(err))
 
     def friend_add_norequest(self, public_key: bytes):
         _check_len("public_key", public_key, tox_public_key_size())
         cdef Tox_Err_Friend_Add err = TOX_ERR_FRIEND_ADD_OK
         tox_friend_add_norequest(self._get(), public_key, &err)
-        if err: raise ApiException(Tox_Err_Friend_Add(err))
+        if err: raise error.ApiException(Tox_Err_Friend_Add(err))
 
     def friend_delete(self, friend_number: int):
         cdef Tox_Err_Friend_Delete err = TOX_ERR_FRIEND_DELETE_OK
         tox_friend_delete(self._get(), friend_number, &err)
-        if err: raise ApiException(Tox_Err_Friend_Delete(err))
+        if err: raise error.ApiException(Tox_Err_Friend_Delete(err))

pytox/src/core.pyx

@@ -0,0 +1,37 @@
+# cython: language_level=3
+"""Toxcore bindings.
+"""
+
+from libcpp cimport bool
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t
+from libc.stdlib cimport malloc, free
+
+from pytox import error
+from pytox cimport memory
+from pytox.memory cimport Tox_Memory
+
+cdef extern from "tox/toxcore/tox_log.h": pass
+
+
+cdef class ToxLog:
+
+    cdef Tox_Log *_ptr
+
+    def __init__(self, memory.ToxMemory mem):
+        self._ptr = tox_log_new(NULL, <void*>self, mem._get())
+        if self._ptr is NULL: raise MemoryError("tox_log_new")
+
+    def __dealloc__(self):
+        self.__exit__(None, None, None)
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_value, exc_traceback):
+        tox_log_free(self._ptr)
+        self._ptr = NULL
+
+    cdef Tox_Log *_get(self) except *:
+        if self._ptr is NULL:
+            raise error.UseAfterFreeException()
+        return self._ptr

pytox/src/log.pyx

@@ -0,0 +1,35 @@
+# cython: language_level=3
+"""Toxcore bindings.
+"""
+
+from libcpp cimport bool
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t
+from libc.stdlib cimport malloc, free
+
+from pytox import error
+
+cdef extern from "tox/toxcore/tox_memory.h": pass
+
+
+cdef class ToxMemory:
+
+    cdef Tox_Memory *_ptr
+
+    def __init__(self):
+        self._ptr = tox_memory_new(NULL, <void*>self)
+        if self._ptr is NULL: raise MemoryError("tox_memory_new")
+
+    def __dealloc__(self):
+        self.__exit__(None, None, None)
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_value, exc_traceback):
+        tox_memory_free(self._ptr)
+        self._ptr = NULL
+
+    cdef Tox_Memory *_get(self) except *:
+        if self._ptr is NULL:
+            raise error.UseAfterFreeException()
+        return self._ptr