diff --git a/src/callbacks.py b/src/callbacks.py index 1de3672..dc35ef9 100644 --- a/src/callbacks.py +++ b/src/callbacks.py @@ -11,10 +11,15 @@ def friend_status(a, b, c, d): def friend_message(a, b, c, d, e, f): - print 'Message: ', unicode(d, "utf-8") + print 'Message: ', str(d) -def init_callbacks(tox): +def init_callbacks(tox, window): + """ + :param tox: tox instance + :param window: main window + :return: None + """ tox.callback_friend_status(friend_status, 0) tox.callback_friend_message(friend_message, 0) tox.callback_self_connection_status(self_connection_status, 0) diff --git a/src/main.py b/src/main.py index a60bd69..afb705d 100644 --- a/src/main.py +++ b/src/main.py @@ -73,7 +73,7 @@ def main(): # bootstrap for data in node_generator(): tox.bootstrap(*data) - init_callbacks(tox) + init_callbacks(tox, ms) # starting thread for tox iterate mainloop = ToxIterateThread(tox) mainloop.start() diff --git a/src/tox.py b/src/tox.py index a51b6db..da3bb90 100644 --- a/src/tox.py +++ b/src/tox.py @@ -24,9 +24,8 @@ class ToxOptions(Structure): class LibToxCore(object): def __init__(self): if system() == 'Linux': - temp = os.path.dirname(os.path.abspath(__file__)) + '/libs/' - os.chdir(temp) - self._libtoxcore = CDLL(temp + 'libtoxcore.so') + # be sure that libtoxcore and libsodium are installed in your os + self._libtoxcore = CDLL('libtoxcore.so') elif system() == 'Windows': self._libtoxcore = CDLL('libs/libtox.dll') else: diff --git a/tests/tests.py b/tests/tests.py index 1e44e1e..8c19bcb 100644 --- a/tests/tests.py +++ b/tests/tests.py @@ -2,7 +2,7 @@ from src.settings import Settings from src.util import bin_to_string, string_to_bin import sys from src.bootstrap import node_generator -from src.profile import Profile +from src.profile import Profile, tox_factory import os @@ -55,3 +55,14 @@ class TestNodeGen(): def test_ports(self): for elem in node_generator(): assert elem[1] in [33445, 443, 5190, 2306, 1813] + + +class TestTox(): + + def test_creation(self): + data = Profile.open_profile(Settings.get_default_path(), 'tox_save') + settings = Settings.get_default_settings() + tox = tox_factory(data, settings) + for data in node_generator(): + tox.bootstrap(*data) + del tox