emdee/toxygen_wrapper
1
0
Fork 0
Code Issues Pull Requests Actions Projects Wiki Activity

tests_wrapper.py adds

Browse Source
This commit is contained in:
emdee 2023-07-17 02:36:30 +00:00
parent 1aa831cbd6
commit c6282d17c6
5 changed files with 447 additions and 252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -161,5 +161,11 @@ cython_debug/
# option (not recommended) you can uncomment the following to ignore the entire idea folder. # option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/ #.idea/
.pylint.sh
.pylint.err .pylint.err
.pylint.log .pylint.log
.pylint.out
*.dst
*~

67
wrapper/tox.py
View File

@ -85,6 +85,7 @@ def bin_to_string(raw_id, length):
return res.upper() return res.upper()
def sGetError(value, a): def sGetError(value, a):
# dict(enumerate(a))[value]
for k,v in a.items(): for k,v in a.items():
if v == value: if v == value:
s = k s = k
@ -1848,7 +1849,7 @@ class Tox:
# Group chat instance management # Group chat instance management
# ----------------------------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------------------------
def group_new(self, privacy_state, group_name, nick, status): def group_new(self, privacy_state, group_name, nick):
"""Creates a new group chat. """Creates a new group chat.
This function creates a new group chat object and adds it to the chats array. This function creates a new group chat object and adds it to the chats array.
@ -1892,14 +1893,10 @@ class Tox:
byref(error)) byref(error))
if error.value: if error.value:
# -1 TOX_ERR_GROUP_NEW_TOO_LONG s = sGetError(error.value, TOX_ERR_GROUP_NEW)
# -2 TOX_ERR_GROUP_NEW_EMPTY LOG_ERROR(f"group_new {error.value} {s}")
# -3 TOX_ERR_GROUP_NEW_INIT raise ToxError(f"group_new {s} {error.value}")
# -4 TOX_ERR_GROUP_NEW_STATE
# -5 TOX_ERR_GROUP_NEW_ANNOUNCE
if error.value in TOX_ERR_GROUP_NEW:
LOG_ERROR(f"group_new {error.value} {TOX_ERR_GROUP_NEW[error.value]}")
raise ToxError(f"group_new {error.value}")
return result return result
def group_join(self, chat_id, password, nick, status=''): def group_join(self, chat_id, password, nick, status=''):
@ -1912,6 +1909,7 @@ class Tox:
:param chat_id: The Chat ID of the group you wish to join. This must be TOX_GROUP_CHAT_ID_SIZE bytes. :param chat_id: The Chat ID of the group you wish to join. This must be TOX_GROUP_CHAT_ID_SIZE bytes.
:param password: The password required to join the group. Set to NULL if no password is required. :param password: The password required to join the group. Set to NULL if no password is required.
:param status: FixMe
:return group_number on success, UINT32_MAX on failure. :return group_number on success, UINT32_MAX on failure.
@ -1943,8 +1941,9 @@ class Tox:
byref(error)) byref(error))
if error.value: if error.value:
LOG_ERROR(f"group_join {error.value} {TOX_ERR_GROUP_JOIN[error.value]}") s = sGetError(error.value, TOX_ERR_GROUP_JOIN)
raise ToxError(f"group_join {error.value} {TOX_ERR_GROUP_JOIN[error.value]}") LOG_ERROR(f"group_new {error.value} {s}")
raise ToxError(f"group_new {s} {error.value}")
return result return result
def group_reconnect(self, group_number): def group_reconnect(self, group_number):
@ -1962,8 +1961,9 @@ class Tox:
LOG_DEBUG(f"tox_group_reconnect") LOG_DEBUG(f"tox_group_reconnect")
result = Tox.libtoxcore.tox_group_reconnect(self._tox_pointer, group_number, byref(error)) result = Tox.libtoxcore.tox_group_reconnect(self._tox_pointer, group_number, byref(error))
if error.value: if error.value:
LOG_ERROR(f"group_reconnect {error.value}") s = sGetError(error.value, TOX_ERR_GROUP_RECONNECT)
raise ToxError(f"group_reconnect {error.value}") LOG_ERROR(f"group_new {error.value} {s}")
raise ToxError(f"group_new {s} {error.value}")
return result return result
def group_is_connected(self, group_number): def group_is_connected(self, group_number):
@ -1980,8 +1980,9 @@ class Tox:
LOG_DEBUG(f"tox_group_disconnect") LOG_DEBUG(f"tox_group_disconnect")
result = Tox.libtoxcore.tox_group_disconnect(self._tox_pointer, group_number, byref(error)) result = Tox.libtoxcore.tox_group_disconnect(self._tox_pointer, group_number, byref(error))
if error.value: if error.value:
LOG_ERROR(f"group_disconnect {error.value}") s = sGetError(error.value, TOX_ERR_GROUP_DISCONNECT)
raise ToxError("group_disconnect {error.value}") LOG_ERROR(f"group_disconnect {error.value} {s}")
raise ToxError(f"group_disconnect {s} {error.value}")
return result return result
def group_leave(self, group_number, message=None): def group_leave(self, group_number, message=None):
@ -2295,6 +2296,9 @@ class Tox:
LOG_DEBUG(f"tox_callback_group_peer_status") LOG_DEBUG(f"tox_callback_group_peer_status")
c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_uint32, c_int, c_void_p) c_callback = CFUNCTYPE(None, c_void_p, c_uint32, c_uint32, c_int, c_void_p)
#* @param group_number The group number of the group we wish to query.
#* @param peer_id The ID of the peer whose status we wish to query.
# *error
self.group_peer_status_cb = c_callback(callback) self.group_peer_status_cb = c_callback(callback)
try: try:
Tox.libtoxcore.tox_callback_group_peer_status(self._tox_pointer, self.group_peer_status_cb) Tox.libtoxcore.tox_callback_group_peer_status(self._tox_pointer, self.group_peer_status_cb)
@ -2633,8 +2637,11 @@ class Tox:
error = c_int() error = c_int()
LOG_DEBUG(f"tox_group_send_custom_packet") LOG_DEBUG(f"tox_group_send_custom_packet")
result = Tox.libtoxcore.tox_group_send_custom_packet(self._tox_pointer, group_number, lossless, data, result = Tox.libtoxcore.tox_group_send_custom_packet(self._tox_pointer,
len(data), byref(error)) group_number,
lossless, data,
len(data),
byref(error))
if error.value: if error.value:
LOG_ERROR(f" {error.value}") LOG_ERROR(f" {error.value}")
raise ToxError(f" {error.value}") raise ToxError(f" {error.value}")
@ -2659,13 +2666,15 @@ class Tox:
""" """
error = c_int() error = c_int()
LOG_DEBUG(f"tox_group_send_private_message") LOG_DEBUG(f"group_send_private_message")
result = Tox.libtoxcore.tox_group_send_private_message(self._tox_pointer, group_number, peer_id, result = Tox.libtoxcore.tox_group_send_private_message(self._tox_pointer, group_number, peer_id,
message_type, message, message_type, message,
len(message), byref(error)) len(message), byref(error))
if error.value: if error.value:
LOG_ERROR(f"group_send_private_message {TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE[error.value]}") s = sGetError(error.value, TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE)
raise ToxError(f"group_send_private_message {TOX_ERR_GROUP_SEND_PRIVATE_MESSAGE[error.value]}") LOG_ERROR(f"group_send_private_message {error.value} {s}")
raise ToxError(f"group_send_private_message {error.value} {s}")
return result return result
def group_send_message(self, group_number, type_, message): def group_send_message(self, group_number, type_, message):
@ -2700,9 +2709,12 @@ class Tox:
# dunno # dunno
byref(message_id), byref(message_id),
byref(error)) byref(error))
if error.value: if error.value:
LOG_ERROR(f" {error.value}") s = sGetError(error.value, TOX_ERR_GROUP_SEND_MESSAGE)
raise ToxError(f" {error.value}") LOG_ERROR(f"group_send_message {error.value} {s}")
raise ToxError(f"group_send_message {error.value} {s}")
return result return result
# ----------------------------------------------------------------------------------------------------------------- # -----------------------------------------------------------------------------------------------------------------
@ -2844,9 +2856,9 @@ class Tox:
LOG_ERROR(f"group_invite_accept ERROR {e}") LOG_ERROR(f"group_invite_accept ERROR {e}")
raise ToxError(f"group_invite_accept ERROR {e}") raise ToxError(f"group_invite_accept ERROR {e}")
if error.value: if error.value:
# The invite data is not in the expected format. s = sGetError(error.value, TOX_ERR_GROUP_INVITE_ACCEPT)
LOG_ERROR(f"group_invite_accept {TOX_ERR_GROUP_INVITE_ACCEPT[error.value]}") LOG_ERROR(f"group_invite_friend {error.value} {s}")
raise ToxError(f"group_invite_accept {TOX_ERR_GROUP_INVITE_ACCEPT[error.value]} {error.value}") raise ToxError(f"group_invite_accept {s} {error.value}")
return result return result
def callback_group_invite(self, callback, user_data): def callback_group_invite(self, callback, user_data):
@ -3003,8 +3015,9 @@ class Tox:
result = Tox.libtoxcore.tox_group_founder_set_password(self._tox_pointer, group_number, password, result = Tox.libtoxcore.tox_group_founder_set_password(self._tox_pointer, group_number, password,
len(password), byref(error)) len(password), byref(error))
if error.value: if error.value:
LOG_ERROR(f" {error.value}") s = sGetError(error.value, TOX_ERR_GROUP_FOUNDER_SET_PASSWORD)
raise ToxError(f" {error.value}") LOG_ERROR(f"group_founder_set_password {error.value} {s}")
raise ToxError(f"group_founder_set_password {s} {error.value}")
return result return result
def group_founder_set_privacy_state(self, group_number, privacy_state): def group_founder_set_privacy_state(self, group_number, privacy_state):

