Shipping v1.2.0

georideapilib/api.py

@@ -21,7 +21,7 @@ from georideapilib.objects import (
     GeoRideTrackerPosition,
     GeoRideSharedTrip,
     GeoRideTrackerBeacon,
-    GeorideMaintenance
+    GeoRideMaintenance
 )
 
 GEORIDE_API_HOST = "https://api.georide.com"
@@ -88,7 +88,7 @@ def renew_token(token):
         response_data = response.json()
         new_token = response_data['authToken']
     elif response.status_code == 401:
-        _LOGGER.warnning("Renew token refused")
+        _LOGGER.warning("Renew token refused")
         raise UnauthorizedException(renew_token, "Renew token refused")
     else:
         _LOGGER.error("Georide login, http error code: %s", response.status_code)
@@ -105,10 +105,10 @@ def revoke_token(token):
         token
     )
     if response.status_code == 401:
-        _LOGGER.warnning("Token allready revoked")
+        _LOGGER.warning("Token already revoked")
         raise UnauthorizedException(revoke_token, "Token allready revoked")
     if response.status_code == 403:
-        _LOGGER.warnning("Token allready revoked")
+        _LOGGER.warning("Token already revoked")
         return False
     return True
 
@@ -299,16 +299,16 @@ def change_tracker_eco_mode_state(token, tracker_id, state: bool):
     return True
 
 
-def add_or_update_maintenance(token, tracker_id, maintenance: GeorideMaintenance):
+def add_or_update_maintenance(token, tracker_id, maintenance_json):
     """ used to add or update a maintenance """
     response = _send_request(
         "POST",
         GEORIDE_API_ENDPOINT_TRACKER_MAINTENANCE.format(trackerId=str(tracker_id)),
         token,
-        data=maintenance
+        data=maintenance_json
     )
 
-    if response.status_code == 200:
+    if response.status_code == 204:
         return True
     return False
 
@@ -324,7 +324,7 @@ def delete_maintenance(token, tracker_id, maintenance_id):
         token
     )
 
-    if response.status_code == 200:
+    if response.status_code == 204:
         return True
     return False
 
@@ -340,8 +340,8 @@ def get_maintenances_for_tracker(token, tracker_id):
     response_data = response.json()
     maintenances = []
     if response.status_code == 200:
-        for maint in response_data['maintenanceList']:
-            maintenances.append(GeorideMaintenance.from_json(maint))
+        for maintenance in response_data['maintenanceList']:
+            maintenances.append(GeoRideMaintenance.from_json(maintenance))
         return maintenances
     else:
         return None

georideapilib/objects/GeoRideMaintenance.py

@@ -4,7 +4,7 @@ import logging
 _LOGGER = logging.getLogger(__name__)
 
 
-class GeorideMaintenance:
+class GeoRideMaintenance:
 
     def __init__(self,
                  name,
@@ -75,18 +75,26 @@ class GeorideMaintenance:
             "lastMaintenanceDistance": self.lastMaintenanceDistance
         }).encode("utf-8")
 
+    def to_date_maintenance_json(self):
+        return json.dumps({
+            "name": self.name,
+            "everyMaintenance": self.everyMaintenance,
+            "lastMaintenanceDate": self.lastMaintenanceDate,
+            "dateUnitType": self.dateUnitType
+        }).encode("utf-8")
+
     @staticmethod
-    def from_json(json):
+    def from_json(json_obj):
         """return new object fromjson"""
-        return GeorideMaintenance(
-            name=json['name'],
-            id=json['id'],
-            todo=json['todo'],
-            trackerId=json['trackerId'],
-            lastMaintenanceDistance=json['lastMaintenanceDistance'],
-            lastMaintenanceDate=json['lastMaintenanceDate'],
-            dateUnitType=json['dateUnitType'],
-            everyMaintenance=json['everyMaintenance'],
-            createdAt=json['createdAt'],
-            updatedAt=json['updatedAt']
+        return GeoRideMaintenance(
+            name=json_obj['name'],
+            id=json_obj['id'],
+            todo=json_obj['todo'],
+            trackerId=json_obj['trackerId'],
+            lastMaintenanceDistance=json_obj['lastMaintenanceDistance'],
+            lastMaintenanceDate=json_obj['lastMaintenanceDate'],
+            dateUnitType=json_obj['dateUnitType'],
+            everyMaintenance=json_obj['everyMaintenance'],
+            createdAt=json_obj['createdAt'],
+            updatedAt=json_obj['updatedAt']
         )

georideapilib/objects/__init__.py

@@ -8,5 +8,5 @@ from .GeoRideTrackerBeacon import *
 from .GeoRideTrackerPosition import *
 from .GeoRideTrackerTrip import *
 from .GeoRideUser import *
-from .GeorideMaintenance import *
+from .GeoRideMaintenance import *
 

georideapilib/socket.py

@@ -6,7 +6,7 @@ from georideapilib.api import GEORIDE_SOCKET_HOST
 
 _LOGGER = logging.getLogger(__name__)
 
-sio = socketio.Client(reconnection=True) # pylint: disable=C0103
+sio = socketio.Client(reconnection=True, reconnection_attempts=5, reconnection_delay=1000, reconnection_delay_max=5000, randomization_factor=0.5) # pylint: disable=C0103
 
 @sio.on('connect')
 def on_connect():
@@ -106,6 +106,7 @@ class GeoRideSocket():
         if self._initialised is not False:
             sio.connect(GEORIDE_SOCKET_HOST, headers={'token': auth_token})
             sio.wait()
+
         else:
             _LOGGER.error("Please call init() before")
         

setup.py

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