upd tox
This commit is contained in:
parent
f11f226890
commit
6164f189f2
1 changed files with 71 additions and 61 deletions
132
src/tox.py
132
src/tox.py
|
@ -1,8 +1,7 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
from ctypes import *
|
from ctypes import *
|
||||||
from settings import Settings
|
|
||||||
from platform import system
|
from platform import system
|
||||||
from toxcore_enums import *
|
from toxcore_enums_and_consts import *
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
|
||||||
|
@ -23,7 +22,7 @@ class ToxOptions(Structure):
|
||||||
|
|
||||||
|
|
||||||
class Tox(object):
|
class Tox(object):
|
||||||
def __init__(self, name, path=None):
|
def __init__(self, *args):
|
||||||
# load toxcore
|
# load toxcore
|
||||||
if system() == 'Linux':
|
if system() == 'Linux':
|
||||||
temp = os.path.dirname(os.path.abspath(__file__)) + '/libs/'
|
temp = os.path.dirname(os.path.abspath(__file__)) + '/libs/'
|
||||||
|
@ -34,62 +33,61 @@ class Tox(object):
|
||||||
else:
|
else:
|
||||||
raise OSError('Unknown system.')
|
raise OSError('Unknown system.')
|
||||||
|
|
||||||
# load saved data
|
if len(args) == 2:
|
||||||
if path is None:
|
# creating tox options struct
|
||||||
path = Settings.get_default_path()
|
tox_err_options = c_int()
|
||||||
full_path = path + name + '.tox'
|
self.libtoxcore.tox_options_new.restype = POINTER(ToxOptions)
|
||||||
with open(full_path, 'rb') as fl:
|
self.tox_options = self.libtoxcore.tox_options_new(addressof(tox_err_options))
|
||||||
savedata = fl.read()
|
if tox_err_options == TOX_ERR_OPTIONS_NEW['TOX_ERR_OPTIONS_NEW_MALLOC']:
|
||||||
settings = Settings()
|
raise MemoryError('The function failed to allocate enough memory for the options struct.')
|
||||||
|
|
||||||
# creating tox options struct
|
# filling tox options struct
|
||||||
tox_err_options = c_int()
|
savedata = args[0]
|
||||||
self.libtoxcore.tox_options_new.restype = POINTER(ToxOptions)
|
settings = args[1]
|
||||||
self.tox_options = self.libtoxcore.tox_options_new(addressof(tox_err_options))
|
self.tox_options.contents.ipv6_enabled = settings['ipv6_enabled']
|
||||||
if tox_err_options == TOX_ERR_OPTIONS_NEW['TOX_ERR_OPTIONS_NEW_MALLOC']:
|
self.tox_options.contents.udp_enabled = settings['udp_enabled']
|
||||||
raise MemoryError('The function failed to allocate enough memory for the options struct.')
|
self.tox_options.contents.proxy_type = settings['proxy_type']
|
||||||
|
self.tox_options.contents.proxy_host = settings['proxy_host']
|
||||||
|
self.tox_options.contents.proxy_port = settings['proxy_port']
|
||||||
|
self.tox_options.contents.start_port = settings['start_port']
|
||||||
|
self.tox_options.contents.end_port = settings['end_port']
|
||||||
|
self.tox_options.contents.tcp_port = settings['tcp_port']
|
||||||
|
self.tox_options.contents.savedata_type = TOX_SAVEDATA_TYPE['TOX_SAVEDATA_TYPE_TOX_SAVE']
|
||||||
|
self.tox_options.contents.savedata_data = c_char_p(savedata)
|
||||||
|
self.tox_options.contents.savedata_length = len(savedata)
|
||||||
|
|
||||||
# filling tox options struct
|
# creating tox object
|
||||||
self.tox_options.contents.ipv6_enabled = settings['ipv6_enabled']
|
tox_err = c_int()
|
||||||
self.tox_options.contents.udp_enabled = settings['udp_enabled']
|
self.libtoxcore.tox_new.restype = POINTER(c_void_p)
|
||||||
self.tox_options.contents.proxy_type = settings['proxy_type']
|
self._tox_pointer = self.libtoxcore.tox_new(self.tox_options, addressof(tox_err))
|
||||||
self.tox_options.contents.proxy_host = settings['proxy_host']
|
if tox_err == TOX_ERR_NEW['TOX_ERR_NEW_NULL']:
|
||||||
self.tox_options.contents.proxy_port = settings['proxy_port']
|
raise ArgumentError('One of the arguments to the function was NULL when it was not expected.')
|
||||||
self.tox_options.contents.start_port = settings['start_port']
|
elif tox_err == TOX_ERR_NEW['TOX_ERR_NEW_MALLOC']:
|
||||||
self.tox_options.contents.end_port = settings['end_port']
|
raise MemoryError('The function was unable to allocate enough '
|
||||||
self.tox_options.contents.tcp_port = settings['tcp_port']
|
'memory to store the internal structures for the Tox object.')
|
||||||
self.tox_options.contents.savedata_type = TOX_SAVEDATA_TYPE['TOX_SAVEDATA_TYPE_TOX_SAVE']
|
elif tox_err == TOX_ERR_NEW['TOX_ERR_NEW_PORT_ALLOC']:
|
||||||
self.tox_options.contents.savedata_data = c_char_p(savedata)
|
raise MemoryError('The function was unable to bind to a port. This may mean that all ports have already'
|
||||||
self.tox_options.contents.savedata_length = len(savedata)
|
' been bound, e.g. by other Tox instances, or it may mean a permission error. You may'
|
||||||
|
' be able to gather more information from errno.')
|
||||||
# creating tox object
|
elif tox_err == TOX_ERR_NEW['TOX_ERR_NEW_PROXY_BAD_TYPE']:
|
||||||
tox_err = c_int()
|
raise ArgumentError('proxy_type was invalid.')
|
||||||
self.libtoxcore.tox_new.restype = POINTER(c_void_p)
|
elif tox_err == TOX_ERR_NEW['TOX_ERR_NEW_PROXY_BAD_HOST']:
|
||||||
self._tox_pointer = self.libtoxcore.tox_new(self.tox_options, addressof(tox_err))
|
raise ArgumentError('proxy_type was valid but the proxy_host passed had an invalid format or was NULL.')
|
||||||
if tox_err == TOX_ERR_NEW['TOX_ERR_NEW_NULL']:
|
elif tox_err == TOX_ERR_NEW['TOX_ERR_NEW_PROXY_BAD_PORT']:
|
||||||
raise ArgumentError('One of the arguments to the function was NULL when it was not expected.')
|
raise ArgumentError('proxy_type was valid, but the proxy_port was invalid.')
|
||||||
elif tox_err == TOX_ERR_NEW['TOX_ERR_NEW_MALLOC']:
|
elif tox_err == TOX_ERR_NEW['TOX_ERR_NEW_PROXY_NOT_FOUND']:
|
||||||
raise MemoryError('The function was unable to allocate enough '
|
raise ArgumentError('The proxy address passed could not be resolved.')
|
||||||
'memory to store the internal structures for the Tox object.')
|
elif tox_err == TOX_ERR_NEW['TOX_ERR_NEW_LOAD_ENCRYPTED']:
|
||||||
elif tox_err == TOX_ERR_NEW['TOX_ERR_NEW_PORT_ALLOC']:
|
raise ArgumentError('The byte array to be loaded contained an encrypted save.')
|
||||||
raise MemoryError('The function was unable to bind to a port. This may mean that all ports have already'
|
elif tox_err == TOX_ERR_NEW['TOX_ERR_NEW_LOAD_BAD_FORMAT']:
|
||||||
' been bound, e.g. by other Tox instances, or it may mean a permission error. You may'
|
raise ArgumentError('The data format was invalid. This can happen when loading data that was saved by'
|
||||||
' be able to gather more information from errno.')
|
' an older version of Tox, or when the data has been corrupted. When loading from'
|
||||||
elif tox_err == TOX_ERR_NEW['TOX_ERR_NEW_PROXY_BAD_TYPE']:
|
' badly formatted data, some data may have been loaded, and the rest is discarded.'
|
||||||
raise ArgumentError('proxy_type was invalid.')
|
' Passing an invalid length parameter also causes this error.')
|
||||||
elif tox_err == TOX_ERR_NEW['TOX_ERR_NEW_PROXY_BAD_HOST']:
|
elif len(args) == 1:
|
||||||
raise ArgumentError('proxy_type was valid but the proxy_host passed had an invalid format or was NULL.')
|
self._tox_pointer = args[0]
|
||||||
elif tox_err == TOX_ERR_NEW['TOX_ERR_NEW_PROXY_BAD_PORT']:
|
else:
|
||||||
raise ArgumentError('proxy_type was valid, but the proxy_port was invalid.')
|
raise ArgumentError('1 or 2 arguments expected')
|
||||||
elif tox_err == TOX_ERR_NEW['TOX_ERR_NEW_PROXY_NOT_FOUND']:
|
|
||||||
raise ArgumentError('The proxy address passed could not be resolved.')
|
|
||||||
elif tox_err == TOX_ERR_NEW['TOX_ERR_NEW_LOAD_ENCRYPTED']:
|
|
||||||
raise ArgumentError('The byte array to be loaded contained an encrypted save.')
|
|
||||||
elif tox_err == TOX_ERR_NEW['TOX_ERR_NEW_LOAD_BAD_FORMAT']:
|
|
||||||
raise ArgumentError('The data format was invalid. This can happen when loading data that was saved by an'
|
|
||||||
' older version of Tox, or when the data has been corrupted. When loading from badly'
|
|
||||||
' formatted data, some data may have been loaded, and the rest is discarded. Passing'
|
|
||||||
' an invalid length parameter also causes this error.')
|
|
||||||
|
|
||||||
def get_savedata_size(self):
|
def get_savedata_size(self):
|
||||||
return self.libtoxcore.tox_get_savedata_size(self._tox_pointer)
|
return self.libtoxcore.tox_get_savedata_size(self._tox_pointer)
|
||||||
|
@ -137,10 +135,22 @@ class Tox(object):
|
||||||
c_callback = tox_self_connection_status_cb(callback)
|
c_callback = tox_self_connection_status_cb(callback)
|
||||||
self.libtoxcore.tox_callback_self_connection_status(self._tox_pointer, c_callback, c_void_p(user_data))
|
self.libtoxcore.tox_callback_self_connection_status(self._tox_pointer, c_callback, c_void_p(user_data))
|
||||||
|
|
||||||
def __del__(self):
|
def iteration_interval(self):
|
||||||
self.libtoxcore.tox_kill(self._tox_pointer)
|
return int(self.libtoxcore.tox_iteration_interval(self._tox_pointer).value)
|
||||||
self.libtoxcore.tox_options_free(self.tox_options)
|
|
||||||
|
|
||||||
|
def iterate(self):
|
||||||
|
self.libtoxcore.tox_iterate(self._tox_pointer)
|
||||||
|
|
||||||
|
def self_get_address(self, address=None):
|
||||||
|
if address is None:
|
||||||
|
address = create_string_buffer(TOX_ADDRESS_SIZE)
|
||||||
|
self.libtoxcore.tox_self_get_address(self._tox_pointer, address)
|
||||||
|
return address
|
||||||
|
|
||||||
|
def __del__(self):
|
||||||
|
if hasattr(self, 'tox_options'):
|
||||||
|
self.libtoxcore.tox_kill(self._tox_pointer)
|
||||||
|
self.libtoxcore.tox_options_free(self.tox_options)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
t = Tox('tox_save')
|
pass
|
||||||
|
|
Loading…
Reference in a new issue