diff --git a/examples/example.py b/examples/example.py index 84b4840..902bbe3 100644 --- a/examples/example.py +++ b/examples/example.py @@ -41,7 +41,7 @@ def example(): thread.start() """ - account.auth_token = GeorideApi.renewToken(account.auth_token) + account.auth_token = GeoRideApi.renewToken(account.auth_token) print("token 2: ", account.auth_token) """ # pylint: disable=W0105 diff --git a/georideapilib/api.py b/georideapilib/api.py index 3475997..f3c5128 100644 --- a/georideapilib/api.py +++ b/georideapilib/api.py @@ -109,6 +109,7 @@ def get_user(token): def get_trackers(token): """ get user trackers """ + headers = {"Authorization": "Bearer " + token} response = _SESSION.get( GEORIDE_API_HOST + GEORIDE_API_ENDPOINT_TRAKERS, @@ -117,6 +118,7 @@ def get_trackers(token): response_data = response.json() trackers = [] for json_tracker in response_data: + _LOGGER.debug(json_tracker) trackers.append(GeoRideTracker.from_json(json_tracker)) return trackers diff --git a/georideapilib/objects.py b/georideapilib/objects.py index d93047b..a252221 100644 --- a/georideapilib/objects.py +++ b/georideapilib/objects.py @@ -226,27 +226,27 @@ class GeoRideTracker: # pylint: disable=R0904,R0902 self._device_button_delay = device_button_delay self._vibration_level = vibration_level self._is_old_tracker = is_old_tracker - self._auto_lock_freezed_to = auto_lock_freezed_to + self._position_id = position_id self._fixtime = fixtime + self._latitude = latitude + self._longitude = longitude + self._altitude = altitude + self._locked_position_id = locked_position_id + self._locked_latitude = locked_latitude + self._locked_longitude = locked_longitude self._role = role + self._subscription_id = subscription_id self._last_payment_date = last_payment_date self._gift_card_id = gift_card_id self._expires = expires self._activation_date = activation_date self._odometer = odometer + self._is_locked = is_locked self._is_stolen = is_stolen self._is_crashed = is_crashed self._crash_detection_disabled = crash_detection_disabled self._speed = speed self._moving = moving - self._position_id = position_id - self._latitude = latitude - self._longitude = longitude - self._altitude = altitude - self._locked_position_id = locked_position_id - self._locked_latitude = locked_latitude - self._locked_longitude = locked_longitude - self._is_locked = is_locked self._can_see_position = can_see_position self._can_lock = can_lock self._can_unlock = can_unlock @@ -257,6 +257,7 @@ class GeoRideTracker: # pylint: disable=R0904,R0902 self._can_send_broken_down_signal = can_send_broken_down_signal self._can_send_stolen_signal = can_send_stolen_signal self._status = status + self._auto_lock_freezed_to = auto_lock_freezed_to @property def tracker_id(self): @@ -337,12 +338,22 @@ class GeoRideTracker: # pylint: disable=R0904,R0902 def is_stolen(self): """ is_stolen """ return self._is_stolen + + @is_stolen.setter + def is_stolen(self, is_stolen): + """ is_stolen setter""" + self._is_stolen = is_stolen @property def is_crashed(self): """ is_crashed """ return self._is_crashed + @is_crashed.setter + def is_crashed(self, is_crashed): + """ is_crashed setter""" + self._is_crashed = is_crashed + @property def crash_detection_disabled(self): """ crash_detection_disabled """ @@ -531,6 +542,46 @@ class GeoRideTracker: # pylint: disable=R0904,R0902 json['status'] ) + def update_all_data(self, tracker): + """update all data of th tracker from anew object""" + self._tracker_name = tracker.tracker_name + self._device_button_action = tracker.device_button_action + self._device_button_delay = tracker.device_button_delay + self._vibration_level = tracker.vibration_level + self._is_old_tracker = tracker.is_old_tracker + self._position_id = tracker.position_id + self._fixtime = tracker.fixtime + self._latitude = tracker.latitude + self._longitude = tracker.longitude + self._altitude = tracker.altitude + self._locked_position_id = tracker.locked_position_id + self._locked_latitude = tracker.locked_latitude + self._locked_longitude = tracker.locked_longitude + self._role = tracker.role + self._subscription_id = tracker.subscription_id + self._last_payment_date = tracker.last_payment_date + self._gift_card_id = tracker.gift_card_id + self._expires = tracker.expires + self._activation_date = tracker.activation_date + self._odometer = tracker.odometer + self._is_locked = tracker.is_locked + self._is_stolen = tracker.is_stolen + self._is_crashed = tracker.is_crashed + self._crash_detection_disabled = tracker.crash_detection_disabled + self._speed = tracker.speed + self._moving = tracker.moving + self._can_see_position = tracker.can_see_position + self._can_lock = tracker.can_lock + self._can_unlock = tracker.can_unlock + self._can_share = tracker.can_share + self._can_unshare = tracker.can_unshare + self._can_check_speed = tracker.can_check_speed + self._can_see_statistics = tracker.can_see_statistics + self._can_send_broken_down_signal = tracker.can_send_broken_down_signal + self._can_send_stolen_signal = tracker.can_send_stolen_signal + self._status = tracker.status + self._auto_lock_freezed_to = tracker.auto_lock_freezed_to + class GeoRideAccount: """ Account object representation """ def __init__(self, account_id, email, is_admin, auth_token): diff --git a/setup.py b/setup.py index 923ad04..7eb5d6a 100644 --- a/setup.py +++ b/setup.py @@ -24,8 +24,8 @@ setup( author='Matthieu DUVAL', author_email='georideapilib@duval-dev.fr', # use the URL to the github repo - url='https://github.com/ptimatth/pyGeoride', - download_url='https://codeload.github.com/ptimatth/pyGeoride/tar.gz/0.1.0', + url='https://github.com/hacf/georide-api', + download_url='https://codeload.github.com/hacf/georide-api/tar.gz/0.5.0', keywords=['rest', 'georide', 'api', 'grutier', 'GeoRide'], # arbitrary keywords classifiers=[], install_requires=["python-socketio[client]"],