13
wrapper/toxcore_enums_and_consts.py
View File

@ -315,6 +315,19 @@ TOX_ERR_GROUP_RECONNECT = {
'TOX_ERR_GROUP_RECONNECT_GROUP_NOT_FOUND': 1, 'TOX_ERR_GROUP_RECONNECT_GROUP_NOT_FOUND': 1,
} }
TOX_ERR_GROUP_DISCONNECT = {
# The function returned successfully.
'TOX_ERR_GROUP_DISCONNECT_OK': 0,
# The group number passed did not designate a valid group.
'TOX_ERR_GROUP_DISCONNECT_GROUP_NOT_FOUND': 1,
# The group is already disconnected.
'TOX_ERR_GROUP_DISCONNECT_ALREADY_DISCONNECTED': 2,
}
TOX_ERR_GROUP_LEAVE = { TOX_ERR_GROUP_LEAVE = {
# #

2
wrapper_tests/support_testing.py
View File

@ -112,6 +112,8 @@ lDEAD_BS = [
# Failed to resolve "tox3.plastiras.org" # Failed to resolve "tox3.plastiras.org"
"tox3.plastiras.org", "tox3.plastiras.org",
'tox.kolka.tech', 'tox.kolka.tech',
# here and gone
'122-116-39-151.hinet-ip.hinet.net',
# IPs that do not reverse resolve # IPs that do not reverse resolve
'49.12.229.145', '49.12.229.145',
"46.101.197.175", "46.101.197.175",

611
wrapper_tests/tests_wrapper.py
View File

File diff suppressed because it is too large Load Diff