adding pagination to get_list_of_cameras, fixes #2

get_list_of_videos
Mark Cotton 2023-08-14 17:17:57 -05:00
parent 6b2f61f9a3
commit 6c31e8b48d
1 changed files with 65 additions and 38 deletions

View File

@ -1,5 +1,5 @@
""" Python client for Eagle Eye Networks APIv3 """ """ Python client for Eagle Eye Networks APIv3 """
version = "0.0.10" version = "0.0.11"
__version__ = version __version__ = version
@ -468,37 +468,42 @@ class EagleEyev3():
Returns: Returns:
dict: Dictionary containing the success status, response HTTP status code, and data. dict: Dictionary containing the success status, response HTTP status code, and data.
""" """
url = f"https://{self.user_base_url}/api/v3.0/cameras?include=status"
includes = ''.join(['status'])
page_size = 1000
nextPageToken = None
# emulating a do while toop in order to handle pagination, remember to break out of this loop
while True:
if nextPageToken:
url = f"https://{self.user_base_url}/api/v3.0/cameras?include={includes}&pageSize={page_size}&pageToken={nextPageToken}"
else:
url = f"https://{self.user_base_url}/api/v3.0/cameras?include={includes}&pageSize={page_size}"
headers = { headers = {
"Authorization": f"Bearer {self.access_token}", "Authorization": f"Bearer {self.access_token}",
"Accept": "application/json" "Accept": "application/json"
} }
try: response = self._make_get_request(url=url, headers=headers, timeout='list_of_cameras')
response = requests.get(url, headers=headers, timeout=self._get_timeout_values('list_of_cameras'))
if response:
response_json = response.json() response_json = response.json()
logging.info(f"{response.status_code} in get_list_of_cameras") logging.info(f"{response.status_code} in get_list_of_cameras")
except requests.exceptions.Timeout: else:
logging.warn(f"timeout expired get_list_of_cameras()")
return { return {
"success": False, "success": False,
"response_http_status": 0, "response_http_status": 0,
"data": None "data": None
} }
except requests.exceptions.RequestException as e:
logging.warn(e)
return {
"success": False,
"response_http_status": 0,
"data": None
}
if response.status_code == 200: if response.status_code == 200:
success = True success = True
self.cameras = [ self.cameras = self.cameras + [
Camera(id=i['id'],\ Camera(id=i['id'],\
name=i['name'],\ name=i['name'],\
status=i['status'],\ status=i['status'],\
@ -506,11 +511,20 @@ class EagleEyev3():
bridge_id=i['bridgeId'],\ bridge_id=i['bridgeId'],\
user_base_url=self.user_base_url,\ user_base_url=self.user_base_url,\
een_instance=self) een_instance=self)
for i in response_json['results']] for i in response_json['results'] if i['id'] not in [j.id for j in self.cameras]]
for camera in self.cameras: for camera in self.cameras:
camera.user_base_url = self.user_base_url camera.user_base_url = self.user_base_url
if 'nextPageToken' in response_json and len(response_json['nextPageToken']) > 0:
nextPageToken = response_json['nextPageToken']
else:
break
else: else:
success = False success = False
break
return { return {
"success": success, "success": success,
@ -518,6 +532,19 @@ class EagleEyev3():
"data": response_json "data": response_json
} }
def _make_get_request(self, url=None, headers={}, timeout='default'):
try:
response = requests.get(url, headers=headers, timeout=self._get_timeout_values(timeout))
return response
except requests.exceptions.Timeout:
logging.warn(f"timeout expired get_list_of_cameras()")
return None
except requests.exceptions.RequestException as e:
logging.warn(e)
return None
def get_list_of_bridges(self): def get_list_of_bridges(self):
""" """
Obtains the list of bridges. Obtains the list of bridges.