mcotton
/
EagleEyev3
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

quote escaping in time functions by default

main
Mark Cotton 2023-08-30 09:00:14 -05:00
parent 479aea5e22
commit 33be513b73
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/EagleEyev3/__init__.py
View File

@ -1,5 +1,5 @@
""" Python client for Eagle Eye Networks APIv3 """
version = "0.0.17"
version = "0.0.18"
__version__ = version
@ -109,17 +109,24 @@ class EagleEyev3():
self.get_base_url(cascade=True)
def time_now(self):
return datetime.now(tz=self.user_tz_obj).isoformat(timespec='milliseconds')
def time_now(self, escape=True):
if escape:
return requests.utils.quote(datetime.now(tz=self.user_tz_obj).isoformat(timespec='milliseconds'))
else:
return datetime.now(tz=self.user_tz_obj).isoformat(timespec='milliseconds')
def time_before(self, ts=None, hours=6):
def time_before(self, ts=None, hours=6, escape=True):
if ts == None:
ts = datetime.now(tz=self.user_tz_obj)
if type(ts) == str:
ts = datetime.fromisoformat(ts)
return (ts - timedelta(hours=hours)).isoformat(timespec='milliseconds')
if escape:
return requests.utils.quote((ts - timedelta(hours=hours)).isoformat(timespec='milliseconds'))
else:
return (ts - timedelta(hours=hours)).isoformat(timespec='milliseconds')
def login_tokens(self, code=None, cascade=True):
"""
@ -550,6 +557,7 @@ class EagleEyev3():
def _make_get_request(self, url=None, headers={}, timeout='default'):
try:
logging.debug(f"_make_get_request url: {url}")
response = requests.get(url, headers=headers, timeout=self._get_timeout_values(timeout))
return response