From a9837a80f412da8712b368c2e1a682d61e078b7a Mon Sep 17 00:00:00 2001
From: ingvar1995 <IgorN1995@yandex.ru>
Date: Sat, 20 Feb 2016 14:50:49 +0300
Subject: [PATCH] updates of main.py, util and bootstrap

---
 src/bootstrap.py |  5 ++---
 src/main.py      | 11 ++++++++++-
 src/util.py      |  2 --
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/bootstrap.py b/src/bootstrap.py
index 9701222..fe03492 100644
--- a/src/bootstrap.py
+++ b/src/bootstrap.py
@@ -1,4 +1,4 @@
-import util
+from util import string_to_bin
 import random
 
 
@@ -7,8 +7,7 @@ class Node(object):
         self._ip, self._port, self._tox_key, self.rand = ip, port, tox_key, rand
 
     def get_data(self):
-        # TODO: return tox_key in binary format
-        return self._ip, self._port, self._tox_key
+        return self._ip, self._port, string_to_bin(self._tox_key)
 
 
 def node_generator():
diff --git a/src/main.py b/src/main.py
index 57af4c2..a7c6fd1 100644
--- a/src/main.py
+++ b/src/main.py
@@ -5,6 +5,7 @@ from profile import Profile
 import sys
 from PySide import QtCore, QtGui
 from tox import Tox
+from bootstrap import node_generator
 
 
 class login(object):
@@ -34,6 +35,10 @@ def status(a, b, c):
     print str(b)
 
 
+def friend_status(*args):
+    print 'Friend connected! Friend number: ' + str(args[1])
+
+
 def main():
     """
     main function of app. loads loginscreen if needed and starts mainscreen
@@ -72,8 +77,12 @@ def main():
     ms = MainWindow()
     # creating tox instance
     tox = Tox(data, settings)
+    # bootstrap
+    for data in node_generator():
+        tox.bootstrap(*data)
     # TODO: set callbacks
-    #tox.callback_self_connection_status(status, 0)
+    tox.callback_self_connection_status(status, 0)
+    tox.callback_friend_connection_status(friend_status, 0)
     # starting thread for tox iterate
     mainloop = ToxIterateThread(tox)
     mainloop.start()
diff --git a/src/util.py b/src/util.py
index 6badc6e..a7ff2e8 100644
--- a/src/util.py
+++ b/src/util.py
@@ -1,4 +1,3 @@
-# TODO: add string to bin and bin to string (TOX ID) (and DHT connection?)
 
 
 def log(data):
@@ -13,4 +12,3 @@ def string_to_bin(tox_id):
 def bin_to_string(raw_id):
     res = ''.join('{:02x}'.format(ord(x)) for x in raw_id)
     return res.upper()
-