quote escaping in time functions by default
parent
479aea5e22
commit
33be513b73
|
@ -1,5 +1,5 @@
|
||||||
""" Python client for Eagle Eye Networks APIv3 """
|
""" Python client for Eagle Eye Networks APIv3 """
|
||||||
version = "0.0.17"
|
version = "0.0.18"
|
||||||
__version__ = version
|
__version__ = version
|
||||||
|
|
||||||
|
|
||||||
|
@ -109,18 +109,25 @@ class EagleEyev3():
|
||||||
|
|
||||||
self.get_base_url(cascade=True)
|
self.get_base_url(cascade=True)
|
||||||
|
|
||||||
def time_now(self):
|
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')
|
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:
|
if ts == None:
|
||||||
ts = datetime.now(tz=self.user_tz_obj)
|
ts = datetime.now(tz=self.user_tz_obj)
|
||||||
|
|
||||||
if type(ts) == str:
|
if type(ts) == str:
|
||||||
ts = datetime.fromisoformat(ts)
|
ts = datetime.fromisoformat(ts)
|
||||||
|
|
||||||
|
if escape:
|
||||||
|
return requests.utils.quote((ts - timedelta(hours=hours)).isoformat(timespec='milliseconds'))
|
||||||
|
else:
|
||||||
return (ts - timedelta(hours=hours)).isoformat(timespec='milliseconds')
|
return (ts - timedelta(hours=hours)).isoformat(timespec='milliseconds')
|
||||||
|
|
||||||
|
|
||||||
def login_tokens(self, code=None, cascade=True):
|
def login_tokens(self, code=None, cascade=True):
|
||||||
"""
|
"""
|
||||||
Obtains login tokens using the authorization code.
|
Obtains login tokens using the authorization code.
|
||||||
|
@ -550,6 +557,7 @@ class EagleEyev3():
|
||||||
|
|
||||||
def _make_get_request(self, url=None, headers={}, timeout='default'):
|
def _make_get_request(self, url=None, headers={}, timeout='default'):
|
||||||
try:
|
try:
|
||||||
|
logging.debug(f"_make_get_request url: {url}")
|
||||||
response = requests.get(url, headers=headers, timeout=self._get_timeout_values(timeout))
|
response = requests.get(url, headers=headers, timeout=self._get_timeout_values(timeout))
|
||||||
return response
|
return response
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue