Shipping v0.4.2

examples/example.py

@@ -9,6 +9,8 @@ from georideapilib.objects import GeorideAccount
 import georideapilib.api as GeorideApi
 from georideapilib.socket import GeorideSocket
 
+from threading import Thread
+
 _LOGGER = logging.getLogger('example')
 
 
@@ -23,11 +25,20 @@ def example():
     _LOGGER.info("token 1: %s", account.auth_token)
     # pylint: disable=W0105
 
-    # socket = GeorideSocket()
-    # socket.init()
-    # socket.connect(account.auth_token)
-    # time.sleep(10)
-    # socket.disconnect()
+    def locked_locked(data):
+        _LOGGER.info("Locke received")
+
+
+    def connect_socket(account):
+        socket = GeorideSocket()
+        socket.subscribe_locked(locked_locked)
+        socket.init()
+        socket.connect(account.auth_token)
+        time.sleep(10)
+        socket.disconnect()
+
+    thread = Thread(target=connect_socket, args=(account))
+    thread.start()
   
     """
     account.auth_token = GeorideApi.renewToken(account.auth_token)

georideapilib/api.py

@@ -53,11 +53,12 @@ def get_authorisation_token(email, password):
         response_data = response.json()
         account = GeorideAccount.from_json(response_data)
     elif response.status_code == 403:
-        _LOGGER.warnning("Login failed")
-        raise LoginException("Login failed")
+        _LOGGER.warning("Login failed")
+        raise LoginException(get_authorisation_token, "Login failed")
     else:
         _LOGGER.error("Georide login, http error code: %s", response.status_code)
-        raise SeverException("Georide login, http error code: {}".format(response.status_code))
+        raise SeverException(get_authorisation_token, 
+                             "Georide login, http error code: {}".format(response.status_code))
     return account
 
 
@@ -73,10 +74,11 @@ def renew_token(token):
         new_token = response_data['authToken']
     elif response.status_code == 401:
         _LOGGER.warnning("Renew token refused")
-        raise UnauthorizedException("Renew token refused")
+        raise UnauthorizedException(renew_token, "Renew token refused")
     else:
         _LOGGER.error("Georide login, http error code: %s", response.status_code)
-        raise SeverException("Georide login, http error code: {}".format(response.status_code))
+        raise SeverException(renew_token, 
+                             "Georide login, http error code: {}".format(response.status_code))
     return new_token
 
 def revoke_token(token):
@@ -87,7 +89,7 @@ def revoke_token(token):
         headers=headers)
     if response.status_code == 401:
         _LOGGER.warnning("Token allready revoked")
-        raise UnauthorizedException("Token allready revoked")
+        raise UnauthorizedException(revoke_token, "Token allready revoked")
     if response.status_code == 401:
         _LOGGER.warnning("Token allready revoked")
         return False

georideapilib/socket.py

@@ -63,21 +63,21 @@ class GeorideSocket():
             """ on_message """
             _LOGGER.debug('Message received: %s', data)
             if self._on_message_callback is not None:
-                self._on_message_callback()
+                self._on_message_callback(data)
         
         @sio.on('device')
         def on_device(data):
             """ on_device """
             _LOGGER.debug('Device received: %s', data)
             if self._on_device_callback is not None:
-                self._on_device_callback()
+                self._on_device_callback(data)
         
         @sio.on('position')
         def on_position(data):
             """ on_position """
             _LOGGER.debug('Position received:%s', data)
             if self._on_position_callback is not None:
-                self._on_position_callback()
+                self._on_position_callback(data)
 
         @sio.on('alarm')
         def on_alarm(data):
@@ -98,9 +98,9 @@ class GeorideSocket():
             """ on_locked """
             _LOGGER.debug('Locked received: %s', data)
             if self._on_locked_callback is not None:
-                self._on_locked_callback()
-
-        self._initialised = True
+                self._on_locked_callback(data)
+            else:
+                self._initialised = True
 
     def connect(self, auth_token):
         """ connect to the georide socket"""

setup.py

@@ -19,7 +19,7 @@ CURRENT_DIR = os.path.dirname(__file__)
 setup(
     name='georideapilib',
     packages=['georideapilib'],  # this must be the same as the name above
-    version='0.4.0',
+    version='0.4.2',
     description='Lib to control georide tracker devices with their rest api',
     author='Matthieu DUVAL',
     author_email='georideapilib@duval-dev.fr',